0f62451424
[Glitch] HTML string attributes set as booleans
...
Port a425915ce7
2023-04-09 11:56:02 +02:00
ce12934f5b
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
10469a0b85
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
aa136cf2fa
Fix tooltip for dates without time ( #24244 )
2023-04-07 16:19:43 +02:00
9ef9974ff2
Fix loading spinner + infinite scroll for private mentions ( #24446 )
2023-04-07 15:44:31 +02:00
c0886dee14
Remove Array.prototype.includes polyfill ( #24234 )
2023-04-07 13:03:42 +02:00
d7b8c6db7e
Fix account header image missing in low-res ( #24433 )
2023-04-07 11:57:43 +02:00
c9f3438efe
New Crowdin updates ( #24378 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-04-06 23:24:31 +09:00
02d5c69404
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
ffd5b2eea4
Fix height of announcements not being updated when using reduced animations ( #24354 )
2023-04-05 14:58:10 +02:00
17b2fd2177
Update display_media typing to string ( #24416 )
2023-04-05 13:20:21 +02:00
927b2fd138
Set marginRight as string ( #24422 )
2023-04-05 10:57:36 +02:00
ab3f23da91
SUBMIT doesn't exist on XMLHttpRequest ( #24423 )
2023-04-05 10:56:55 +02:00
cd14f712ad
Enable Stylelint property-no-unknown ( #24404 )
2023-04-05 09:04:08 +02:00
45848d6547
Fix styling regressions from RTL layout refactor ( #24415 )
2023-04-04 16:48:34 +02:00
ec0c104bf2
Ensure tabIndex is number instead of string ( #24409 )
2023-04-04 16:33:44 +02:00
a425915ce7
HTML string attributes set as booleans ( #24408 )
2023-04-04 16:33:33 +02:00
69ca6316ec
[Glitch] Fix inconsistent radius in drawer
...
Port fa98363a27
2023-04-04 12:51:24 +02:00
d13ef49b15
Merge branch 'main' into glitch-soc/merge-upstream
2023-04-04 12:45:12 +02:00
fa98363a27
Fix inconsistent radius in drawer ( #24407 )
2023-04-04 11:41:05 +02:00
8e19c44b2c
Align typings with installed versions ( #24410 )
2023-04-04 10:48:26 +02:00
d29cf8a044
[Glitch] Add colour to follow button when hashtag is being followed
...
Port 77bd32a26a
2023-04-03 18:07:34 +02:00
4d5b4dacd6
Merge branch 'main' into glitch-soc/merge-upstream
2023-04-03 17:40:59 +02:00
77bd32a26a
Add colour to follow button when hashtag is being followed ( #24361 )
2023-04-03 16:25:15 +02:00
4909c2e718
New Crowdin updates ( #24276 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-04-03 14:44:43 +02:00
373e4a8ff0
Move ESLint configs to overrides ( #24370 )
2023-04-03 12:41:10 +02:00
4520e6473a
[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
7b15f4006a
Merge branch 'main' into glitch-soc/merge-upstream
2023-04-01 14:31:05 +02:00
2b11376411
Change search pop-out in web UI ( #24305 )
2023-04-01 09:59:10 +02:00
46483ae849
Fix regressions from change in account row design in web UI ( #24343 )
2023-04-01 09:27:23 +02:00
d874a7a10f
[Glitch] Fix: set multiColumn value for /explore Statuses
...
Port 74f56c64fc
2023-03-31 22:50:57 +02:00
a8f0592b72
[Glitch] Move marky to devDependency
...
Port ddb769f0b8
2023-03-31 22:50:57 +02:00
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
68a192e718
Change "direct message" nomenclature to "private mention" in web UI ( #24248 )
2023-03-30 15:16:20 +02:00
74f56c64fc
Fix: set multiColumn value for /explore Statuses ( #24314 )
2023-03-30 10:14:49 +02:00
ddb769f0b8
Move marky to devDependency ( #24258 )
2023-03-27 16:11:45 +02:00
cf12621e37
New Crowdin updates ( #24130 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-03-27 20:01:47 +09:00
babd86e594
Refactor styles to use logical properties for positioning ( #23944 )
2023-03-27 10:56:25 +02:00
neatchee
8215df76c0
[Glitch] Remove legacy decorators syntax
...
Port d1b057a0ac
2023-03-27 08:51:57 +02:00
00c839b9a9
[Glitch] Remove isNaN polyfill
...
Port b46125224c
2023-03-26 15:49:49 +02:00
14b0311029
Merge branch 'main' into glitch-soc/main
2023-03-26 15:47:12 +02:00
9bda933740
Change media upload limits and remove client-side resizing ( #23726 )
2023-03-25 10:00:03 +01:00
ef127c964a
Change design of account rows in web UI ( #24247 )
2023-03-25 08:46:32 +01:00
6e8711ff91
Add missing parenthesis ( #24238 )
2023-03-24 04:35:43 +01:00
d1b057a0ac
Remove legacy decorators syntax ( #18357 )
2023-03-24 03:17:53 +01:00
b46125224c
Remove isNaN polyfill ( #24224 )
2023-03-23 09:47:13 +01:00
16da4a09e8
Fix broken links in account gallery ( #24218 )
2023-03-23 05:17:29 +01:00
b4f60bc6de
[Glitch] Fit the max-width of media in .prose to parent box
...
Port 0a9def5498
2023-03-22 20:00:33 +01:00
5ac380c122
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/status.rb`:
Upstream added lines close to a glitch-soc only line, not a real conflict.
Applied upstream's changes (added hooks) while keeping glitch-soc's changes
(`local_only` scope).
- `config/environments/production.rb`:
Upstream removed a header, while we have glitch-soc specific ones.
Removed the header removed upstream.
2023-03-22 19:50:11 +01:00
0a9def5498
Fit the max-width of media in .prose to parent box ( #24180 )
2023-03-20 20:04:25 +01:00
Nick Schonning
neatchee