mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-15 07:34:58 +01:00
Code Issues Projects Releases Wiki Activity
13,338 Commits 137 Branches 269 Tags 929 MiB
847779b1e4
Commit Graph

1599 Commits

Author SHA1 Message Date
Tdxdxoz
bf55b5463a [Glitch] Fix: also use custom private boost icon for detailed status 
Port a3ec9af9b0 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-08-30 16:51:16 +02:00
Daigo 3 Dango
72b1d5fdc5 [Glitch] Better manage subscriptionCounters 
Port 9669557be1 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-08-30 16:35:33 +02:00
proxy
3bbf6b1519 [Glitch] reword "boost to original audience" as per tootsuite#14596 
Port 46210a65d1 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-08-30 16:34:38 +02:00
Takeshi Umeda
cd806663af [Glitch] Fix click range discrepancies in gifv 
Port debf6ae316 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-08-30 16:31:41 +02:00
ThibG
45d1f34a30 [Glitch] Fix scrolling issues when closing some dropdown menus 
Port c7cfd4e67a to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-08-30 16:31:02 +02:00
Thibaut Girka
30632adf9e Fix replying to some remote toots switching to local-only 2020-08-29 19:57:32 +02:00
Thibaut Girka
f1d31cf18d Fix spacing around reblog counter in detailed statuses 
And bring the whole thing closer to upstream's code.
 2020-08-24 20:03:37 +02:00
Thibaut Girka
5dcc406abe Change styling to always have scrollbar on search results 2020-08-17 15:46:18 +02:00
Thibaut Girka
d4b65193c7 Fix WebUI crash in edge case when media display size causes scroll 
Fixes #1406
 2020-08-17 15:46:18 +02:00
Thibaut Girka
e5dbdebc31 Fix styling of display names and account handles, make it closer to upstream 2020-08-13 23:32:29 +02:00
ThibG
0f71372d63 [Glitch] Add client-side validation in password change forms 
Port 7dc4c74265 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-08-13 22:26:22 +02:00
ThibG
b6c0f1fdc6 [Glitch] Add HTML form validation for the registration form 
Port d70c3ab4c3 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-08-13 22:25:33 +02:00
Thibaut Girka
660188c900 Fix local-only flag not necessarily being preserved on delete & redraft 2020-08-12 00:02:44 +02:00
Thibaut Girka
0376b6b92b Fix new audio player when under content warnings 2020-08-11 22:37:51 +02:00
Eugen Rochko
8ae52dc792 [Glitch] Add support for managing multiple stream subscriptions in a single connection 
Ported ef057584fd to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-08-11 19:40:35 +02:00
Thibaut Girka
a3806ec6ba [Glitch] Fallback to previous, more approximative hashtag RE on older browsers 
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-08-05 13:43:32 +02:00
ThibG
8f0e6122a9 [Glitch] Fix audio player on Safari 
Port 635b6a0f1a to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-08-02 22:30:51 +02:00
ThibG
de7ba22c45 [Glitch] Fix new audio player features not working on Safari 
Port 51b5bb5301 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-08-02 14:35:40 +02:00
ThibG
8f3295f212 [Glitch] Fix wrong proptypes for onEditAccountNote 
Port 5faf2de938 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-08-02 14:34:56 +02:00
kedama
1d8e930445 [Glitch] Fix the hashtag judgment of the compose form to be the same as the server side 
Port cd94854e7d to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-08-02 14:33:22 +02:00
Thibaut Girka
5e93c7359d Fix custom boost icon colors being swapped 2020-07-24 11:58:09 +02:00
ThibG
b136e621ea [Glitch] Add custom icon for private boosts 
Port 956473142c to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-07-24 11:29:20 +02:00
ThibG
59e0eb1ba0 [Glitch] Change disabled retweet icon 
Port e93efc0309 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-07-22 22:57:57 +02:00
Thibaut Girka
855ada7e93 Fix “Show less for all”/”Show more for all” eye icon not reflecting state 2020-07-22 22:53:10 +02:00
ThibG
f8e315cd74 [Glitch] Fix keyboard navigation in scrollable lists 
Port 98f6380dee to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-07-22 13:51:44 +02:00
Sasha Sorokin
4412e2579c [Glitch] Fix following_counter plural to include "one" 
Port 17b1d71536 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-07-22 13:50:58 +02:00
ThibG
9bdad8f14e [Glitch] Fix audio player controls color in mastodon-light theme 
Port 85bc0f9639 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-07-22 13:50:15 +02:00
ThibG
f94cb94767 [Glitch] Fix error when closing a playing audio or video modal 
Port bfed7dd5f3 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-07-16 14:44:53 +02:00
Thibaut Girka
470458da13 Fix style of visibility icon in boost modal 2020-07-15 16:04:56 +02:00
han@highemelry
610f71db7a [Glitch] Add a visibility icon to boost modal 
Port 8b35ed96c0 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-07-15 15:50:09 +02:00
Eugen Rochko
dad3132046 [Glitch] Fix audio and video items in account gallery in web UI 
Port 6cc5b822f5 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-07-15 15:48:24 +02:00
ThibG
3fbcc4871f [Glitch] Fix block/mute pagination in WebUI 
Port 38579b9f74 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-07-10 18:49:33 +02:00
Sasha Sorokin
66c0953c33 [Glitch] Improve safety of Blurhash component 
Port 3ef94c0044 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-07-10 17:08:31 +02:00
ThibG
0520273573 [Glitch] Audio player visualization improvements 
Port a2abe35e0f to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-07-10 17:07:41 +02:00
ThibG
e248399220 [Glitch] Freeze scroll position when a dropdown menu is open in the TL 
Port 6fda3cbbeb to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-07-10 17:05:44 +02:00
Sasha Sorokin
042c32ea3b [Glitch] Replace repetitive blurhash code with component (#14267) 
Port 61c07c3731 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-07-10 16:59:53 +02:00
Thibaut Girka
d42a23fdbe Fix clicking the audio player also opening toots in detailed view 2020-07-10 10:28:05 +02:00
Thibaut Girka
0fe5deae89 Change styling of account note editing buttons 
Co-Authored-By: Mélanie Chauvel (ariasuni) <perso@hack-libre.org>
 2020-07-09 12:19:43 +02:00
ThibG
11446be6d1 [Glitch] Fix new accent color not refreshing when changing thumbnail for audio uploads 
Port 0d2135a461 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-07-08 15:26:28 +02:00
ThibG
b27eecdbfc [Glitch] Fix WebUI crash on sensitive preview card with no preview thumbnail 
Port d308a863fb to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-07-08 15:26:02 +02:00
ThibG
a513997367 [Glitch] Fix WebUI crash on sensitive preview card with no preview thumbnail 
Port 2581715491 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-07-08 15:25:31 +02:00
ThibG
4acb7efb4b
Merge pull request #1372 from ThibG/glitch-soc/fixes/local-only-public-option 
Add option to show local-only toots in public timeline
 2020-07-07 19:58:12 +02:00
Thibaut Girka
64b6c20676 Change styling and layout of account notes UI 2020-07-07 19:25:42 +02:00
Thibaut Girka
a9b13804e2 Change account note placeholder name since the design has diverged upstream 2020-07-07 19:25:42 +02:00
Thibaut Girka
170b38c3f4 Fix being unable to add account notes 2020-07-07 19:25:42 +02:00
Sasha Sorokin
a3ac322ded [Glitch] Replace shortNumberFormat with <ShortNumber> 
Port cb2adaaf9d to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-07-07 19:25:06 +02:00
Eugen Rochko
6c7ac1b48f [Glitch] Add ability to choose media thumbnail in web UI 
Port 06fc6a9cd4 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-07-07 15:58:49 +02:00
ThibG
8b17d47e12 [Glitch] Fix hashtag column options styling 
Port a783bdf4ad to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-07-07 15:58:49 +02:00
Thibaut Girka
d973e11061 Add UI option to show local-only toots in public timeline 2020-07-06 21:12:06 +02:00
Eugen Rochko
69cddc3909 [Glitch] Add color extraction for audio thumbnails 
Port 99f3a55540 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-07-05 20:18:51 +02:00
Eugen Rochko
ad73e05f46 [Glitch] Fix audio modals not using blurhash and poster 
Port 162adf61f2 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-07-05 20:18:51 +02:00
Eugen Rochko
9b3677d509 [Glitch] Add customizable thumbnails for audio and video attachments 
Port 64aac30733 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-07-02 17:31:09 +02:00
Eugen Rochko
8999eea707 [Glitch] Fix various issues around OpenGraph representation of media 
Port audio player changes from 662a49dc3f to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-07-02 17:31:09 +02:00
Eugen Rochko
06309129be [Glitch] Fix audio/video/images/cards not reacting to window resizes in web UI 
Port bb9ca8a587 to glitch-soc

Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>

Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-07-02 17:31:09 +02:00
Eugen Rochko
1c58420831 [Glitch] Change volume control and download buttons in web UI 
Port 419ad6248b to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-07-02 17:31:09 +02:00
ThibG
1ad79d11f3 [Glitch] Fix audio player not working when media files are hosted on a different domain 
Port aaf91abffa to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-07-02 17:31:09 +02:00
Eugen Rochko
ad978ab1d4 [Glitch] Change design of audio players in web UI 
Port 75a2b8f815 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-07-02 17:31:09 +02:00
Takeshi Umeda
1c8eb9bcf7 [Glitch] Fix the conditions for incomplete remote content 
Port 7548a474a5 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-07-02 13:58:50 +02:00
Ariel
f60c78ff3e [Glitch] Fix cursor type in statuses 
Port e9ea960773 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-07-01 20:18:07 +02:00
ThibG
24508bb837 [Glitch] Fix lock icon not being shown when locking account in profile settings 
Port 4babf5b8b5 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-07-01 20:13:51 +02:00
ThibG
511edccf61 [Glitch] Add user notes on accounts 
Port 65506bac3f to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-06-30 23:32:02 +02:00
trwnh
50f5254568 [Glitch] Fix padding on account header 
Port d1c6dd2d27 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-06-30 23:10:44 +02:00
ThibG
befe8c72dd [Glitch] Fix read marker state not being udpated internally 
Port fa4876a1b9 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-06-30 23:09:39 +02:00
ThibG
934bacd05f [Glitch] Change sensitive preview cards to not blur text 
Port a1ad2ad951 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-06-30 23:08:24 +02:00
Thibaut Girka
de735286cd Fix public page CSS to match upstream's changes 
Kind of a port of 418f0a33e9 to glitch-soc
 2020-06-26 13:45:40 +02:00
Mélanie Chauvel
4964490bbd [Glitch] Improve appearence consistency of settings pages 
Port 08cf81f8c1 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-06-26 13:31:17 +02:00
ThibG
327f6309e4 [Glitch] Fix design issues with sensitive preview cards 
Port 1d2b0d2121 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-06-26 13:28:52 +02:00
ThibG
9a26d2e127 [Glitch] Fix avatar size in public page detailed status 
Port 0a56a4a1bc to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-06-26 13:27:39 +02:00
Eugen Rochko
2bb25c7730 [Glitch] Fix various issues around OpenGraph representation of media 
Port front-end changes (except for audio player) from 662a49dc3f to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-06-26 13:23:56 +02:00
ThibG
72d193654b [Glitch] Fix very wide media attachments resulting in too thin a thumbnail 
Port d469247083 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-06-24 16:01:28 +02:00
Takeshi Umeda
83bc9f68af [Glitch] Fix modifier key to keep the EmojiPicker on macOS 
Port 434a6d0b15 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-06-24 15:56:43 +02:00
fuyu
51922d7ffa [Glitch] Fix unnecessary gap under of video modal 
Port cb3c6d1780 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-06-24 15:55:53 +02:00
Thibaut Girka
5d12b63e79 Simplify filtering condition 2020-06-23 16:09:36 +02:00
ash lea
c1377049c6 never filter own posts from timeline 2020-06-23 16:09:36 +02:00
Eugen Rochko
9a641a5a0e [Glitch] Add hints about incomplete remote content to web UI 
Port 3e9dc4044b to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-06-17 17:48:04 +02:00
ThibG
65a9b788fc [Glitch] Fix initial audio volume not corresponding to what's displayed 
Port 755e8c76ab to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-06-17 17:20:14 +02:00
fuyu
45fbba2742 [Glitch] Fixed emoji detection problem to append border 
Port b1484cf3ce to glitch-soc

Co-authored-by: ThibG <thib@sitedethib.com>
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-06-17 17:18:42 +02:00
Thibaut Girka
e9d7ca7645 [Glitch] Fix WebUI crash when loading account data before page is loaded 2020-06-09 11:55:07 +02:00
ThibG
00cd919750 [Glitch] Add hotkey for toggling content warning composer field 
Port 6b6a9d0ea3 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-06-09 11:14:20 +02:00
ThibG
304721edc1 [Glitch] Improve rendering of emoji which do not contrast with background 
Port db319c0fdc to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-06-09 11:07:32 +02:00
Ben Lubar
4657c1a1ca [Glitch] FIX: filters ignore media descriptions 
Port c66403b257 to glitch-soc

Co-authored-by: Thibaut Girka <thib@sitedethib.com>
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-06-09 11:02:24 +02:00
ThibG
776aff9656 [Glitch] Hide sensitive preview cards with blurhash 
Port 8e96510b25 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-06-09 11:01:31 +02:00
Yamagishi Kazutoshi
2da2f7f7c2 [Glitch] Fix ref attr for react-textarea-autozsize 
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-06-09 10:55:52 +02:00
Christopher Choi
c225ac8b9e [Glitch] Adjust flash alert contrast for better readability 
Port b4a8400afd to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-06-01 18:31:45 +02:00
Brian C. Lindner
a8559458c3 [Glitch] Allow Ctrl-click to keep EmojiPicker window open 
Port 64154c5161 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-06-01 18:31:42 +02:00
ariasuni
1f94f4009e Improve appearance of notification cleaning UI 
- Use smaller font-size for consistency with the rest of the UI
- Make better use of the horizontal space when available
 2020-06-01 12:28:27 +02:00
ThibG
9707dbee6f [Glitch] Fix timeline markers in Firefox 
Port cc650bc023 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-05-29 20:02:30 +02:00
ThibG
9bd30b8dd5 [Glitch] Fix timeline markers not working on Chrome 
Port 5aff2a6957 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-05-29 20:02:30 +02:00
Thibaut Girka
e8714530a4 Fix local-only hashtag columns 2020-05-28 15:21:16 +02:00
Thibaut Girka
7a74e46b77 Fix one import being made on mastodon's codebase instead of glitch-soc's 2020-05-28 15:14:12 +02:00
Mélanie Chauvel
0b01492276 [Glitch] Change wording from “Hide media” to “Hide image/images” in Web UI 
Port 40d81620b0 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-05-28 14:08:05 +02:00
Takeshi Umeda
44ea965557 [Glitch] Fix local streaming of hashtag timelines 
Port 3a1a21ad57 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-05-28 14:05:21 +02:00
Thibaut Girka
c8cee24cb3 Fix Cmd-Enter not working to send toot 
Fixes #1333
 2020-05-26 10:15:35 +02:00
Eugen Rochko
2b75728a80 [Glitch] Fix regression in sparkline style in web UI 
Port c9dcc2d39f to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-05-14 18:50:57 +02:00
ThibG
d147dd7588 [Glitch] Change “hide/show boosts from …” menu to be hidden when the account is muted 
Port 92f85bea52 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-05-13 23:17:10 +02:00
ThibG
ef2f98317a [Glitch] Fix some account avatars on public pages having incorrect size 
Port 48503384d0 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-05-13 23:17:10 +02:00
ThibG
6a17fa2b99 [Glitch] Fix first poll option not being focused when adding a poll 
Port af6d356279 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-05-13 23:17:10 +02:00
Takeshi Umeda
559214c33f [Glitch] Add remote only to public timeline 
Port 26b08a3c54 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-05-10 16:19:59 +02:00
ThibG
51508e5061 [Glitch] Fix use of inline CSS in public pages 
Port c0b849bdfd to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-05-10 16:19:59 +02:00
ThibG
89fcd68b75 [Glitch] Fix admin-facing uses of inline CSS 
Port b8ba977497 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-05-03 21:47:58 +02:00
ThibG
7ea8b07b93 [Glitch] Fix page incorrectly scrolling when bringing up dropdown menus 
Port 77ec0875ea to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-05-03 21:47:11 +02:00
ThibG
9e5a216878 [Glitch] Fix end-user-facing uses of inline CSS 
Port 0e362b7678 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-05-03 21:44:43 +02:00
ThibG
4a5f93c25f [Glitch] Refactor/cleanup TIMELINE_DELETE-related code 
Port ad9c7aefe6 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-05-03 21:42:13 +02:00
ThibG
502a0365df [Glitch] Fix messed up z-index when NoScript blocks media/previews 
Port 04eb599864 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-05-03 21:41:15 +02:00
Thibaut Girka
a22e6a3683 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/statuses_controller.rb`:
  Upstream disabled the embed controller for reblogs.
  Not a real conflict, but glitch-soc has an extra line to deal
  with its theming system.
  Ported upstream changes.
- `app/javascript/packs/public.js`:
  Upstream made changes to get rid of most inline CSS, this changes
  javascript for public pages, which in glitch are split between
  different files. Ported those changes.
- `app/models/status.rb`:
  Upstream changed the block check in `Status#permitted_for` to
  include domain-block checks. Not a real conflict with glitch-soc,
  but our scope is slightly different, as our scope for
  unauthenticated access do not include instance-local toots.
  Ported upstream changes.
- `app/serializers/rest/instance_serializer.rb`:
  Not a real conflict, upstream added a new field to the instance
  serializer, the conflict is one line above since we added more of
  that.
  Ported upstream changes.
- `app/views/settings/profiles/show.html.haml`:
  Upstream got rid of most inline CSS and moved hidden elements
  to data attributes in the process, in fields were we have
  different values.
  Ported upstream changes while keeping our glitch-specific
  values.
- `app/views/statuses/_simple_status.html.haml`:
  Upstream got rid of inline CSS on an HAML line we treat
  differently, stripping empty text nodes.
  Ported upstream changes to the style attribute, keeping
  the empty text node stripping behavior.
 2020-05-03 21:23:49 +02:00
ThibG
9d41a410a3 [Glitch] Fix uninformative error message when uploading unsupported image files 
Port be637146f3 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-04-25 15:29:01 +02:00
ThibG
572e89e563 [Glitch] Fix expanded video player issues 
Port c955f98d36 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-04-25 15:28:16 +02:00
Irie Aoi
0f4a8a6487 [Glitch] Set max-width and max-height to gif video 
Port c5c8f68031 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-04-25 15:26:42 +02:00
ThibG
ce33822e2c [Glitch] Fix and refactor keyboard navigation in dropdown menus 
Port 80182eda62 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-04-25 15:24:02 +02:00
D Anzorge
221ea4787f [Glitch] Update Twemoji to 12.1.5 
Port emoji_map.json changes from 29f5353f8b to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-04-20 16:54:01 +02:00
Takeshi Umeda
7ceeb97f3d [Glitch] Add local only to hashtag timeline 
Port front-end changes from 2c7128c7f0 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-04-20 16:52:56 +02:00
ThibG
bf9da1e734 [Glitch] Fix uploaded image orientation in some browsers 
Port a1ce9cbb67 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-04-18 15:48:15 +02:00
ThibG
81ef26b67d [Glitch] Fix not being able to vote 
Port e12a5635da to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-04-17 22:04:10 +02:00
Gurgen Hayrapetyan
4849752a9c [Glitch] Fix Poll fetchPoll action not being debounced. 
Port ab8d7c0680 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-04-17 20:20:06 +02:00
ThibG
a08a2130f0 [Glitch] Fix WebUI pagination of following, followers, follow requests, blocks and mutes lists 
Port ec31b1b752 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-04-12 17:01:41 +02:00
Thibaut Girka
51bbf0b68d Clean up some dead code 2020-04-10 14:47:06 +02:00
Thibaut Girka
5d2cdeb225 Fix deprecated use of createBrowserHistory 2020-04-09 17:03:05 +02:00
Thibaut Girka
9101254d0a Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/packs/public.js`:
  Upstream modified code that we split between multiple files due
  to glitch-soc's theming system.
  Ported those changes.
 2020-04-05 18:32:06 +02:00
ThibG
fd7a37c371 [Glitch] Add explanation as to why unlocked accounts may have follow requests 
Port d3ff06a320 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-04-04 21:59:49 +02:00
Eugen Rochko
7d5b43d8bb [Glitch] Add ability to filter audit log in admin UI 
Port f65568f1d4 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-04-04 21:53:31 +02:00
Sasha Sorokin
b367dd713e [Glitch] Improve polls: option lengths & redesign 
Port 37b3985bfa to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-04-02 20:52:53 +02:00
Mélanie Chauvel (ariasuni)
2e337d850f [Glitch] Improve toot clicking areas 
Port part of 1fb92037e4 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-04-02 20:49:43 +02:00
ThibG
9175ebf20c [Glitch] Fix content warning being unnecessarily cleared when enabling/disabling CW 
Port cf1fa73347 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-04-02 20:45:46 +02:00
Mélanie Chauvel (ariasuni)
dcf841545d [Glitch] Fix wrong color for ellipsis in boost confirmation dialog in Web UI 
Port be2f1597cf  to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-04-02 20:45:03 +02:00
ThibG
3eede6f64b [Glitch] Fix 404 and 410 API errors being silently discarded in WebUI 
Port front-end changes from 0d117c106a to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-04-02 20:39:44 +02:00
ThibG
faa56643b8 [Glitch] Fix frontend crash when deleting announcements 
Port 858d0dd168 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-03-27 22:06:42 +01:00
ThibG
60338b2bee [Glitch] Change poll option hover/active styling to be less confusing 
Port beb80adb51 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-03-27 22:06:06 +01:00
Daniel Sockwell
9da4bd098c [Glitch] Fix frontend crash when deleting announcements 
Port 8758221e73 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-03-22 16:31:01 +01:00
ThibG
0ff78befc6 [Glitch] Fix regression in “Edit media” modal in web UI 
Port 90f3a00062 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-03-22 16:30:19 +01:00
mayaeh
912f4a2eba [Glitch] Change the string "hidden" to "blocked" in WebUI 
Port 310d729745 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-03-22 16:29:51 +01:00
Eugen Rochko
295dadc9f0 [Glitch] Change local media attachments to perform heavy processing asynchronously 
Port front-end part of 9660aa4543 to glitch-soc

[API] This makes use of a new media posting API (/api/v2/media), supporting
background processing of uploaded files. For Pleroma's purposes, this could
be handled the same as /api/v1/media since afaik Pleroma doesn't do any
transcoding.

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-03-22 16:26:26 +01:00
Thibaut Girka
9abb227250 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Our README.md files are completely different. Discarded upstream changes.
- `app/javascript/core/admin.js`:
  Updating rails-ujs, no real conflict, but a comment to close to changed
  code. Various glitch-soc-only files have been updated to match those changes,
  though.
- `package.json`:
  No real conflict, just an additional dependency in glitch-soc that was too
  close to something updated upstream. Took upstream's changes.
 2020-03-22 16:10:44 +01:00
Thibaut Girka
7115b0b8c9 Fix missing media description dialog when sending toots with keyboard shortcuts 2020-03-14 14:59:14 +01:00
Thibaut Girka
531658d6cf Fix posting privacy on secondary button with missing description confirmation dialog 2020-03-14 12:33:50 +01:00
Thibaut Girka
e53622442c Fix privacy icon being displayed twice in glitch-soc Web UI 
Fixes #1298
 2020-03-11 23:25:15 +01:00
ThibG
9c29229587 [Glitch] Add support for links to statuses in announcements to be opened in web UI 
Port aa67036b41 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-03-08 20:46:15 +01:00
Mélanie Chauvel (ariasuni)
669cf49c54 [Glitch] Change the tooltip "Toggle visibility" to "Hide media" in web UI 
Port 5e4b649655 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-03-08 20:45:36 +01:00
Bèr Kessels
fc53d9cc76 [Glitch] Code style improvements in JavaScript 
Port fd76955f39 to glitch-soc

* JS-linter: fix trailing comma's

* Configure eslinter to ignore this onchange error.

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-03-08 20:43:53 +01:00
Mélanie Chauvel (ariasuni)
35d2189ac8 [Glitch] Change description of privacy levels to be more intuitive in web UI 
Port 4063f9f278 to glitch-soc

Co-authored-by: Thibaut Girka <thib@sitedethib.com>
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-03-08 20:37:13 +01:00
Mélanie Chauvel (ariasuni)
bdb06f50ec [Glitch] Fix text area above/right of emoji picker being accidentally clickable in web UI 
Port 2e18b1a2a2 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-03-08 20:19:08 +01:00
ThibG
3c96a0c21d [Glitch] Fix too large announcements not being scrollable in web UI 
Port 503eab1c1f to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-03-08 20:16:43 +01:00
koyu
6211eff739 [Glitch] Change GIF label to be displayed even when autoplay is enabled in web UI 
Port e69a3f54a1 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-03-08 20:15:11 +01:00
ThibG
c8f36a71ea [Glitch] Change the string "Hide everything from …" to "Block domain …" in web UI 
Port 39453de232 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-03-08 20:14:20 +01:00
Mélanie Chauvel (ariasuni)
eae96cb204 [Glitch] Add tooltips to audio/video player buttons 
Port 036ba3f510 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-03-08 19:59:42 +01:00
ThibG
2f2b48b227 [Glitch] Fix /web redirecting to /web/web in web UI 
Port 0f07218e53 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-02-25 14:30:43 +01:00
Thibaut Girka
0d41fef506 Document alt+enter 2020-02-22 23:07:29 +01:00
Thibaut Girka
bc4de2f661 [Glitch] Add source-mapped stacktrace to error message in web UI 
Port ff3a11d01d to glitch-soc
 2020-02-19 23:31:15 +01:00
ThibG
c9166a5943 [Glitch] Fix old browsers crashing because of missing finally polyfill in web UI 
Port 1314bba68a to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-02-19 23:10:37 +01:00
Thibaut Girka
955f838f9d Fix clicking on the “TOOT” button send bogus visibility parameter 2020-02-16 00:10:45 +01:00
Thibaut Girka
40798cba41 Fix alt+enter changing visibility setting without sending toot when toot is empty 2020-02-14 22:38:24 +01:00