Commit graph

1879 commits

Author SHA1 Message Date
Jeremy Kescher
3a83d8fd91
Merge remote-tracking branch 'upstream/main' into develop 2022-09-02 17:52:18 +02:00
Claire
2a46fcc3ed
Fix regexp filtering in pinned community/public TLs (#1840) 2022-09-02 11:57:06 +02:00
Jeremy Kescher
ac6c2c5798
Merge remote-tracking branch 'upstream/main' into develop 2022-08-31 17:31:38 +02:00
Claire
156c6ea36c
Fix position of “expand” icon in media modal on glitch-soc (#1838) 2022-08-31 16:23:10 +02:00
Jeremy Kescher
2759512a2a
Merge remote-tracking branch 'upstream/main' into develop 2022-08-30 17:42:17 +02:00
Claire
0495302f1c
Fix local settings navigation (#1836)
The “filters” page was removed, but not from the navigation, which would offset
everything.
2022-08-30 10:57:27 +02:00
Claire
bbb45568ad
Fix WebUI error in development mode (#1835)
Caused by using JSX features without importing React

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-08-29 08:23:05 +02:00
Jeremy Kescher
bc970c92ad
Merge remote-tracking branch 'upstream/main' into develop 2022-08-28 22:55:32 +02:00
Claire
7a02c1d9ba
Add regexp filter field to public timeline column settings (#1834)
* Add regexp filter field to public timeline column settings

This has accidentally been removed while porting an upstream change years ago.

* Remove dead code

* Fix regexp filter not working for local and public TLs when using non-default settings
2022-08-28 22:21:55 +02:00
Jeremy Kescher
63ddeb9182
Merge remote-tracking branch 'upstream/main' into develop 2022-08-28 14:31:15 +02:00
Yamagishi Kazutoshi
54ae7a221e [Glitch] Replace to workbox-webpack-plugin from offline-plugin
Port 81e1cc5fec to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-08-28 11:41:21 +02:00
Jeong Arm
54d9a9c18a
Fix react warning on notifications column (#1832) 2022-08-27 15:17:27 +02:00
Jeremy Kescher
691f82d346
Oatstodon flavour: Make avatars rounded squares again rather than circles 2022-08-27 11:24:24 +02:00
Jeremy Kescher
f9f3ed9c84
Add Oatstodon glitch flavour 2022-08-27 10:49:42 +02:00
Jeremy Kescher
7d927f3c19
Merge remote-tracking branch 'upstream/main' into develop 2022-08-26 08:43:43 +02:00
Claire
d99f91bceb [Glitch] Fix quickly switching notification filters resulting in empty or incorrect list
Port 55bef1e34f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-08-25 18:19:09 +02:00
Claire
43a1bfd05d [Glitch] Fix “Filter this post” potentially listing deleted filters
Port 2cae5f5b8d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-08-25 18:18:34 +02:00
Claire
2b03e21d36 Fix glitch-soc-specific timeline filtering logic 2022-08-25 11:53:16 +02:00
Claire
3844f15da0 Remove obsolete filter local settings 2022-08-25 09:52:13 +02:00
Claire
0b733ca790 [Glitch] Add ability to filter individual posts
Port 50487db122 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-08-25 09:52:13 +02:00
Takeshi Umeda
28f0dfc0b4 [Glitch] Fix case where boolean was passed to onFilter on StatusActionBar
Port 66b8abf218 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-08-25 09:52:13 +02:00
Claire
93b6ad2c6c [Glitch] Remove dead code in WebUI filtering code
Port a233a9bfb5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-08-25 09:52:13 +02:00
Claire
bbafe28fbc [Glitch] Fix reblogged statuses being erroneously shown as filtered
Port 3c24f19afe to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-08-25 09:52:13 +02:00
Claire
a15fe32e61 [Glitch] Revamp post filtering system
Port front-end changes from 02851848e9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-08-25 09:40:45 +02:00
Jeremy Kescher
71b46e3a86
Merge remote-tracking branch 'upstream/main' into develop 2022-08-25 08:57:30 +02:00
Claire
448ed92f76 [Glitch] Fix quickly switching notification filters resulting in empty or incorrect list
Port afb8bc97d0 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-08-25 05:16:43 +02:00
Claire
3c80b62045 [Glitch] Fix media modal link button
Port ba745ca99a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-08-25 05:14:00 +02:00
Takeshi Umeda
68564a622c [Glitch] Fix action type for unfollowHashtag
Port 5d70a16a14 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-08-25 05:11:55 +02:00
Jeremy Kescher
5206dddac7
Merge remote-tracking branch 'upstream/main' into develop 2022-08-21 18:01:10 +02:00
Shlee
8a93dd3d83 [Glitch] Update notifications.js
Port d92ce31c92 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-08-21 14:44:58 +02:00
Jeremy Kescher
f77753efbe
Merge remote-tracking branch 'upstream/main' into develop 2022-08-15 20:46:05 +02:00
Rens Groothuijsen
41fa50ac86 [Glitch] Add warning for sensitive audio posts
Port e6979aa6d4 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-08-15 14:57:57 +02:00
Jeremy Kescher
f2fef712b3
Web UI: Allow removing a second poll choice 2022-08-12 21:42:19 +02:00
Jeremy Kescher
e354a296c1
Web UI: Allow creating polls with only one option 2022-08-12 21:17:29 +02:00
Jeremy Kescher
40d8a08a1e
Merge remote-tracking branch 'upstream/main' into develop 2022-08-01 18:15:52 +02:00
prplecake
991349e6e2
[Glitch] Add ability to follow hashtags in web UI 2022-07-30 20:00:00 -05:00
Mélanie Chauvel
f174ce1048
Use slightly more margin between post buttons (under compose box) (#1816) 2022-07-27 19:17:15 +02:00
Jeremy Kescher
3bf3d99778
Merge remote-tracking branch 'upstream/main' into develop 2022-07-25 17:09:32 +02:00
Claire
18346f4044 Add option to share CW toggle state across instances of a post 2022-07-25 11:57:09 +02:00
Claire
eacde1a130 Regroup CW unfolding settings in their own section 2022-07-24 17:28:47 +02:00
Jeremy Kescher
ed0db58c25
Merge remote-tracking branch 'upstream/main' into develop 2022-07-24 14:27:27 +02:00
Claire
a5f81e1abd Improve interaction between out-of-CW attachments and collapsed toots 2022-07-24 13:16:03 +02:00
Claire
db5b44330d Add explanation for some options in the local settings dialog 2022-07-24 11:11:38 +02:00
Claire
3f4e27ab6f Add local setting toggle to move media attachments outside CWs
Fixes #1812
2022-07-24 11:10:49 +02:00
Jeremy Kescher
ed778cac65
Merge remote-tracking branch 'upstream/main' into develop 2022-07-23 14:51:03 +02:00
Eugen Rochko
1ceebf2710 [Glitch] Change hashtag numbers to have clearer labels in web UI
Port f5d8501138 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-07-22 18:41:39 +02:00
Yamagishi Kazutoshi
969d805e86 [Glitch] Bump react-redux-loading-bar from 4.0.8 to 5.0.4
Port d5ca204e89 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-07-22 18:39:57 +02:00
Jeremy Kescher
8f969312f7
Merge remote-tracking branch 'upstream/main' into develop 2022-07-20 17:28:29 +02:00
Jeong Arm
7205098ccf [Glitch] Fix badge color not affected
Port f248d95be2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-07-19 16:11:40 +02:00
Jeremy Kescher
791363f1d2
Merge remote-tracking branch 'upstream/main' into develop 2022-07-18 00:01:32 +02:00