Jeremy Kescher
7d26fee964
Merge remote-tracking branch 'upstream/main' into develop
2022-10-05 17:59:01 +02:00
prplecake
c19a3517a0
Clarify language RE secondary toot button ( #1851 )
2022-10-05 14:10:15 +02:00
Jeremy Kescher
499eecf5a0
Merge remote-tracking branch 'upstream/main' into develop
...
# Conflicts:
# .github/workflows/build-image.yml
2022-10-03 17:39:52 +02:00
Claire
22af8f7563
Fix clicking bookmark column header not scrolling to top in single-column
2022-10-03 09:54:24 +02:00
Claire
b76cef6212
Fix clicking List timeline header not scrolling to top in single-column
2022-10-03 09:54:24 +02:00
Claire
6ee768b7b2
Fix “Change subscribed languages” crashing in some situations
2022-10-02 19:48:24 +02:00
Eugen Rochko
f416e36f0f
[Glitch] Add ability to filter followed accounts' posts by language
...
Port 50948b46aa
2022-10-02 19:36:29 +02:00
Eugen Rochko
d25de7f01e
[Glitch] Change path of privacy policy page
...
Port 36f4c32a38
2022-10-02 19:36:29 +02:00
Claire
e18ba67727
[Glitch] Add privacy icons to report modal
...
Port d2f7e30a28
2022-10-02 19:36:29 +02:00
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
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
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
Jeong Arm
54d9a9c18a
Fix react warning on notifications column ( #1832 )
2022-08-27 15:17:27 +02:00
Jeremy Kescher
7d927f3c19
Merge remote-tracking branch 'upstream/main' into develop
2022-08-26 08:43:43 +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
2022-08-25 09:52:13 +02:00
Claire
a15fe32e61
[Glitch] Revamp post filtering system
...
Port front-end changes from 02851848e9
2022-08-25 09:40:45 +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
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
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
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
Yamagishi Kazutoshi
969d805e86
[Glitch] Bump react-redux-loading-bar from 4.0.8 to 5.0.4
...
Port d5ca204e89
2022-07-22 18:39:57 +02:00
Jeremy Kescher
791363f1d2
Merge remote-tracking branch 'upstream/main' into develop
2022-07-18 00:01:32 +02:00
Jeremy Kescher
172e73535e
Make the emoji picker blob cat a static asset
2022-07-12 00:55:35 +02:00
Eugen Rochko
30e7836a19
[Glitch] Add customizable user roles
...
Port front-end changes from 44b2ee3485
2022-07-05 11:35:32 +02:00
Jeremy Kescher
241aa5a98e
Merge remote-tracking branch 'upstream/main' into develop
2022-06-29 22:35:47 +02:00
Eugen Rochko
485b43ed7e
[Glitch] Add notifications for new reports
...
Port 2936f42a14
2022-06-28 13:13:10 +02:00
Jeremy Kescher
06b9e14a03
Enable editing in web interface
2022-06-23 00:08:40 +02:00
Jeremy Kescher
0f889d3828
Update blobCat emoji URL in emoji picker
2022-06-14 00:20:43 +02:00
Jeremy Kescher
394a536ae0
Create distinctions between glitch-soc and Catstodon.
...
Version suffix and string changes.
2022-06-05 10:15:26 +02:00
Jeremy Kescher
356e199cbe
Merge remote-tracking branch 'upstream/main'
2022-06-03 22:01:39 +02:00
Eugen Rochko
7bf37551c8
[Glitch] Change label of publish button to be "Publish" again
...
Port 628c177ebe
2022-06-02 11:11:26 +02:00
Jeremy Kescher
e695bed558
Merge remote-tracking branch 'upstream/main'
2022-05-27 17:42:15 +02:00
Claire
53c89ee44b
Add language indicator icon and local settings for status icons ( #1788 )
...
* Add language indicator
* Add local settings for status icons
* Switch to text icon for language
2022-05-27 16:34:29 +02:00
Jeremy Kescher
360d5fb092
Merge remote-tracking branch 'upstream/main'
2022-05-25 17:06:22 +02:00
Claire
3fd2aadb23
Various code cleanup ( #1782 )
...
* Remove duplicate in_chosen_languages definition
* Use `DEFAULT_FIELDS_SIZE` instead of `MAX_FIELDS` to reduce code differences with upstream
* Remove duplicate annotation
* Fix incorrect cross-flavor imports
* Remove deprecated `hide_network` setting (replaced by account column)
* Remove unused KeywordMutesHelper
* Remove trailing spaces
* Remove commit_hash from InstancePresenter, as it has been unused since mid-2017
2022-05-25 12:27:11 +02:00
Jeremy Kescher
66426afd31
Merge remote-tracking branch 'upstream/main'
2022-05-24 17:19:20 +02:00
