mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-14 23:24:55 +01:00
Code Issues Projects Releases Wiki Activity
8,977 Commits 135 Branches 269 Tags 928 MiB
abb53fa338
Commit Graph

842 Commits

Author SHA1 Message Date
Eugen Rochko
8d70a8a19b Add polls 
Port front-end parts of 230a012f00 to glitch-soc
 2019-03-05 21:35:03 +01:00
Thibaut Girka
0d19fcc2fb Port upstream refactoring of reducers and actions 
Also includes 9e45b051cf
 2019-03-05 21:35:03 +01:00
Eugen Rochko
cce1c3252f Fix home timeline perpetually reloading when empty 
Port 3e0ed36e8e to glitch-soc
 2019-03-05 19:30:11 +01:00
Mélanie Chauvel (ariasuni)
2a4ce7458a [Glitch] Fix errors found by eslint 
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-03-01 14:01:51 +01:00
Mélanie Chauvel (ariasuni)
282ac61500 [Glitch] Make the column header of profile view look like the others, too 
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-03-01 14:01:51 +01:00
Mélanie Chauvel (ariasuni)
12a0dd71be [Glitch] Make the column header of toot/thread view look like the others 
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-03-01 14:01:51 +01:00
Thibaut Girka
76ed481aa7 Port public page mastodon-light fixes from upstream 2019-02-27 16:24:57 +01:00
Eugen Rochko
1e06ca1c0a Fix web UI not removing notifications after block (#10108) 
Regression from #7311
 2019-02-26 19:33:59 +01:00
abcang
7209a8b32f Keep notification when muting_notifications is true (#7311) 
* Keep notification when muting_notifications is true

* Retrun mute object

* Fix test
 2019-02-26 19:33:42 +01:00
Thibaut Girka
d82de360c1 Fix non-numeric account identifiers leading to /web/accounts/NaN 
I'm not sure what purpose these “+” served?!
 2019-02-22 17:52:21 +01:00
Thibaut Girka
896beb16c5 [Glitch] Internationalize unexpected error message 
Port 4e71b104e6 to glitch-soc,
fixing a crash in the process
 2019-02-18 19:49:06 +01:00
Eugen Rochko
be9352266c Fix hashtag column not subscribing to stream on mount (#10040) 
Fix #9895
 2019-02-18 18:16:35 +01:00
Thibaut Girka
d974988541 Fix video player width not being updated to fit container width 2019-02-18 10:44:37 +01:00
Ben Lubar
fa9635c741 Allow multi-line image descriptions. (Glitch) 2019-02-17 15:19:12 +01:00
Thibaut Girka
e31fc2b458 [Glitch] Fix crash on public hashtag pages when streaming fails 
Port 041ff5fa9a to glitch-soc
 2019-02-17 14:28:25 +01:00
Thibaut Girka
91c9cb6022 [Glitch] Change buttons on timeline preview to open the interaction dialog 
Port 71e28ba399 to glitch-soc
 2019-02-17 12:39:44 +01:00
Thibaut Girka
9a47f2cbdf Port upstream's javascript to the error page 2019-02-17 12:27:01 +01:00
Eugen Rochko
59fa38a4f6 Fix style regressions on landing page (#10030) 2019-02-15 18:22:06 +01:00
Thibaut Girka
a151c5566a [Glitch] Fix hashtags select styling in default and high contrast skins 
Port 169b9d4428 to glitch-soc
 2019-02-15 18:21:00 +01:00
Eugen Rochko
4dcb04b888 Fix color of static page links in high contrast theme (#10028) 2019-02-15 18:10:26 +01:00
Thibaut Girka
2769b54466 [Glitch] Fix occasional crash in detailed toot view 
Port f9a338b473 to glitch-soc
 2019-02-15 17:34:15 +01:00
Thibaut Girka
614ea184bb [Glitch] Add "copy link" item to status action bars 
Port 3cfadd875c to glitch-soc
 2019-02-13 07:29:57 +01:00
Thibaut Girka
e230b176fb [Glitch] Don't focus spoiler input when disabled spoiler 
Inspired by 0e513ff862
 2019-02-12 21:16:02 +01:00
ThibG
a3ba28eb17
Merge pull request #913 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-02-12 20:29:55 +01:00
Thibaut Girka
b89e003c4d Handle deletion of filtered toots 2019-02-10 22:54:25 +01:00
Thibaut Girka
7c0728c776 Minor fix to timeline jump avoiding behavior 2019-02-10 22:54:25 +01:00
Thibaut Girka
dfe1d548a5 Adjust scroll when statuses above the current scroll position are deleted 2019-02-10 22:54:25 +01:00
Thibaut Girka
0b91322762 Adjust scroll if previewCard appeared 2019-02-10 22:54:25 +01:00
Thibaut Girka
049c9a3b97 Avoid two-step rendering of statuses as much as possible 
Cache width shared by Video player, MediaGallery and Cards at the
ScrollableList level, pass it down through StatusList and Notifications.
 2019-02-10 22:54:25 +01:00
Thibaut Girka
68f3d003d6 Refactor intersection observer article code 2019-02-10 22:54:25 +01:00
Thibaut Girka
e49e54a5ff Cleanup redundant markup for hidden statuses 2019-02-10 22:54:25 +01:00
Thibaut Girka
405ef5ad37 Hide items rendered out-of-frame (once they have been rendered at least once) 2019-02-10 22:54:25 +01:00
Thibaut Girka
b47a53f902 [Glitch] Rename from instance to server. 
Port 46e806cd2f to glitch-soc
 2019-02-10 22:19:26 +01:00
Thibaut Girka
14a1bb703a [Glitch] Fix not showing custom emojis in share page emoji picker 
Port e02a13f64e to glitch-soc
 2019-02-10 21:54:43 +01:00
Thibaut Girka
b7fbcb21b3 [Glitch] Add featured hashtags to profiles 
Port SCSS changes from 364f2ff9aa
 2019-02-10 21:50:42 +01:00
Thibaut Girka
7ed2aeb6e9 [Glitch] Allow multiple files upload through web UI, including drag & drop 
Port 750c67660d to glitch-soc
 2019-02-10 21:44:14 +01:00
Thibaut Girka
a963ea67dd [Glitch] Add missing rejection handling for Promises 
Port missing parts from 2c51bc0ca5 to glitch-soc
 2019-02-10 21:44:14 +01:00
Thibaut Girka
6b2eefc7bf [Glitch] Add WebP support 
Port 5092d17f29  to glitch-soc
 2019-02-10 21:13:17 +01:00
Thibaut Girka
1a70fca168 Fix CW unfolding not triggering re-layout in public hashtag page 2019-02-06 15:32:48 +01:00
Thibaut Girka
3ce34ce7a2 Fix unfolding CWs on public hashtag page 
Fixes #909
 2019-02-06 14:37:57 +01:00
Thibaut Girka
c9d261753a Remove redundant “options” from “Compose box options” 
Thanks @ariasuni.
 2019-02-03 01:02:39 +01:00
Marek Ľach
a0a8203a0b Minor description corrections 2019-02-03 00:30:34 +01:00
Eugen Rochko
663593b508 Fix link color in high-contrast theme, add underlines (#9949) 
Improve sorting of default themes in the dropdown
 2019-02-01 16:23:13 +01:00
Thibaut Girka
2e93f87c9f [Glitch] Replace unlock-alt icon with unlock 
Port 6513f6c953 to glitch-soc
 2019-02-01 16:15:44 +01:00
Thibaut Girka
f611da4899 Do not mark toots as sensitive if they don't have any media attached 2019-02-01 15:55:28 +01:00
Thibaut Girka
762e4fdf55 Fix hashtag processing when sending toots 
This fixes crashes in pleroma when writing toots with a content warning,
since pleroma inserts a “nsfw” hashtag that isn't part of the toot's text.
 2019-02-01 12:37:28 +01:00
Thibaut Girka
f35d790480 [Glitch] Fix initial value of volume slider in video player and handle volume changes 
Port a53dcaa298 to glitch-soc
 2019-01-27 22:02:59 +01:00
trwnh
8ef0498f1c Fix Firefox scrollbar color regression in #9210 (#9908) 
In #9210 the track color was changed to transparent for no apparent reason. This PR restores the previous color selections implemented in #8653 while keeping the updated property name. Per https://github.com/tootsuite/mastodon/pull/9210#issuecomment-441788776 there is no particular reason for the color change in #9210.
 2019-01-25 11:48:27 +01:00
Jeong Arm
77394156dd Apply style for .landing-page strong (#9892) 2019-01-25 11:48:02 +01:00
Thibaut Girka
c30da25c5f Fix crash in Direct Messages column settings 
Fixes #892
 2019-01-23 18:29:18 +01:00
Thibaut Girka
5145c81620 [Glitch] Fix public hashtag timeline width on mobile, fix scrollbar width compensation 
Port 3b3a4d8a17 to glitch-soc
 2019-01-20 11:56:21 +01:00
Thibaut Girka
e9060b04d4 [Glitch] Hide floating action button on search and getting started pages 
Port 30af4ee65f to glitch-soc
 2019-01-20 11:54:38 +01:00
tmm576
9b5810b3e9 Allow event defaults on index for text data transfer (#9840) 2019-01-20 11:53:22 +01:00
Thibaut Girka
a93cb340bd [Glitch] Fix new hashtag page's items not being full-width on mobile 
Port b506ce1197 to glitch-soc
 2019-01-20 11:52:06 +01:00
Thibaut Girka
8001a9b97b [Glitch] Add information about how to opt-in to the directory on the directory 
Port SCSS changes from a492a9bcd3 to glitch-soc
 2019-01-20 11:50:19 +01:00
Mélanie Chauvel (ariasuni)
6dbb10c4b7 Fix slightly cropped font on settings page dropdowns when using system font (#9839) 2019-01-20 11:49:27 +01:00
Thibaut Girka
02295257b3 [Glitch] Improve the public hashtag page 
Port 8b19903559 to glitch-soc
 2019-01-20 11:47:17 +01:00
Thibaut Girka
3e8b623975 [Glitch] Redesign public hashtag page to use a masonry layout 
Port bc642ac24b to glitch flavour
 2019-01-20 11:38:09 +01:00
Thibaut Girka
5684cd090c [Glitch] make draggingOver state off correctly 
Port d6433b3931 to glitch-soc
 2019-01-16 14:50:17 +01:00
Thibaut Girka
92830029ca [Glitch] Make hashtag search results link to the hashtag URL 
Port 6cfb357940 to glitch-soc
 2019-01-16 14:25:58 +01:00
Thibaut Girka
ad32896a93 [Glitch] Fix hashtag timeline on mobile 
Port c5b8824a3e to glitch-soc
 2019-01-16 14:24:23 +01:00
Thibaut Girka
4cec7a77c3 [Glitch] Adjust admin UI right panel size 
Port 9ee9cb549b to glitch-soc
 2019-01-13 20:41:38 +01:00
Thibaut Girka
2c5f0f12ac [Glitch] change height on narrow view to take 100% of screen 
Port 1183246043 to glitch-soc
 2019-01-13 20:40:46 +01:00
Thibaut Girka
278ff1318f [Glitch] Add attachment list fallback to public pages 
Port JS changes from 4fb94c758e to glitch-soc
 2019-01-13 14:42:50 +01:00
Thibaut Girka
394525e329 [Glitch] Postpone scroll-to-detailed status after react components are loaded 
Port 70801b850c to glitch-soc
 2019-01-10 21:00:33 +01:00
Thibaut Girka
7cc800d0df [Glitch] Redesign admin instances area 
Port SCSS changes from 1c6588accc
 2019-01-10 21:00:33 +01:00
Thibaut Girka
e03813cf0a [Glitch] Stop gifv timeline preview explicitly when open the media gallery 
Port cf3c0fc38c to glitch-soc
 2019-01-10 21:00:33 +01:00
Thibaut Girka
147f4f9fd2 [Glitch] refactored account.js 
Port 57c91fbbed to glitch-soc
 2019-01-10 21:00:33 +01:00
Thibaut Girka
ec441e0299 [Glitch] Fix embed play icons regression 
Port bd5a8c7765 to glitch-soc
 2019-01-10 21:00:33 +01:00
Thibaut Girka
2b2584a37b [Glitch] Display fallback link card thumbnail when none is given 
Port 1512af2811 to glitch-soc
 2019-01-10 21:00:33 +01:00
Thibaut Girka
d1da0a1086 Port a few public.js changes from upstream, move some code around 
glitch-soc's public.js was a bit out of date, and code was put inappropriately
to the common public.js
 2019-01-10 18:45:17 +01:00
Thibaut Girka
e8ae77236b [Glitch] Only consider mouse move in scrolling on item insertion 
Port cc1f13dfd0 to glitch-soc
 2019-01-10 12:09:12 +01:00
Thibaut Girka
825decbf9e [Glitch] Identify manual scrolling to cancel scroll to top reset on mouse idle 
Port 2f86fc5e0a to glitch-soc
 2019-01-10 12:09:12 +01:00
Thibaut Girka
19c64a49f7 [Glitch] Cancel list scroll reset after mouse move on wheel scroll 
Port 9cfd610484 to glitch-soc
 2019-01-10 12:09:12 +01:00
Thibaut Girka
21f27e6579 [Glitch] Temporarily hold timeline if mouse moved recently 
Port 6a1216d2cd to glitch-soc
 2019-01-10 12:09:12 +01:00
Thibaut Girka
20fd855830 Update glitch-soc admin page style from upstream 
Port SCSS changes from e55dce3176 to glitch-soc
 2019-01-08 20:20:35 +01:00
ash lea
dc501c4134 add list title editing 2019-01-06 13:03:57 +01:00
Thibaut Girka
7baf15675f Add local setting to disable swipe-to-change-columns 2019-01-05 21:47:48 +01:00
Thibaut Girka
e77ceb1b29 [Glitch] Update dependencies for Node.js (2018-12-31) 
Port compatibility changes from 8f5fdab5bf to glitch-soc
 2019-01-02 16:07:33 +01:00
Thibaut Girka
1464620ddb [Glitch] Improve admin UI for account view 
Port SCSS changes from 6e49907ecf to glitch-soc
 2019-01-02 15:38:48 +01:00
Thibaut Girka
9b606cb24c [Glitch] Update emoji codepoint mappings to v11.0 
Port 2ee779dcd3 to glitch-soc
 2019-01-02 15:36:59 +01:00
Thibaut Girka
1b35ca17a9 Fix some image paths in SCSS files 2019-01-02 15:36:59 +01:00
Thibaut Girka
b300948526 Fix crash when clearing uninitialized timeline 
Fixes #875
 2018-12-30 16:56:55 +01:00
Thibaut Girka
d126240129 Immediately go back in browser history upon successfully sending toot 2018-12-30 14:07:57 +01:00
Thibaut Girka
cb98e7dbd3 [Glitch] Add moderation warnings 
Port SCSS changes from 3c033c4352 to glitch-soc
 2018-12-23 12:54:09 +01:00
Thibaut Girka
82088f0d7d [Glitch] Remove links to bridge.joinmastodon.org (non-functional) 
Port bb62827c16 to glitch-soc
 2018-12-23 11:43:47 +01:00
Thibaut Girka
c5c4450fdd Remove file added by error 2018-12-23 11:43:25 +01:00
Thibaut Girka
22dedb676b [Glitch] Fix unnecessary loadMore calls when the end of a timeline has been reached 
Port 8389b496ba to glitch flavour
 2018-12-23 11:40:52 +01:00
Thibaut Girka
1a3088364f Fix composer not getting focus after reply confirmation dialog 
The modal-handling code gives back focus to the element focused when the
modal opened. However, in the case of reply confirmation, it would do so
*after* the composer code itself requested focus.
 2018-12-21 20:00:49 +01:00
Thibaut Girka
0605c004a5 Fix incorrect and duplicate onConfirm callback 2018-12-21 20:00:49 +01:00
Thibaut Girka
6166751f9e [Glitch] Fix that translation is not applied to "joining hashtags" 
Port bfec030a4e to glitch-soc
 2018-12-21 19:54:54 +01:00
Thibaut Girka
3611ea02e2 [Glitch] Deep compare tags for hashtag column reload 
Port 4fdefffb99 to glitch-soc
 2018-12-21 19:54:54 +01:00
Thibaut Girka
4be7313298 [Glitch] Allow joining several hashtags in a single column 
Port 4c03e05a4e to glitch-soc

This introduces new requirements in the API:

  `/api/v1/timelines/tag/:tag` now accepts new params: `any`, `all` and `none`
  It now returns status matching tag :tag or any of the :any, provided that
  they also include all tags in `all` and none of `none`.
 2018-12-21 19:54:54 +01:00
Thibaut Girka
6073195a7d [Glitch] Display customized mascot in web UI 
Port relevant parts of 9d4541c612 to glitch-soc
 2018-12-20 18:39:05 +01:00
Thibaut Girka
fb63941c47 Make drawer markup and styling closer to upstream 
WARNING: This may break some custom skins!

  `.drawer > .contents` has been moved to
  `.drawer > .drawer__pager > .drawer__iner`, and the waves have been moved
  from `.drawer > .contents` to `.drawer__inner__mastodon`!
 2018-12-20 18:39:05 +01:00
Thibaut Girka
5eaf2c9e02 [Glitch] Back to the getting-started when pins the timeline 
Port 5bf100f87b to glitch-soc
 2018-12-20 14:51:28 +01:00
Thibaut Girka
1b18eb49e3 Hide negative follower counts from glitch flavour 2018-12-20 14:51:12 +01:00
Thibaut Girka
2228655848 [Glitch] Improved appearance of notification filter on safari 
Port 2e1b5edfea to glitch-soc
 2018-12-19 13:00:08 +01:00
Thibaut Girka
655da1be20 Reword confirm_before_clearing_draft description 2018-12-18 21:54:34 +01:00
Thibaut Girka
9a7201f2ee Allow disabling the reply confirmation dialog 2018-12-18 21:54:34 +01:00