Claire
ba8ba4f476
Move glitch-soc-only translation strings out of app/javascript/mastodono/locales
2023-04-09 15:53:45 +02:00
Nick Schonning
3237eb3759
[Glitch] Ensure tabIndex is number instead of string
...
Port 53376db94c
2023-04-09 14:47:29 +02:00
Christian Schmidt
3e1e35b8ec
[Glitch] Fix loading spinner + infinite scroll for private mentions
...
Port c9fed25d56
2023-04-09 12:10:01 +02:00
Nick Schonning
61e2fa8b76
[Glitch] Enable Stylelint property-no-unknown
...
Port 24919590a0
2023-04-09 12:05:55 +02:00
Christian Schmidt
b32dbd5500
[Glitch] Fix tooltip for dates without time
...
Port 07497b9956
2023-04-09 12:04:17 +02:00
Nick Schonning
8aafeb72cf
[Glitch] Remove Array.prototype.includes polyfill
...
Port e9df65bad0
2023-04-09 12:03:11 +02:00
Christian Schmidt
95a401efa4
[Glitch] Fix account header image missing in low-res
...
Port b2e306d3db
2023-04-09 12:01:55 +02:00
Christian Schmidt
ba35f8f630
[Glitch] Fix height of announcements not being updated when using reduced animations
...
Port 2507c0a462
2023-04-09 12:01:11 +02:00
Nick Schonning
e9fd7d9e02
[Glitch] Update display_media typing to string
...
Port a334f64652
2023-04-09 12:00:26 +02:00
Nick Schonning
bd52e88774
[Glitch] Set marginRight as string
...
Port 37e98d9d56
2023-04-09 11:59:42 +02:00
Nick Schonning
499485585e
[Glitch] SUBMIT doesn't exist on XMLHttpRequest
...
Port d5a6c93808
2023-04-09 11:58:45 +02:00
Nick Schonning
970001fd77
[Glitch] HTML string attributes set as booleans
...
Port 4ba81aa8dd
2023-04-09 11:56:02 +02:00
Claire
9558de3b67
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`:
Upstream removed a dependency that was textually close to a glitch-soc-only
dependency.
Removed the dependency as upstream did, while keeping the glitch-soc-only
dependency.
2023-04-09 11:45:08 +02:00
Claire
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
Christian Schmidt
07497b9956
Fix tooltip for dates without time ( #24244 )
2023-04-07 16:19:43 +02:00
Christian Schmidt
c9fed25d56
Fix loading spinner + infinite scroll for private mentions ( #24446 )
2023-04-07 15:44:31 +02:00
Nick Schonning
e9df65bad0
Remove Array.prototype.includes polyfill ( #24234 )
2023-04-07 13:03:42 +02:00
Christian Schmidt
b2e306d3db
Fix account header image missing in low-res ( #24433 )
2023-04-07 11:57:43 +02:00
Eugen Rochko
66cbd18531
New Crowdin updates ( #24378 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-04-06 23:24:31 +09:00
Claire
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
Christian Schmidt
2507c0a462
Fix height of announcements not being updated when using reduced animations ( #24354 )
2023-04-05 14:58:10 +02:00
Nick Schonning
a334f64652
Update display_media typing to string ( #24416 )
2023-04-05 13:20:21 +02:00
Nick Schonning
37e98d9d56
Set marginRight as string ( #24422 )
2023-04-05 10:57:36 +02:00
Nick Schonning
d5a6c93808
SUBMIT doesn't exist on XMLHttpRequest ( #24423 )
2023-04-05 10:56:55 +02:00
Nick Schonning
24919590a0
Enable Stylelint property-no-unknown ( #24404 )
2023-04-05 09:04:08 +02:00
Claire
0679fcd2f1
Fix styling regressions from RTL layout refactor ( #24415 )
2023-04-04 16:48:34 +02:00
Nick Schonning
53376db94c
Ensure tabIndex is number instead of string ( #24409 )
2023-04-04 16:33:44 +02:00
Nick Schonning
4ba81aa8dd
HTML string attributes set as booleans ( #24408 )
2023-04-04 16:33:33 +02:00
Rubicon Rowe
f49d2ec5a3
[Glitch] Fix inconsistent radius in drawer
...
Port ffa9249c1e
2023-04-04 12:51:24 +02:00
Claire
8364f82281
Merge branch 'main' into glitch-soc/merge-upstream
2023-04-04 12:45:12 +02:00
Rubicon Rowe
ffa9249c1e
Fix inconsistent radius in drawer ( #24407 )
2023-04-04 11:41:05 +02:00
Nick Schonning
72a1dd736a
Align typings with installed versions ( #24410 )
2023-04-04 10:48:26 +02:00
Christian Schmidt
90ecb96dba
[Glitch] Add colour to follow button when hashtag is being followed
...
Port d5da587d27
2023-04-03 18:07:34 +02:00
Claire
5fbae7cb2a
Merge branch 'main' into glitch-soc/merge-upstream
2023-04-03 17:40:59 +02:00
Christian Schmidt
d5da587d27
Add colour to follow button when hashtag is being followed ( #24361 )
2023-04-03 16:25:15 +02:00
Eugen Rochko
1c1bbbebd6
New Crowdin updates ( #24276 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-04-03 14:44:43 +02:00
Nick Schonning
d0bf149232
Move ESLint configs to overrides ( #24370 )
2023-04-03 12:41:10 +02:00
fusagiko / takayamaki
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
Claire
b12fcd3d7a
Merge branch 'main' into glitch-soc/merge-upstream
2023-04-01 14:31:05 +02:00
Eugen Rochko
d22e712648
Change search pop-out in web UI ( #24305 )
2023-04-01 09:59:10 +02:00
Eugen Rochko
4e63f1e64b
Fix regressions from change in account row design in web UI ( #24343 )
2023-04-01 09:27:23 +02:00
Tdxdxoz
f9cc42d6db
[Glitch] Fix: set multiColumn value for /explore Statuses
...
Port d339684df5
2023-03-31 22:50:57 +02:00
Nick Schonning
bba0493afe
[Glitch] Move marky to devDependency
...
Port a159e8e5e1
2023-03-31 22:50:57 +02:00
Claire
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
Eugen Rochko
868d478b1b
Change "direct message" nomenclature to "private mention" in web UI ( #24248 )
2023-03-30 15:16:20 +02:00
Tdxdxoz
d339684df5
Fix: set multiColumn value for /explore Statuses ( #24314 )
2023-03-30 10:14:49 +02:00
Nick Schonning
a159e8e5e1
Move marky to devDependency ( #24258 )
2023-03-27 16:11:45 +02:00
Eugen Rochko
5b9c983305
New Crowdin updates ( #24130 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-03-27 20:01:47 +09:00
Eugen Rochko
5ec33534f8
Refactor styles to use logical properties for positioning ( #23944 )
2023-03-27 10:56:25 +02:00
neatchee
a73b29e8cc
[Glitch] Remove legacy decorators syntax
...
Port e272fc91e4
2023-03-27 08:51:57 +02:00
