mirrors/catstodon
1
0
Fork 0
mirror of https://git.kescher.at/CatCatNya/catstodon.git synced 2024-12-02 03:29:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
21382 commits 5 branches 147 tags 265 MiB
Commit graph

34 commits

Author SHA1 Message Date
Jeremy Kescher
009251a17d
Merge branch 'glitch-soc' into develop 
# Conflicts:
#	app/javascript/mastodon/features/ui/components/navigation_panel.jsx
#	app/javascript/mastodon/initial_state.js
#	app/serializers/initial_state_serializer.rb
#	config/initializers/chewy.rb
#	config/locales/en.yml
#	config/locales/ja.yml
 2024-02-24 19:11:05 +01:00
Eugen Rochko
cce3f3d6da [Glitch] Change onboarding prompt to follow suggestions carousel in web UI 
Port 9cdc60ecc6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-02-24 14:35:08 +01:00
Essem
6ae86f40d1
Add support for emoji reactions 
Squashed, modified, and rebased from glitch-soc/mastodon#2221.

Co-authored-by: fef <owo@fef.moe>
Co-authored-by: Jeremy Kescher <jeremy@kescher.at>
Co-authored-by: neatchee <neatchee@gmail.com>
Co-authored-by: Ivan Rodriguez <104603218+IRod22@users.noreply.github.com>
Co-authored-by: Plastikmensch <plastikmensch@users.noreply.github.com>
 2023-12-29 12:33:13 -06:00
Claire
b41af99673 [Glitch] Change dismissed banners to be stored server-side 
Port 7faa27e17d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-12-20 20:40:47 +01:00
Claire
a97b722ad5
Reduce differences with upstream due to import style (#2465) 
Fix relative / VS absolute style imports, and fix whitespace discrepancies
 2023-11-15 12:01:51 +01:00
Plastikmensch
ed15893eed
Add regex filter back to firehose (#2266) 
* Add regex filter back to firehose

The regex filter will apply to all tabs and not be automatically applied when pinned.

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>

* Keep regex when pinned

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>

---------

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
 2023-07-03 15:41:50 +02:00
Claire
9f3c3f5209 Show local-only posts in “All” by default, and add back option to toggle it 2023-07-02 20:28:02 +02:00
Claire
7cc2c1be29 [Glitch] Change local and federated timelines to be in a single firehose column 
Port cea9db5a0b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-02 11:58:51 +02:00
Claire
7d7db8977b Fix import order with ESLint 
Port d27216dc46 to glitch-soc
 2023-05-28 16:38:10 +02:00
Renaud Chaput
5f2071d055 [Glitch] Enforce stricter rules for Typescript files 
Port c8181eb0a4 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-05-09 22:56:26 +02:00
Claire
155424e52f [Glitch] Run eslint --fix 
I don't like it changing files this way, but it's basically what
c49213f0ea and a few others did.
 2023-02-03 20:52:07 +01:00
Claire
b75bf336bd Move more modules from flavours/glitch/utils to flavours/glitch 2022-10-11 12:25:45 +02:00
Claire
d3879c07b1 Rename flavours/glitch/util into flavours/glitch/utils 2022-10-11 11:31:11 +02:00
Eugen Rochko
485b43ed7e [Glitch] Add notifications for new reports 
Port 2936f42a14 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-06-28 13:13:10 +02:00
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>
 2022-05-16 23:06:29 +02:00
Eugen Rochko
f99943cd74 [Glitch] Add notifications for new sign-ups 
Port 7b816eb5ae to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-02-23 19:04:09 +01:00
Eugen Rochko
958089fb21 [Glitch] Add notifications when a reblogged status has been updated 
Port front-end changes from 8f03b7a2fb to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-02-12 13:15:07 +01:00
Claire
db6551ec09 Add option to opt out of unread notification markers 
Port 55ac2b9c60 to glitch-soc
 2021-03-19 13:57:32 +01:00
ThibG
e0a253fb22 [Glitch] Change notification permission handling 
Port 79efcf8aad to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2020-12-19 01:02:32 +01:00
Eugen Rochko
4ae4b03974 [Glitch] Change how missing desktop notifications permission is displayed 
Port a69ca29473 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-10-21 21:49:46 +02:00
ThibG
b5927301cf [Glitch] Fix browser notification permission request logic 
Port f54ca3d08e to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-10-21 21:28:47 +02:00
ThibG
1e1293e3c8 [Glitch] Add follow_request notification type 
Port 911cc14481 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-12-07 15:48:26 +01:00
Eugen Rochko
8b630f7e54 [Glitch] Add trends UI with admin and user settings 
Port 9072fe5ab6 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-09-02 10:57:44 +02:00
Eugen Rochko
d99a661f08 [Glitch] Add responsive panels to the single-column layout 
Port 1e5532e693 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-06-13 22:15:31 +02:00
Eugen Rochko
610b4b44c4 [Glitch] Add single-column mode 
Port 9ddeb30f90 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-06-13 22:15:31 +02:00
Thibaut Girka
d61a6271c6 Add DM conversations mode similar to upstream 2019-06-10 16:23:42 +02:00
Thibaut Girka
9c620fc5c8 [Glitch] Add support for poll ending notifications 
Port front-end parts of 3a92885a86 to glitch-soc
 2019-03-11 13:08:21 +01:00
Thibaut Girka
82b01a6c9f [Glitch] Put "Media Only" option in column settings instead of content area headline 
Port 4f42238c29 to glitch-soc
 2018-12-18 21:39:35 +01:00
Thibaut Girka
593f88acb1 [Glitch] Change column params on pinned timeline 
Port 06252ec71e to glitch-soc
 2018-12-18 21:39:35 +01:00
Thibaut Girka
06a7c07eda [Glitch] Add notification quick-filter bar in the frontend app 
Port 13dce12665 to glitch-soc
 2018-12-18 17:22:01 +01:00
cwm
6d1c325167 Rename key to path in actions and reducers for settings (tootsuite pr #6105) 2018-01-09 09:48:14 -06:00
cwm
47157e07b2 merged tootsuite pr #5811 into glitch flavour 2017-12-08 20:13:08 -06:00
kibigo!
2f2467ce8e Add option to remove DMs from home (#126) 2017-12-06 17:50:27 -08:00
kibigo!
bc4fa6b198 Rename themes -> flavours ? ? 2017-12-03 23:26:40 -08:00
Renamed from app/javascript/themes/glitch/reducers/settings.js (Browse further)