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

84 commits

Author SHA1 Message Date
Jeremy Kescher
628c027049
Merge remote-tracking branch 'upstream/main' into develop 2023-05-08 00:40:33 +02:00
Claire
de74acbe0c
Fix some more Javascript linting issues and discrepancies with upstream (#2209) 
* Fix typo in flavours/glitch/features/video/index.js

* Fix various linting issues and discrepancies with upstream
 2023-05-07 21:43:25 +02:00
Jeremy Kescher
9eb149477a
Merge remote-tracking branch 'upstream/main' into develop 2023-05-06 00:39:56 +02:00
Nick Schonning
1033598416 [Glitch] Enable formatjs/prefer-pound-in-plural 
Port 2daa5a1549 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-04-29 18:38:23 +02:00
Jeremy Kescher
1e866e57ac
Merge remote-tracking branch 'upstream/main' into develop 2023-04-10 08:14:20 +02:00
Nick Schonning
bfe46d08f9 [Glitch] Ensure tabIndex is number instead of string 
Port ec0c104bf2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-04-09 14:47:29 +02:00
Jeremy Kescher
722b6697d7
Merge remote-tracking branch 'upstream/main' into develop 2023-03-28 17:31:34 +02:00
neatchee
8215df76c0 [Glitch] Remove legacy decorators syntax 
Port d1b057a0ac to glitch-soc
 2023-03-27 08:51:57 +02:00
Jeremy Kescher
7318b74ebf
Merge remote-tracking branch 'upstream/main' into develop 
# Conflicts:
#	Gemfile.lock
#	app/models/notification.rb
#	config/locales/simple_form.de.yml
 2023-03-05 12:34:16 +01:00
Renaud Chaput
81ef21a0c8 [Glitch] Rename JSX files with proper .jsx extension 
Port 44a7d87cb1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-02-25 14:35:31 +01:00
Jeremy Kescher
4a6cc45f9d
Merge remote-tracking branch 'upstream/main' into develop 
# Conflicts:
#	Gemfile
#	Gemfile.lock
#	config/sidekiq.yml
 2023-02-18 22:38:53 +01:00
Claire
587f6b3b06 [Glitch] Enable ESLint import recommended rules 
Port eddfb33dfe to glitch-soc
 2023-02-18 16:02:12 +01:00
Jeremy Kescher
8de39432a9
Merge remote-tracking branch 'upstream/main' into develop 
# Conflicts:
#	.github/workflows/build-image.yml
#	Gemfile.lock
#	app/javascript/flavours/glitch/actions/interactions.js
#	config/initializers/rack_attack.rb
#	config/locales/en_GB.yml
 2023-02-17 00:26:21 +01: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
Jeremy Kescher
855b0d4dbb
Merge remote-tracking branch 'upstream/main' into develop 
# Conflicts:
#	.github/workflows/build-image.yml
#	lib/mastodon/version.rb
 2023-01-26 17:27:01 +01:00
Claire
ffea668076 [Glitch] Fix missing filtering on some notification types 
Port 98779535fe to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-01-24 20:43:19 +01:00
fef
079b0d15c5
cherry-pick emoji reaction changes 2022-12-09 23:04:12 +01:00
Sunny Ripert
d13a2f7901 [Glitch] Fix console log error on column settings load 
Port 34c269310d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-11-07 07:53:20 +01:00
Sunny Ripert
8368f4857c [Glitch] Fix JavaScript console warning when loading notifications 
Port 887976814a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-11-06 10:47:31 +01:00
Eugen Rochko
ce27c6502b [Glitch] Fix notifications about deleted reports not being also deleted 
Port d2eb726962 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-10-28 19:24:02 +02:00
Claire
d9f182e5f3 [Glitch] Fix WebUI notification settings for new user and new report notifications 
Port dd76bbf8b7 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-10-28 19:24:02 +02:00
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>
 2022-10-28 19:24:02 +02:00
Eugen Rochko
dea951cce8 [Glitch] Add dismissable hints to various timelines in web UI 
Port f41ec9af05 to glitch-soc

Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-10-28 19:24:02 +02: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
Claire
26b687160b Move flavours/glitch/util/initial_state to flavours/glitch/initial_state 2022-10-11 10:17:04 +02:00
Eugen Rochko
60e2cdd81a [Glitch] Fix various issues with logged-out web UI 
Port part of e2b561e3a5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-10-09 18:23:15 +02:00
Jeong Arm
54d9a9c18a
Fix react warning on notifications column (#1832) 2022-08-27 15:17:27 +02:00
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>
 2022-07-05 11:35:32 +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
Claire
e4bec702ac [Glitch] Rename toots to posts in various places, add or reword DM warnings 
Port part of be0bc9acbf and 7e244879fe
to glitch-soc
 2022-05-03 10:59:23 +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
Sasha Sorokin
a30ac454b2 [Glitch] Split context for filter bar and unread markers 
Port 11d4f9eefc to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2021-10-25 20:37:07 +02:00
Eugen Rochko
a7f6524c6b [Glitch] Change routing paths to use usernames in web UI 
Port 52e5c07948 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2021-09-26 21:35:57 +02:00
Claire
84fbe4d030 Refactor shouldUpdateScroll stuff 2021-07-13 12:51:06 +02:00
Eugen Rochko
d30dd5b1db [Glitch] Change home timeline to reload after follow recommendations in web UI 
Port 0ad240cb6b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2021-05-07 22:00:11 +02:00
Claire
200d7a1708 Change notification settings UI to be more compact 
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2021-03-19 14:47:06 +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
ThibG
237025b5ef [Glitch] Fix notifications being unnecessarily redrawn on state change 
Port 9669167aae to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2020-12-10 09:42:32 +01:00
Eugen Rochko
0aeb833317 [Glitch] Add button to dismiss desktop notifications permissions banner 
Port 4790a126be to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-11-12 22:23:06 +01:00
Thibaut Girka
a81bb14abe Add option to hide notification markers 2020-10-27 11:20:11 +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
Takeshi Umeda
8071613dd7 [Glitch] Fix mark as read in notifications to be saved immediately 
Port bec8b12bb5 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-10-21 19:33:20 +02:00
Eugen Rochko
14869ee656 [Glitch] Add option to be notified when a followed user posts 
Port 974b1b79ce to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-09-28 17:49:55 +02:00
ThibG
4586202448 [Glitch] Fix notification filter bar incorrectly filtering gaps 
Port aab867b0e8 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-09-28 14:59:10 +02:00
Thibaut Girka
312c936d51 Minor refactoring and fixups 2020-09-19 14:15:28 +02:00
Thibaut Girka
a681980307 Submit timeline markers closer to the moment they change 2020-09-17 15:22:56 +02:00