69a94bf6e1
Move locale-data back to `app/javascript/mastodon/locales/locale-data` ( #2169 )
...
This reduces differences with upstream and fixes a bunch of locale-data
files having been forgotten.
2023-04-08 14:11:40 +02:00
2d9cb47a4b
Fix glitch-soc HAML linting issues ( #2166 )
2023-04-07 20:55:28 +02:00
0174059370
New Crowdin updates ( #2126 )
...
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (French)
[ci skip]
* New translations en.json (Czech)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations en.json (Korean)
[ci skip]
* New translations en.yml (Norwegian)
[ci skip]
* New translations simple_form.en.yml (Norwegian)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Spanish, Argentina)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.json (Spanish, Mexico)
[ci skip]
* New translations en.yml (Spanish, Mexico)
[ci skip]
* New translations en.json (French, Quebec)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.json (Spanish, Mexico)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations simple_form.en.yml (Spanish)
[ci skip]
* New translations en.json (Spanish, Mexico)
[ci skip]
* New translations en.yml (Spanish, Mexico)
[ci skip]
* New translations simple_form.en.yml (Spanish, Mexico)
[ci skip]
* New translations en.json (Spanish, Argentina)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations simple_form.en.yml (Spanish, Argentina)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations simple_form.en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations simple_form.en.yml (Polish)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations simple_form.en.yml (Polish)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* Fix Crowdin YAML export issue
* Fix i18n YAML normalization
2023-04-05 20:28:34 +02:00
f49d2ec5a3
[Glitch] Fix inconsistent radius in drawer
...
Port ffa9249c1e
2023-04-04 12:51:24 +02:00
8364f82281
Merge branch 'main' into glitch-soc/merge-upstream
2023-04-04 12:45:12 +02:00
6ccd12b521
Fix unescaped user input in LDAP query ( #24379 )
2023-04-04 12:42:38 +02:00
ffa9249c1e
Fix inconsistent radius in drawer ( #24407 )
2023-04-04 11:41:05 +02:00
72a1dd736a
Align typings with installed versions ( #24410 )
2023-04-04 10:48:26 +02:00
90ecb96dba
[Glitch] Add colour to follow button when hashtag is being followed
...
Port d5da587d27
2023-04-03 18:07:34 +02:00
5fbae7cb2a
Merge branch 'main' into glitch-soc/merge-upstream
2023-04-03 17:40:59 +02:00
d5da587d27
Add colour to follow button when hashtag is being followed ( #24361 )
2023-04-03 16:25:15 +02:00
1c1bbbebd6
New Crowdin updates ( #24276 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-04-03 14:44:43 +02:00
d0bf149232
Move ESLint configs to overrides ( #24370 )
2023-04-03 12:41:10 +02:00
4866812b28
[Proposal] Make able to write React in Typescript ( #16210 )
...
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
b12fcd3d7a
Merge branch 'main' into glitch-soc/merge-upstream
2023-04-01 14:31:05 +02:00
d22e712648
Change search pop-out in web UI ( #24305 )
2023-04-01 09:59:10 +02:00
4e63f1e64b
Fix regressions from change in account row design in web UI ( #24343 )
2023-04-01 09:27:23 +02:00
15f9f8962e
Fix Redis client and type errors introduced in #24285 ( #24342 )
2023-04-01 08:28:35 +02:00
f9cc42d6db
[Glitch] Fix: set multiColumn value for /explore Statuses
...
Port d339684df5
2023-03-31 22:50:57 +02:00
bba0493afe
[Glitch] Move marky to devDependency
...
Port a159e8e5e1
2023-03-31 22:50:57 +02:00
bb5b3182f0
Migrate glitch-soc's exclusive user settings
2023-03-31 22:50:57 +02:00
db2b09bdd4
Fix invalid/expired invites being processed on sign-up ( #24337 )
2023-03-31 21:42:28 +02:00
1a0c54554f
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
5f1a0f550b
Autofix Rubocop Rails/IgnoredColumnsAssignment ( #23761 )
2023-03-31 15:07:22 +02:00
3cf19b953f
IndexingScheduler: fetch and import in batches ( #24285 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-03-31 14:38:47 +02:00
41190c8172
Wrong type for user setting when default is defined by lambda ( #24321 )
2023-03-31 07:33:17 +02:00
868d478b1b
Change "direct message" nomenclature to "private mention" in web UI ( #24248 )
2023-03-30 15:16:20 +02:00
c75fccf033
Change user settings to be stored in a more optimal way ( #23630 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-03-30 14:44:00 +02:00
d339684df5
Fix: set multiColumn value for /explore Statuses ( #24314 )
2023-03-30 10:14:49 +02:00
a9715ecd73
Fix missing translation in pagination gap tags ( #24262 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2023-03-29 13:54:33 +02:00
72b4973f50
Requeue expiration notification ( #24311 )
2023-03-29 10:52:40 +02:00
af57bcd3cf
Fix user archive takeout when using OpenStack Swift or S3 providers with no ACL support ( #24200 )
2023-03-27 17:07:37 +02:00
a159e8e5e1
Move marky to devDependency ( #24258 )
2023-03-27 16:11:45 +02:00
5b9c983305
New Crowdin updates ( #24130 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-03-27 20:01:47 +09:00
5ec33534f8
Refactor styles to use logical properties for positioning ( #23944 )
2023-03-27 10:56:25 +02:00
13db7d0075
Serialize status webhook events in REST API format ( #24243 )
2023-03-27 09:14:21 +02:00
a73b29e8cc
[Glitch] Remove legacy decorators syntax
...
Port e272fc91e4
2023-03-27 08:51:57 +02:00
57e9fc7e5a
[Glitch] Remove isNaN polyfill
...
Port 169b9c9b13
2023-03-26 15:49:49 +02:00
6a5a699fbb
Merge branch 'main' into glitch-soc/main
2023-03-26 15:47:12 +02:00
c88fc5179b
Fix typo in _login_activity.html.haml ( #24263 )
2023-03-26 10:59:14 +02:00
85e90f4b7d
Move link header setting to after_action ( #24251 )
2023-03-26 00:40:01 +01:00
cc5208f020
Add allow_other_host in redirects which may go outside app ( #24252 )
2023-03-26 00:38:32 +01:00
4e6cf24ce9
Update retention model sql query ( #24249 )
2023-03-26 00:37:57 +01:00
1d2a941bc8
Change media upload limits and remove client-side resizing ( #23726 )
2023-03-25 10:00:03 +01:00
f185c40714
Change design of account rows in web UI ( #24247 )
2023-03-25 08:46:32 +01:00
8b68ca7e61
Add missing parenthesis ( #24238 )
2023-03-24 04:35:43 +01:00
e272fc91e4
Remove legacy decorators syntax ( #18357 )
2023-03-24 03:17:53 +01:00
169b9c9b13
Remove isNaN polyfill ( #24224 )
2023-03-23 09:47:13 +01:00
61e7fe2e2a
Fix broken links in account gallery ( #24218 )
2023-03-23 05:17:29 +01:00
aa45960804
[Glitch] Fit the max-width of media in .prose to parent box
...
Port 6ffb8609f9
2023-03-22 20:00:33 +01:00
Claire