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
Claire
4ab3ad3bef
Fix crash in glitch-soc search results when Elasticsearch is disabled ( #1780 )
2022-05-24 16:10:18 +02:00
Jeremy Kescher
4d1c07e80f
Merge remote-tracking branch 'upstream/main'
2022-05-17 21:11:48 +02:00
Eugen Rochko
2e5fb45be5
[Glitch] Add language dropdown to compose in web UI
...
Port 0cdb077570
2022-05-16 23:06:29 +02:00
Jeremy Kescher
07c2a11959
Merge remote-tracking branch 'upstream/main'
2022-05-15 21:32:31 +02:00
Claire
dc350be6f5
Use upstream's settings for CW auto-expand and column swiping ( #1770 )
...
* Use Mastodon server-side settings for automatically expanding toots with CWs
* Add modal warning about settings changes
* Use Mastodon server-side settings for disabling swiping
2022-05-15 17:30:40 +02:00
Jeremy Kescher
16c8a45c81
Merge remote-tracking branch 'upstream/main'
2022-05-11 17:32:34 +02:00
Eugen Rochko
6fb837aa1d
[Glitch] Add limited attribute to accounts in REST API and a warning in web UI
...
Port b4d373a3df
2022-05-11 11:59:08 +02:00
Eugen Rochko
bb1a3e902d
[Glitch] Remove Keybase integration
...
Port 7de0ee7aba
2022-05-11 11:09:20 +02:00
Claire
b356a995c1
[Glitch] Fix block/mute lists showing a follow button when unblocking a user ( #18364 )
...
Port 662ed53c18
2022-05-11 09:44:27 +02:00
Jeremy Kescher
89b01152a7
Merge remote-tracking branch 'upstream/main'
2022-05-09 06:52:28 +02:00
Claire
703c7ae4b9
[Glitch] Fix floating action button obscuring last element
...
Port 5a448d0d71
2022-05-08 21:05:21 +02:00
Jeremy Kescher
4bfc4068aa
Merge remote-tracking branch 'upstream/main'
2022-05-04 17:40:13 +02:00
Claire
fa22b8ed22
Move DM conversation/timeline tab to column settings switch
2022-05-03 11:45:23 +02:00
Claire
3dd4f40a0e
Fix backend terms link not being used
2022-05-03 11:10:58 +02:00
Claire
3093ed1b7d
Refactor visibility icon using VisibilityIcon
2022-05-03 11:04:09 +02:00
Claire
e4bec702ac
[Glitch] Rename toots to posts in various places, add or reword DM warnings
...
Port part of be0bc9acbf7e244879fe
2022-05-03 10:59:23 +02:00
Jeremy Kescher
8d34a2c2f5
Change emoji picker icon to :blobCat:.
2022-05-02 01:20:49 +02:00
Claire
cb9a919ff2
Remove “I don't like it” option from report modal
2022-05-01 21:58:20 +02:00
Claire
01c2f47b7f
[Glitch] Fix empty “Server rules violation” report option
...
Port eed5a4bf9c
2022-04-28 23:43:49 +02:00
Claire
bb12af7250
Swap position of media attachments and polls
2022-04-20 22:07:13 +02:00
CommanderRoot
9b95077885
[Glitch] Replace deprecated String.prototype.substr()
...
Port 0ec695e036
2022-04-06 16:08:33 +02:00
