Commit Graph

282 Commits (c40b063bd44b1d33d4788e20dd42ce45cc009b5f)

Author SHA1 Message Date
Jeremy Kescher c40b063bd4
Merge remote-tracking branch 'upstream/main' into develop
# Conflicts:
#	.github/workflows/build-image.yml
#	lib/mastodon/version.rb
2 years ago
Claire 9255bfb908 [Glitch] Add the ability to edit media attachment metadata for any unattached media
Port 31005aad12 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Jeremy Kescher 5b797a34df
Merge remote-tracking branch 'upstream/main' into develop 2 years ago
Claire 9b6d6a919f [Glitch] Fix redrafting a currently-editing post not leaving edit mode
Port 782b6835f7 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Jeremy Kescher 03f50f2f00
Merge remote-tracking branch 'upstream/main' into develop
# Conflicts:
#	app/javascript/flavours/glitch/features/ui/components/link_footer.js
#	lib/mastodon/version.rb
#	public/avatars/original/missing.png
2 years ago
Claire fa293f03fa [Glitch] Fix handling of duplicate and out-of-order notifications in WebUI
Port 7c8e2b9859 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Jeremy Kescher 9c8fb2d475
Improve min poll options, expose value in API 2 years ago
Jeremy Kescher 7f6215984b
Merge remote-tracking branch 'upstream/main' into develop
# Conflicts:
#	.github/workflows/build-image.yml
2 years ago
Eugen Rochko ebfe393e9c [Glitch] Fix upload progress not communicating processing phase in web UI
Port 30ef110224 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Takeshi Umeda 8be350cc82 [Glitch] Add featured tags selector for WebUI
Port 4c7b5fb6c1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Eugen Rochko f9f0949bd3 [Glitch] Fix case-sensitive look-up for profiles in web UI
Port 5e908c5a95 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Eugen Rochko 9363e5c24e [Glitch] Change public accounts pages to mount the web UI
Port 839f893168 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Eugen Rochko 67b4ecdd21 [Glitch] Change about page to be mounted in the web UI
Port 1bd00036c2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Jeremy Kescher e333716df0
Merge remote-tracking branch 'upstream/main' into develop 2 years ago
Claire 7e62688a0e
Fix notification cleaning mode causing notifications to get stuck (#1868) 2 years ago
Claire 27a2edcb79
Fix issues with notification cleaning mode when there is a disconnection gap (#1867) 2 years ago
Jeremy Kescher b153ef2672
Merge remote-tracking branch 'upstream/main' into develop 2 years ago
Claire 18f210aff6
Fix accidentally importing vanilla code in glitch-soc flavor (#1863) 2 years ago
Claire b728b25c10 Move flavours/glitch/utils/emoji back to flavours/glitch/features/emoji 2 years ago
Claire b75bf336bd Move more modules from flavours/glitch/utils to flavours/glitch 2 years ago
Claire d3879c07b1 Rename flavours/glitch/util into flavours/glitch/utils 2 years ago
Claire 26b687160b Move flavours/glitch/util/initial_state to flavours/glitch/initial_state 2 years ago
Jeremy Kescher f314520459
Merge remote-tracking branch 'upstream/main' into develop 2 years ago
Eugen Rochko 757e16a0b5 [Glitch] Add server banner to web app
Port d2528b26b6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Jeremy Kescher 5da4f13737
Merge remote-tracking branch 'upstream/main' into develop 2 years ago
Eugen Rochko da67e0660a [Glitch] Add pagination for trending statuses in web UI
Port f382192862 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Eugen Rochko 6e208a817d [Glitch] Fix not showing loading indicator when searching in web UI
Port cb2e198d89 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Eugen Rochko 058b74dc0a [Glitch] Add explore page to web UI
Port d4592bbfcd to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Eugen Rochko 870f0aae48 [Glitch] Fix pop-out player appearing on mobile screens in web UI
Port 18ca4e0e9a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Jeremy Kescher 7d927f3c19
Merge remote-tracking branch 'upstream/main' into develop 2 years ago
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>
2 years ago
Claire 3844f15da0 Remove obsolete filter local settings 2 years ago
Claire 0b733ca790 [Glitch] Add ability to filter individual posts
Port 50487db122 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
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>
2 years ago
Jeremy Kescher 71b46e3a86
Merge remote-tracking branch 'upstream/main' into develop 2 years ago
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>
2 years ago
Jeremy Kescher 5206dddac7
Merge remote-tracking branch 'upstream/main' into develop 2 years ago
Shlee 8a93dd3d83 [Glitch] Update notifications.js
Port d92ce31c92 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Jeremy Kescher e354a296c1
Web UI: Allow creating polls with only one option 2 years ago
prplecake 991349e6e2
[Glitch] Add ability to follow hashtags in web UI 2 years ago
Claire 18346f4044 Add option to share CW toggle state across instances of a post 2 years ago
Claire 3f4e27ab6f Add local setting toggle to move media attachments outside CWs
Fixes #1812
2 years ago
Eugen Rochko 30e7836a19 [Glitch] Add customizable user roles
Port front-end changes from 44b2ee3485 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Eugen Rochko 485b43ed7e [Glitch] Add notifications for new reports
Port 2936f42a14 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire e94c8b9e29 [Glitch] Change language to be carried over on reply
Port 14d7cf39f4 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
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
2 years ago
Eugen Rochko 2e5fb45be5 [Glitch] Add language dropdown to compose in web UI
Port 0cdb077570 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
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
2 years ago
Eugen Rochko 6fb837aa1d [Glitch] Add `limited` attribute to accounts in REST API and a warning in web UI
Port b4d373a3df to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Eugen Rochko bb1a3e902d [Glitch] Remove Keybase integration
Port 7de0ee7aba to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago