1
0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-01-24 08:33:02 -05:00

10895 Commits

Author SHA1 Message Date
Nick Schonning
927b2fd138
Set marginRight as string () 2023-04-05 10:57:36 +02:00
Nick Schonning
ab3f23da91
SUBMIT doesn't exist on XMLHttpRequest () 2023-04-05 10:56:55 +02:00
Nick Schonning
cd14f712ad
Enable Stylelint property-no-unknown () 2023-04-05 09:04:08 +02:00
Claire
45848d6547
Fix styling regressions from RTL layout refactor () 2023-04-04 16:48:34 +02:00
Nick Schonning
ec0c104bf2
Ensure tabIndex is number instead of string () 2023-04-04 16:33:44 +02:00
Nick Schonning
a425915ce7
HTML string attributes set as booleans () 2023-04-04 16:33:33 +02:00
Rubicon Rowe
69ca6316ec [Glitch] Fix inconsistent radius in drawer
Port fa98363a2789f23e110312f23bf4c00234dcd59a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-04-04 12:51:24 +02:00
Claire
d13ef49b15 Merge branch 'main' into glitch-soc/merge-upstream 2023-04-04 12:45:12 +02:00
Claire
0e919397db
Fix unescaped user input in LDAP query () 2023-04-04 12:42:38 +02:00
Rubicon Rowe
fa98363a27
Fix inconsistent radius in drawer () 2023-04-04 11:41:05 +02:00
Nick Schonning
8e19c44b2c
Align typings with installed versions () 2023-04-04 10:48:26 +02:00
Christian Schmidt
d29cf8a044 [Glitch] Add colour to follow button when hashtag is being followed
Port 77bd32a26abbf8b49caf35dcdf170e312e48a277 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-04-03 18:07:34 +02:00
Claire
4d5b4dacd6 Merge branch 'main' into glitch-soc/merge-upstream 2023-04-03 17:40:59 +02:00
Christian Schmidt
77bd32a26a
Add colour to follow button when hashtag is being followed () 2023-04-03 16:25:15 +02:00
Eugen Rochko
4909c2e718
New Crowdin updates ()
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-04-03 14:44:43 +02:00
Nick Schonning
373e4a8ff0
Move ESLint configs to overrides () 2023-04-03 12:41:10 +02:00
fusagiko / takayamaki
4520e6473a
[Proposal] Make able to write React in Typescript ()
Co-authored-by: berlysia <berlysia@gmail.com>
Co-authored-by: fusagiko / takayamaki <takayamaki@users.noreply.github.com>
2023-04-03 03:31:39 +02:00
Claire
7b15f4006a Merge branch 'main' into glitch-soc/merge-upstream 2023-04-01 14:31:05 +02:00
Eugen Rochko
2b11376411
Change search pop-out in web UI () 2023-04-01 09:59:10 +02:00
Eugen Rochko
46483ae849
Fix regressions from change in account row design in web UI () 2023-04-01 09:27:23 +02:00
Vyr Cossont
d5ad8b6422
Fix Redis client and type errors introduced in () 2023-04-01 08:28:35 +02:00
Tdxdxoz
d874a7a10f [Glitch] Fix: set multiColumn value for /explore Statuses
Port 74f56c64fc0aa0dce0dc2c267aa8a212569e9673 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-03-31 22:50:57 +02:00
Nick Schonning
a8f0592b72 [Glitch] Move marky to devDependency
Port ddb769f0b84d4bcff22472f236a4ec74c631d0a6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-03-31 22:50:57 +02:00
Claire
3dcba94e68 Migrate glitch-soc's exclusive user settings 2023-03-31 22:50:57 +02:00
Claire
280fa3b2c0
Fix invalid/expired invites being processed on sign-up () 2023-03-31 21:42:28 +02:00
Claire
01d6f7529f Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
  Upstream added a link to the roadmap, but we have a completely different README.
  Kept ours.
- `app/models/media_attachment.rb`:
  Upstream upped media attachment limits.
  Updated the default according to upstream's.
- `db/migrate/20180831171112_create_bookmarks.rb`:
  Upstream changed the migration compatibility level.
  Did so too.
- `config/initializers/content_security_policy.rb`:
  Upstream refactored this file but we have a different version.
  Kept our version.
- `app/controllers/settings/preferences_controller.rb`:
  Upstream completely refactored user settings storage, and glitch-soc has a
  different set of settings.
  The file does not directly references individual settings anymore.
  Applied upstream changes.
