Ivan Rodriguez
98bc47e3ca
[Glitch] Fix status title for statuses without text
...
Port 9b7e66c109
2023-04-22 10:16:20 +02:00
Nick Schonning
b31e7d43ea
[Glitch] typo: collapsable -> collapsible
...
Port de18852ec7
2023-04-22 10:13:58 +02:00
Claire
5c962d77bb
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/auth/setup_controller.rb`:
Upstream removed a method close to a glitch-soc theming-related method.
Removed the method like upstream did.
2023-04-22 10:06:11 +02:00
Claire
a55f461b4b
Fix infinite loop in emoji replacement code ( #24615 )
2023-04-21 18:08:28 +02:00
Claire
2473078db7
Fix characters being emojified even when using Variation Selector 15 (text) ( #20949 )
2023-04-20 16:43:55 +02:00
fusagiko / takayamaki
f14395c2cf
Allow == when null checking ( #24593 )
2023-04-19 17:46:46 +02:00
fusagiko / takayamaki
b72a9eb02e
Rewrite AnimatedNumber component with React hooks ( #24559 )
2023-04-17 13:25:15 +02:00
Claire
8e36b04fd2
Fix crash when trying to open the filter modal ( #24556 )
2023-04-17 10:15:21 +02:00
fusagiko / takayamaki
d7a0f21886
Rewrite AvatarOverlay component with React hooks ( #24543 )
2023-04-17 07:07:27 +02:00
Eugen Rochko
d509c41d38
[Glitch] Change all components to use the same error page in web UI
...
Port 8b0c634a8a
2023-04-16 18:20:51 +02:00
Claire
d6e6a036b4
[Glitch] Add “In Memoriam” banner back to profiles
...
Port e5498861d4
2023-04-16 18:02:16 +02:00
Claire
0332ac95c0
[Glitch] Fix tab arrows on RTL layouts
...
Port 98022f6f5d
2023-04-16 17:58:32 +02:00
Claire
fca86b29d9
Merge branch 'main' into glitch-soc/merge-upstream
2023-04-16 17:52:44 +02:00
Plastikmensch
da094537d6
[Glitch] Refactor styles to use logical properties for positioning ( #2156 )
...
Port 5ec33534f80679fcd2f1
2023-04-16 17:45:18 +02:00
Claire
c012b39674
New Crowdin updates ( #2172 )
...
* New translations en.json (Spanish)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.json (Spanish, Argentina)
[ci skip]
* New translations en.json (Spanish, Mexico)
[ci skip]
* New translations en.json (Romanian)
[ci skip]
* New translations en.json (French)
[ci skip]
* New translations en.json (Afrikaans)
[ci skip]
* New translations en.json (Arabic)
[ci skip]
* New translations en.json (Belarusian)
[ci skip]
* New translations en.json (Bulgarian)
[ci skip]
* New translations en.json (Catalan)
[ci skip]
* New translations en.json (Czech)
[ci skip]
* New translations en.json (Danish)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations en.json (Greek)
[ci skip]
* New translations en.json (Frisian)
[ci skip]
* New translations en.json (Basque)
[ci skip]
* New translations en.json (Finnish)
[ci skip]
* New translations en.json (Irish)
[ci skip]
* New translations en.json (Hebrew)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations en.json (Armenian)
[ci skip]
* New translations en.json (Italian)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations en.json (Georgian)
[ci skip]
* New translations en.json (Korean)
[ci skip]
* New translations en.json (Lithuanian)
[ci skip]
* New translations en.json (Macedonian)
[ci skip]
* New translations en.json (Dutch)
[ci skip]
* New translations en.json (Norwegian)
[ci skip]
* New translations en.json (Punjabi)
[ci skip]
* New translations en.json (Portuguese)
[ci skip]
* New translations en.json (Russian)
[ci skip]
* New translations en.json (Slovak)
[ci skip]
* New translations en.json (Slovenian)
[ci skip]
* New translations en.json (Albanian)
[ci skip]
* New translations en.json (Serbian (Cyrillic))
[ci skip]
* New translations en.json (Swedish)
[ci skip]
* New translations en.json (Turkish)
[ci skip]
* New translations en.json (Ukrainian)
[ci skip]
* New translations en.json (Chinese Traditional)
[ci skip]
* New translations en.json (Urdu (Pakistan))
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations en.json (Galician)
[ci skip]
* New translations en.json (Icelandic)
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Indonesian)
[ci skip]
* New translations en.json (Persian)
[ci skip]
* New translations en.json (Tamil)
[ci skip]
* New translations en.json (Bengali)
[ci skip]
* New translations en.json (Marathi)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations en.json (Croatian)
[ci skip]
* New translations en.json (Norwegian Nynorsk)
[ci skip]
* New translations en.json (Kazakh)
[ci skip]
* New translations en.json (Estonian)
[ci skip]
* New translations en.json (Latvian)
[ci skip]
* New translations en.json (Hindi)
[ci skip]
* New translations en.json (Malay)
[ci skip]
* New translations en.json (Telugu)
[ci skip]
* New translations en.json (English, United Kingdom)
[ci skip]
* New translations en.json (Burmese)
[ci skip]
* New translations en.json (Welsh)
[ci skip]
* New translations en.json (Faroese)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Uyghur)
[ci skip]
* New translations en.json (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.json (Tatar)
[ci skip]
* New translations en.json (Malayalam)
[ci skip]
* New translations en.json (Breton)
[ci skip]
* New translations en.json (Latin)
[ci skip]
* New translations en.json (Bosnian)
[ci skip]
* New translations en.json (French, Quebec)
[ci skip]
* New translations en.json (Sinhala)
[ci skip]
* New translations en.json (Cornish)
[ci skip]
* New translations en.json (Kannada)
[ci skip]
* New translations en.json (Scottish Gaelic)
[ci skip]
* New translations en.json (Asturian)
[ci skip]
* New translations en.json (Aragonese)
[ci skip]
* New translations en.json (Occitan)
[ci skip]
* New translations en.json (Serbian (Latin))
[ci skip]
* New translations en.json (Kurmanji (Kurdish))
[ci skip]
* New translations en.json (Sorani (Kurdish))
[ci skip]
* New translations en.json (Scots)
[ci skip]
* New translations en.json (Igbo)
[ci skip]
* New translations en.json (Corsican)
[ci skip]
* New translations en.json (Sardinian)
[ci skip]
* New translations en.json (Sanskrit)
[ci skip]
* New translations en.json (Kabyle)
[ci skip]
* New translations en.json (Ido)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations en.yml (German)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
2023-04-16 17:25:43 +02:00
fusagiko / takayamaki
e8450b1dc2
Rewrite GIFV component with React hooks ( #24552 )
2023-04-16 16:09:04 +02:00
Eugen Rochko
9a7a4d79ec
Add progress indicator to sign-up flow ( #24545 )
2023-04-16 07:01:24 +02:00
Eugen Rochko
39bb8504b5
Add client-side validation for taken username in sign-up form ( #24546 )
2023-04-16 02:10:48 +02:00
Ivan Rodriguez
9b7e66c109
Fix status title for statuses without text ( #24359 )
2023-04-14 17:29:09 +02:00
Nick Schonning
de18852ec7
typo: collapsable -> collapsible ( #24521 )
2023-04-14 11:01:23 +02:00
Claire
98022f6f5d
Fix tab arrows on RTL layouts ( #24520 )
2023-04-12 16:01:49 +02:00
Claire
da451d859f
Fix missing translation strings in en.json and defaultMessages.json ( #24518 )
2023-04-12 15:24:45 +02:00
Claire
e5498861d4
Add “In Memoriam” banner back to profiles ( #23614 )
2023-04-12 14:50:02 +02:00
Eugen Rochko
7636512acb
New Crowdin updates ( #24447 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-04-12 20:21:32 +09:00
Eugen Rochko
8b0c634a8a
Change all components to use the same error page in web UI ( #24512 )
2023-04-12 12:44:58 +02:00
Claire
db3900bf4c
Run yarn manage:translations
2023-04-09 15:56:31 +02:00
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
Nick Schonning
57e9fc7e5a
[Glitch] Remove isNaN polyfill
...
Port 169b9c9b13
2023-03-26 15:49:49 +02:00
Claire
6a5a699fbb
Merge branch 'main' into glitch-soc/main
2023-03-26 15:47:12 +02:00
Eugen Rochko
1d2a941bc8
Change media upload limits and remove client-side resizing ( #23726 )
2023-03-25 10:00:03 +01:00
Eugen Rochko
f185c40714
Change design of account rows in web UI ( #24247 )
2023-03-25 08:46:32 +01:00
Yamagishi Kazutoshi
8b68ca7e61
Add missing parenthesis ( #24238 )
2023-03-24 04:35:43 +01:00
Yamagishi Kazutoshi
e272fc91e4
Remove legacy decorators syntax ( #18357 )
2023-03-24 03:17:53 +01:00
Nick Schonning
169b9c9b13
Remove isNaN polyfill ( #24224 )
2023-03-23 09:47:13 +01:00
Christian Schmidt
61e7fe2e2a
Fix broken links in account gallery ( #24218 )
2023-03-23 05:17:29 +01:00
mogamin
aa45960804
[Glitch] Fit the max-width of media in .prose to parent box
...
Port 6ffb8609f9
2023-03-22 20:00:33 +01:00
Claire
d11d2dda17
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
mogamin
6ffb8609f9
Fit the max-width of media in .prose to parent box ( #24180 )
2023-03-20 20:04:25 +01:00
Plastikmensch
5569c86171
Add getting-started-misc to route ( #2141 )
...
* Add getting-started-misc to web_app_paths
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
* Add signed in check to navigation entries
Enabling routing for getting-started-misc allows the column to be directly accessible, which showed every entry and threw unnecessary errors.
Also fixed the keys as these were literally "i++".
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
* Remove "Extended information" from getting-started-misc
I couldn't find any reference to this translation string, so I removed it too.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
---------
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-03-19 17:26:02 +01:00
Christian Schmidt
bb60db4471
[Glitch] Replace Status#translatable? with language matrix in separate endpoint
...
Port 7583523bf0
2023-03-16 23:21:08 +01:00
Claire
488cd37f1a
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream changed their README, we have our own.
Kept ours.
- `app/helpers/application_helper.rb`:
Minor code style fix upstream, on a line that is different in glitch-soc
due to the different theming system.
Applied the code style fix to our own code.
- `app/views/settings/preferences/appearance/show.html.haml`:
Code style fix on a line next to lines exclusive to glitch-soc.
Applied upstream changes.
- `yarn.lock`:
Upstream updated a dependency textually close to a glitch-soc-only
dependency.
Updated the dependency like upstream did.
2023-03-16 23:12:59 +01:00
Eugen Rochko
83f302c101
New Crowdin updates ( #23904 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-03-16 21:02:00 +09:00
Christian Schmidt
7583523bf0
Replace Status#translatable? with language matrix in separate endpoint ( #24037 )
2023-03-16 11:07:24 +01:00
Rodion Borisov
20af3cc038
[Glitch] Center the text itself in upload area
...
Port 100ada1e2b
2023-03-15 09:33:48 +01:00
PauloVilarinho
08685405f1
[Glitch] add modal message when editing toot
...
Port c4c1c8aecc
2023-03-15 09:33:14 +01:00
Claire
f39d9ab256
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-image.yml`:
Upstream switched to pushing to both DockerHub and GitHub Container
Repository, while glitch-soc was already pushing to the latter only.
Updated our configuration to be slightly more consistent with upstream's
naming and styling, but kept our behavior.
- `Gemfile.lock`:
Updated dependencies textually too close to glitch-soc only hcaptcha
dependency.
Updated dependencies as upstream did.
- `README.md`:
Upstream updated its README, but we have a completely different one.
Kept our README, though it probably should be reworked at some point.
- `app/views/auth/sessions/two_factor.html.haml`:
Minor style fix upstream that's on a line glitch-soc removed because
of its different theming system.
Kept our file as is.
- `spec/controllers/health_controller_spec.rb`:
This file apparently did not exist upstream, upstream created it with
different contents but it is functionally the same.
Switched to upstream's version of the file.
- `spec/presenters/instance_presenter_spec.rb`:
Upstream changed the specs around `GITHUB_REPOSITORY`, while glitch-soc
had its own code because it's a fork and does not have the same default
source URL.
Took upstream's change, but with glitch-soc's repo as the default case.
- `yarn.lock`:
Upstream dependencies textually too close to a glitch-soc only one.
Updated dependencies as upstream did.
2023-03-15 09:16:10 +01:00
Rodion Borisov
100ada1e2b
Center the text itself in upload area ( #24029 )
2023-03-09 14:35:44 +01:00
PauloVilarinho
c4c1c8aecc
add modal message when editing toot ( #23936 )
...
Co-authored-by: PauloVilarinho <paulotarsobranco@hotmail.com>
2023-03-06 17:33:09 +01:00
Claire
5f94d33a67
Refactor glitch-soc rich text SCSS
2023-03-05 21:31:45 +01:00
Christian Schmidt
a813ea3c25
[Glitch] Only offer translation for supported languages
...
Port cc0c37cd69
2023-03-05 21:19:04 +01:00
Terry Garcia
81aac88f65
[Glitch] Switched bookmark and favourites around
...
Port f5fe444913
2023-03-05 21:07:55 +01:00
