Commit graph

21 commits

Author SHA1 Message Date
Jeremy Kescher
1fb6e312ff
Merge remote-tracking branch 'upstream/main' into develop 2023-04-27 08:59:13 +02:00
Plastikmensch
1565af1caf
[Glitch] [Proposal] Make able to write React in Typescript (#2190)
Port 4520e6473a to glitch-soc

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-04-26 21:30:41 +02:00
Jeremy Kescher
f3953eee78
Merge remote-tracking branch 'upstream/main' into develop 2023-04-23 20:49:47 +02:00
Claire
5b58ebb04f
Fix JS crashing if initial-state is not set (#2193)
Fixes issues with the JS for at least sign-up pages not working
2023-04-22 19:13:20 +02:00
Jeremy Kescher
1e866e57ac
Merge remote-tracking branch 'upstream/main' into develop 2023-04-10 08:14:20 +02:00
Nick Schonning
791e712a80 [Glitch] Update display_media typing to string
Port 17b2fd2177 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-04-09 12:00:26 +02:00
Jeremy Kescher
ddc4022845
Merge remote-tracking branch 'upstream/main' into develop
# Conflicts:
#	Gemfile.lock
#	app/javascript/flavours/glitch/initial_state.js
#	app/javascript/mastodon/initial_state.js
#	app/lib/feed_manager.rb
#	app/services/batched_remove_status_service.rb
#	lib/mastodon/feeds_cli.rb
2023-03-15 14:13:29 +01:00
Christian Schmidt
1317553f3a [Glitch] Only offer translation for supported languages
Port 5a8c651e8f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-03-05 21:19:04 +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
Eugen Rochko
95e2cab22e [Glitch] Add setting for status page URL
Port 8f590b0a21 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-02-09 12:58:11 +01:00
Jeremy Kescher
0d829dadea
Merge remote-tracking branch 'upstream/main' into develop
# Conflicts:
#	Gemfile.lock
#	app/javascript/flavours/glitch/features/ui/index.js
#	app/javascript/mastodon/features/ui/index.js
2023-01-18 22:29:27 +01:00
Claire
55e368c02f [Glitch] Add option to make the landing page be /about even when trends are enabled
Port 3970a6f433 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-01-18 17:54:37 +01:00
fef
7187d6f9cf
cleanup JS imports and other minor stuff 2022-12-09 23:08:42 +01:00
fef
be0bf21f3b
make number of visible reactions a vanilla setting
Reactions will be backported to the vanilla
flavour, which requires all related settings to
be accessible from the vanilla settings page
rather than the glitch specific settings modal.
2022-12-09 23:04:13 +01:00
fef
4577711201
make frontend fetch reaction limit
the maximum number of reactions was previously
hardcoded to 8.  this commit also fixes an
incorrect query in StatusReactionValidator where
it didn't count per-user reactions but the total
amount of different ones.
2022-12-09 23:04:12 +01:00
Claire
47bd934061 [Glitch] Change “Translate” button to only show up when a translation backend is configured
Port 8046cf34d6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-30 13:53:38 +01:00
Claire
b6c0ef70a2 [Glitch] Change sign-in banner to reflect disabled or moved account status
Port 312d616371 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-06 17:29:04 +01:00
Yamagishi Kazutoshi
5d4d4a69f6 [Glitch] Redirect non-logged-in user to owner statuses on single user mode
Port 7afc6a630c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-10-28 19:24:02 +02:00
Yamagishi Kazutoshi
8491a3532d [Glitch] Remove timeline preview link from nav panel when not signed-in
Port e82467ca41 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-10-28 19:24:02 +02:00
Claire
64342a87b4 Refactor initial_state to isolate glitch-soc changes 2022-10-11 10:27:14 +02:00
Claire
26b687160b Move flavours/glitch/util/initial_state to flavours/glitch/initial_state 2022-10-11 10:17:04 +02:00
Renamed from app/javascript/flavours/glitch/util/initial_state.js (Browse further)