- `app/lib/user_settings_decorator.rb`:
  Upstream completely refactored user settings storage, and glitch-soc has a
  different set of settings.
  The file got removed entirely.
  Removed it as well.
- `app/models/user.rb`:
  Upstream completely refactored user settings storage, and glitch-soc has a
  different set of settings.
  References to individual settings have been removed from the file.
  Removed them as well.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream completely refactored user settings storage, and glitch-soc has a
  different set of settings.
  Applied upstream's changes and ported ours back.
- `app/views/settings/preferences/notifications/show.html.haml`:
  Upstream completely refactored user settings storage, and glitch-soc has a
  different set of settings.
  Applied upstream's changes and ported ours back.
- `app/views/settings/preferences/other/show.html.haml`:
  Upstream completely refactored user settings storage, and glitch-soc has a
  different set of settings.
  Applied upstream's changes and ported ours back.
- `config/settings.yml`:
  Upstream completely refactored user settings storage, and glitch-soc has a
  different set of settings.
  In particular, upstream removed user-specific and unused settings.
  Did the same in glitch-soc.
- `spec/controllers/application_controller_spec.rb`:
  Conflicts due to glitch-soc's theming system.
  Mostly kept our version, as upstream messed up the tests.
2023-03-31 21:30:27 +02:00
Nick Schonning
cb2ce842b0
Autofix Rubocop Rails/IgnoredColumnsAssignment () 2023-03-31 15:07:22 +02:00
Vyr Cossont
7646ad8a2b
IndexingScheduler: fetch and import in batches ()
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-03-31 14:38:47 +02:00
Christian Schmidt
b4f38edf74
Wrong type for user setting when default is defined by lambda () 2023-03-31 07:33:17 +02:00
Eugen Rochko
68a192e718
Change "direct message" nomenclature to "private mention" in web UI () 2023-03-30 15:16:20 +02:00
Eugen Rochko
a9b5598c97
Change user settings to be stored in a more optimal way ()
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-03-30 14:44:00 +02:00
Tdxdxoz
74f56c64fc
Fix: set multiColumn value for /explore Statuses () 2023-03-30 10:14:49 +02:00
mogamin
9c84563008
Fix missing translation in pagination gap tags ()
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2023-03-29 13:54:33 +02:00
Christian Schmidt
eb38e9df31
Requeue expiration notification () 2023-03-29 10:52:40 +02:00
Claire
e084b5b82d
Fix user archive takeout when using OpenStack Swift or S3 providers with no ACL support () 2023-03-27 17:07:37 +02:00
Nick Schonning
ddb769f0b8
Move marky to devDependency () 2023-03-27 16:11:45 +02:00
Eugen Rochko
cf12621e37
New Crowdin updates ()
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-03-27 20:01:47 +09:00
Eugen Rochko
babd86e594
Refactor styles to use logical properties for positioning () 2023-03-27 10:56:25 +02:00
Vyr Cossont
88fc04d3d7
Serialize status webhook events in REST API format () 2023-03-27 09:14:21 +02:00
neatchee
8215df76c0 [Glitch] Remove legacy decorators syntax
Port d1b057a0ac41a5756b6a416d2f290b086cb59220 to glitch-soc
2023-03-27 08:51:57 +02:00
Nick Schonning
00c839b9a9 [Glitch] Remove isNaN polyfill
Port b46125224c26bc0144659b4319ea416b01289961 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-03-26 15:49:49 +02:00
Claire
14b0311029 Merge branch 'main' into glitch-soc/main 2023-03-26 15:47:12 +02:00
mogamin
63a6808ee1
Fix typo in _login_activity.html.haml () 2023-03-26 10:59:14 +02:00
Matt Jankowski
0663803348
Move link header setting to after_action () 2023-03-26 00:40:01 +01:00
Matt Jankowski
e633b26f4f
Add allow_other_host in redirects which may go outside app () 2023-03-26 00:38:32 +01:00
Matt Jankowski
e63524f457
Update retention model sql query () 2023-03-26 00:37:57 +01:00
Eugen Rochko
9bda933740
Change media upload limits and remove client-side resizing () 2023-03-25 10:00:03 +01:00
Eugen Rochko
ef127c964a
Change design of account rows in web UI () 2023-03-25 08:46:32 +01:00
Yamagishi Kazutoshi
6e8711ff91
Add missing parenthesis () 2023-03-24 04:35:43 +01:00
Yamagishi Kazutoshi
d1b057a0ac
Remove legacy decorators syntax () 2023-03-24 03:17:53 +01:00