0224c3c0d9
Add eslint-plugin-jsdoc ( #24719 )
2023-04-30 02:29:54 +02:00
6ccea199ca
Fix media description not being cleared ( #24720 )
2023-04-30 02:29:24 +02:00
eb3911d9bf
Restore translations from not-yet-ported onboarding changes as glitch-soc translations
2023-04-29 19:38:08 +02:00
ffb5a3d4f3
[Glitch] Change logo version in header based on screen size in web UI
...
Port 4e6e4bcc4d
2023-04-29 18:54:13 +02:00
c4e35a3f68
[Glitch] Enable formatjs/prefer-pound-in-plural
...
Port 86d0a0b7d8
2023-04-29 18:38:23 +02:00
a1a60257c5
Disable full-width media in thread view
2023-04-29 12:43:01 +02:00
a6a1587450
[Glitch] Fix thread lines in right-to-left locales ( #24714 )
...
Port 4e7a3a2faf
2023-04-29 12:21:44 +02:00
c82f3a67c1
[Glitch] Fix sass warning about deprecated slash as division ( #24653 )
...
Port 3141130720
2023-04-29 12:17:06 +02:00
a2a800c212
[Glitch] Add lines to threads in web UI
...
Port 4141f9228c
2023-04-29 12:08:13 +02:00
bf04ff4601
[Glitch] Change label from "For you" to "People" on explore screen in web UI
...
Port a6c7401225
2023-04-29 11:34:44 +02:00
1b1a7e5a51
[Glitch] Change styling of the recommended accounts to allow bio to be more visible
...
Port 84adcaa474
2023-04-29 11:28:24 +02:00
ab2df6fb69
[Glitch] Use CSS to trim long card descriptions
...
Port 4613dfe97b
2023-04-29 11:26:58 +02:00
5c4f034e9b
[Glitch] Fix infinite loop in emoji replacement code
...
Port a55f461b4b
2023-04-29 11:14:43 +02:00
53e8b2dc7e
[Glitch] Fix characters being emojified even when using Variation Selector 15 (text)
...
Port 2473078db7
2023-04-29 11:12:35 +02:00
e45bb3f893
[Glitch] Allow `==` when null checking
...
Port f14395c2cf
2023-04-29 11:09:46 +02:00
498de92bc8
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/dependabot.yml`:
Updated upstream, removed in glitch-soc to disable noise.
Kept removed.
- `CODE_OF_CONDUCT.md`:
Upstream updated to a new version of the covenant, but I have not read it
yet, so kept unchanged.
- `Gemfile.lock`:
Not a real conflict, one upstream dependency updated textually too close to
the glitch-soc only `hcaptcha` dependency.
Applied upstream changes.
- `app/controllers/admin/base_controller.rb`:
Minor conflict due to glitch-soc's theming system.
Applied upstream changes.
- `app/controllers/application_controller.rb`:
Minor conflict due to glitch-soc's theming system.
Applied upstream changes.
- `app/controllers/disputes/base_controller.rb`:
Minor conflict due to glitch-soc's theming system.
Applied upstream changes.
- `app/controllers/relationships_controller.rb`:
Minor conflict due to glitch-soc's theming system.
Applied upstream changes.
- `app/controllers/statuses_cleanup_controller.rb`:
Minor conflict due to glitch-soc's theming system.
Applied upstream changes.
- `app/helpers/application_helper.rb`:
Minor conflict due to glitch-soc's theming system.
Applied upstream changes.
- `app/javascript/mastodon/features/compose/components/compose_form.jsx`:
Upstream added a highlight animation for onboarding, while we changed the
max character limit.
Applied our local changes on top of upstream's new version.
- `app/views/layouts/application.html.haml`:
Minor conflict due to glitch-soc's theming system.
Applied upstream changes.
- `stylelint.config.js`:
Upstream added ignore paths, glitch-soc had extra ignore paths.
Added the same paths as upstream.
2023-04-29 10:44:56 +02:00
4e7a3a2faf
Fix thread lines in right-to-left locales ( #24714 )
2023-04-28 13:12:35 +02:00
febcc47cb3
Fix wrong classes `audio` and `video` instead of `audio-player` and `video-player` in CSS ( #24711 )
2023-04-28 11:15:43 +02:00
ff65e8e974
Add default post text to onboarding flow in web UI ( #24705 )
2023-04-28 10:05:34 +02:00
4e6e4bcc4d
Change logo version in header based on screen size in web UI ( #24707 )
2023-04-28 10:00:33 +02:00
a6c7401225
Change label from "For you" to "People" on explore screen in web UI ( #24706 )
2023-04-28 08:54:20 +02:00
7aed94ab13
Fix refering to unused `preview-card` CSS class instead of `status-card` ( #24696 )
2023-04-28 07:50:31 +02:00
4fb3d20faf
Fix preview cards layout in thread view ( #24677 )
2023-04-27 01:45:19 +02:00
231c132159
New Crowdin updates ( #24617 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-04-27 04:55:06 +09:00
c33ecc00fa
[Glitch] [Proposal] Make able to write React in Typescript ( #2190 )
...
Port 4866812b28
2023-04-26 21:30:41 +02:00
3141130720
Fix sass warning about deprecated slash as division ( #24653 )
...
Co-authored-by: Nick Schonning <nschonni@gmail.com>
2023-04-25 22:15:00 +02:00
c6305b9817
Fix small mistakes in RTL layout ( #2182 )
...
Borders in blockquotes in reply-indicator weren't colored properly.
avatar margin when viewing edited toots dropdown was applied to wrong side.
Conversations had padding applied to the wrong side.
Padding for notifcation cleaner checkboxes was applied to wrong side.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-04-25 20:33:27 +02:00
10259df1be
Change `drawer--header` to `drawer__header` ( #2189 )
...
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-04-25 20:29:04 +02:00
d94f500d9c
Add more tips to onboarding flow in web UI ( #24646 )
2023-04-25 11:12:37 +02:00
49493f8b50
Change hashtags and mentions in bios to open in-app in web UI ( #24643 )
2023-04-25 06:33:21 +02:00
1af9d25c8a
Fix cutting off first letter of hashtag links sometimes in web UI ( #24623 )
2023-04-24 09:53:54 +02:00
86d0a0b7d8
Enable formatjs/prefer-pound-in-plural ( #24622 )
2023-04-24 08:07:19 +02:00
4141f9228c
Add lines to threads in web UI ( #24549 )
2023-04-24 08:07:03 +02:00
92e237574f
Remove empty Kushubian (csb) local files ( #24151 )
2023-04-23 22:43:12 +02:00
84adcaa474
Change styling of the recommended accounts to allow bio to be more visible ( #24480 )
2023-04-23 22:33:08 +02:00
4613dfe97b
Use CSS to trim long card descriptions ( #24265 )
2023-04-23 22:32:47 +02:00
30666618ea
Add new onboarding flow to web UI ( #24619 )
2023-04-23 22:24:53 +02:00
f353e2b0b5
Fix JS crashing if initial-state is not set ( #2193 )
...
Fixes issues with the JS for at least sign-up pages not working
2023-04-22 19:13:20 +02:00
4a0aa54a87
New Crowdin updates ( #24517 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-04-22 19:37:41 +09:00
0015bd91a6
[Glitch] Rewrite AnimatedNumber component with React hooks
...
Port b72a9eb02e
2023-04-22 11:28:23 +02:00
eadf9807fb
[Glitch] Rewrite GIFV component with React hooks
...
Port e8450b1dc2
2023-04-22 11:22:49 +02:00
0bc7beb1b1
[Glitch] Add client-side validation for taken username in sign-up form
...
Port 39bb8504b5
2023-04-22 10:47:44 +02:00
3919549c96
[Glitch] Fix crash when trying to open the filter modal
...
Port 8e36b04fd2
2023-04-22 10:20:50 +02:00
7642a3bb67
[Glitch] Add progress indicator to sign-up flow
...
Port 9a7a4d79ec
2023-04-22 10:18:20 +02:00
98bc47e3ca
[Glitch] Fix status title for statuses without text
...
Port 9b7e66c109
2023-04-22 10:16:20 +02:00
b31e7d43ea
[Glitch] typo: collapsable -> collapsible
...
Port de18852ec7
2023-04-22 10:13:58 +02:00
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
a55f461b4b
Fix infinite loop in emoji replacement code ( #24615 )
2023-04-21 18:08:28 +02:00
2473078db7
Fix characters being emojified even when using Variation Selector 15 (text) ( #20949 )
2023-04-20 16:43:55 +02:00
f14395c2cf
Allow `==` when null checking ( #24593 )
2023-04-19 17:46:46 +02:00
b72a9eb02e
Rewrite AnimatedNumber component with React hooks ( #24559 )
2023-04-17 13:25:15 +02:00
8e36b04fd2
Fix crash when trying to open the filter modal ( #24556 )
2023-04-17 10:15:21 +02:00
d7a0f21886
Rewrite AvatarOverlay component with React hooks ( #24543 )
2023-04-17 07:07:27 +02:00
d509c41d38
[Glitch] Change all components to use the same error page in web UI
...
Port 8b0c634a8a
2023-04-16 18:20:51 +02:00
d6e6a036b4
[Glitch] Add “In Memoriam” banner back to profiles
...
Port e5498861d4
2023-04-16 18:02:16 +02:00
0332ac95c0
[Glitch] Fix tab arrows on RTL layouts
...
Port 98022f6f5d
2023-04-16 17:58:32 +02:00
fca86b29d9
Merge branch 'main' into glitch-soc/merge-upstream
2023-04-16 17:52:44 +02:00
da094537d6
[Glitch] Refactor styles to use logical properties for positioning ( #2156 )
...
Port 5ec33534f80679fcd2f1
2023-04-16 17:45:18 +02:00
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
e8450b1dc2
Rewrite GIFV component with React hooks ( #24552 )
2023-04-16 16:09:04 +02:00
9a7a4d79ec
Add progress indicator to sign-up flow ( #24545 )
2023-04-16 07:01:24 +02:00
39bb8504b5
Add client-side validation for taken username in sign-up form ( #24546 )
2023-04-16 02:10:48 +02:00
9b7e66c109
Fix status title for statuses without text ( #24359 )
2023-04-14 17:29:09 +02:00
de18852ec7
typo: collapsable -> collapsible ( #24521 )
2023-04-14 11:01:23 +02:00
98022f6f5d
Fix tab arrows on RTL layouts ( #24520 )
2023-04-12 16:01:49 +02:00
da451d859f
Fix missing translation strings in en.json and defaultMessages.json ( #24518 )
2023-04-12 15:24:45 +02:00
e5498861d4
Add “In Memoriam” banner back to profiles ( #23614 )
2023-04-12 14:50:02 +02:00
7636512acb
New Crowdin updates ( #24447 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-04-12 20:21:32 +09:00
8b0c634a8a
Change all components to use the same error page in web UI ( #24512 )
2023-04-12 12:44:58 +02:00
db3900bf4c
Run `yarn manage:translations`
2023-04-09 15:56:31 +02:00
ba8ba4f476
Move glitch-soc-only translation strings out of `app/javascript/mastodono/locales`
2023-04-09 15:53:45 +02:00
3237eb3759
[Glitch] Ensure tabIndex is number instead of string
...
Port 53376db94c
2023-04-09 14:47:29 +02:00
3e1e35b8ec
[Glitch] Fix loading spinner + infinite scroll for private mentions
...
Port c9fed25d56
2023-04-09 12:10:01 +02:00
61e2fa8b76
[Glitch] Enable Stylelint property-no-unknown
...
Port 24919590a0
2023-04-09 12:05:55 +02:00
b32dbd5500
[Glitch] Fix tooltip for dates without time
...
Port 07497b9956
2023-04-09 12:04:17 +02:00
8aafeb72cf
[Glitch] Remove Array.prototype.includes polyfill
...
Port e9df65bad0
2023-04-09 12:03:11 +02:00
95a401efa4
[Glitch] Fix account header image missing in low-res
...
Port b2e306d3db
2023-04-09 12:01:55 +02:00
ba35f8f630
[Glitch] Fix height of announcements not being updated when using reduced animations
...
Port 2507c0a462
2023-04-09 12:01:11 +02:00
e9fd7d9e02
[Glitch] Update display_media typing to string
...
Port a334f64652
2023-04-09 12:00:26 +02:00
bd52e88774
[Glitch] Set marginRight as string
...
Port 37e98d9d56
2023-04-09 11:59:42 +02:00
499485585e
[Glitch] SUBMIT doesn't exist on XMLHttpRequest
...
Port d5a6c93808
2023-04-09 11:58:45 +02:00
970001fd77
[Glitch] HTML string attributes set as booleans
...
Port 4ba81aa8dd
2023-04-09 11:56:02 +02:00
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
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
07497b9956
Fix tooltip for dates without time ( #24244 )
2023-04-07 16:19:43 +02:00
c9fed25d56
Fix loading spinner + infinite scroll for private mentions ( #24446 )
2023-04-07 15:44:31 +02:00
e9df65bad0
Remove Array.prototype.includes polyfill ( #24234 )
2023-04-07 13:03:42 +02:00
b2e306d3db
Fix account header image missing in low-res ( #24433 )
2023-04-07 11:57:43 +02:00
66cbd18531
New Crowdin updates ( #24378 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-04-06 23:24:31 +09: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
2507c0a462
Fix height of announcements not being updated when using reduced animations ( #24354 )
2023-04-05 14:58:10 +02:00
a334f64652
Update display_media typing to string ( #24416 )
2023-04-05 13:20:21 +02:00
37e98d9d56
Set marginRight as string ( #24422 )
2023-04-05 10:57:36 +02:00
d5a6c93808
SUBMIT doesn't exist on XMLHttpRequest ( #24423 )
2023-04-05 10:56:55 +02:00
24919590a0
Enable Stylelint property-no-unknown ( #24404 )
2023-04-05 09:04:08 +02:00
0679fcd2f1
Fix styling regressions from RTL layout refactor ( #24415 )
2023-04-04 16:48:34 +02:00
53376db94c
Ensure tabIndex is number instead of string ( #24409 )
2023-04-04 16:33:44 +02:00
4ba81aa8dd
HTML string attributes set as booleans ( #24408 )
2023-04-04 16:33:33 +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
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
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
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
868d478b1b
Change "direct message" nomenclature to "private mention" in web UI ( #24248 )
2023-03-30 15:16:20 +02:00
d339684df5
Fix: set multiColumn value for /explore Statuses ( #24314 )
2023-03-30 10:14:49 +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
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
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
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
6ffb8609f9
Fit the max-width of media in .prose to parent box ( #24180 )
2023-03-20 20:04:25 +01:00
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
bb60db4471
[Glitch] Replace `Status#translatable?` with language matrix in separate endpoint
...
Port 7583523bf0
2023-03-16 23:21:08 +01:00
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
83f302c101
New Crowdin updates ( #23904 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-03-16 21:02:00 +09:00
7583523bf0
Replace `Status#translatable?` with language matrix in separate endpoint ( #24037 )
2023-03-16 11:07:24 +01:00
20af3cc038
[Glitch] Center the text itself in upload area
...
Port 100ada1e2b
2023-03-15 09:33:48 +01:00
08685405f1
[Glitch] add modal message when editing toot
...
Port c4c1c8aecc
2023-03-15 09:33:14 +01:00
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
100ada1e2b
Center the text itself in upload area ( #24029 )
2023-03-09 14:35:44 +01:00
c4c1c8aecc
add modal message when editing toot ( #23936 )
...
Co-authored-by: PauloVilarinho <paulotarsobranco@hotmail.com>
2023-03-06 17:33:09 +01:00
5f94d33a67
Refactor glitch-soc rich text SCSS
2023-03-05 21:31:45 +01:00
a813ea3c25
[Glitch] Only offer translation for supported languages
...
Port cc0c37cd69
2023-03-05 21:19:04 +01:00
81aac88f65
[Glitch] Switched bookmark and favourites around
...
Port f5fe444913
2023-03-05 21:07:55 +01:00
05763031f1
[Glitch] Fix duplicate “Publish” button on mobile
...
Port 3faa229d8d
2023-03-05 21:07:10 +01:00
a6363c3a2a
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream README has been changed, but we have a completely different one.
Kept our `README.md`.
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream added support for more incoming HTML tags (a large subset of what
glitch-soc accepts).
Change the code style to match upstream's but otherwise do not change our
code.
- `spec/lib/sanitize_config_spec.rb`:
Upstream added support for more incoming HTML tags (a large subset of what
glitch-soc accepts).
Kept our version, since the tests are mostly glitch-soc's, except for cases
which are purposefuly different.
2023-03-05 20:46:56 +01:00
f7a679a4f5
New Crowdin updates ( #2118 )
...
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
2023-03-05 20:38:18 +01:00
b50a08b15b
[Glitch] Add `lang` attribute to media and poll options
...
Port 41655e16ea
2023-03-05 17:52:53 +01:00
50b76430b4
Do not leave Mastodon when clicking “Back” ( #23953 )
2023-03-04 23:18:19 +01:00
cc0c37cd69
Only offer translation for supported languages ( #23879 )
2023-03-03 21:06:31 +01:00
f5fe444913
Switched bookmark and favourites around ( #23701 )
2023-03-03 20:37:49 +01:00
3faa229d8d
Fix duplicate “Publish” button on mobile ( #23804 )
2023-03-03 20:25:36 +01:00
16c8144b1c
Add support for incoming rich text ( #23913 )
2023-03-03 20:19:29 +01:00
a95dc48e01
Merge branch 'main' into glitch-soc/merge-upstream
2023-03-02 17:32:38 +01:00
096f622340
New Crowdin updates ( #23802 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-02-28 23:01:05 +09:00
41655e16ea
Add `lang` attribute to media and poll options ( #23891 )
2023-02-26 20:13:27 +01:00
42f73a411c
Move misc rules from components/index.scss to components/misc.scss
2023-02-25 23:47:21 +01:00
59b7c6e3d8
Fix glitch-soc SCSS code style and refactor closer to upstream
2023-02-25 23:46:23 +01:00
5eaad2ae5b
[Glitch] Add `lang` attribute to preview card
...
Port e56145661c
2023-02-25 14:43:57 +01:00
650ea1316a
[Glitch] Increase contrast of upload progress background
...
Port 808c9a7cf4
2023-02-25 14:43:24 +01:00
213b82d0a4
[Glitch] Fix sidebar cut-off on small screens in admin UI
...
Port 1f844d0d18
2023-02-25 14:40:29 +01:00
5548b2c73f
[Glitch] Add `lang` tag to native language names in language picker
...
Port 82c464d4d0
2023-02-25 14:37:05 +01:00
295d193e7f
[Glitch] Rename JSX files with proper `.jsx` extension
...
Port ae3812d182
2023-02-25 14:35:31 +01:00
f3cd30942c
Fix building vanilla flavor after JSX change
2023-02-25 14:28:59 +01:00
f15ded319f
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.prettierignore`:
Upstream added a line at the end of the file, while glitch-soc had its own
extra lines.
Took upstream's change.
- `CONTRIBUTING.md`:
We have our custom CONTRIBUTING.md quoting upstream. Upstream made changes.
Ported upstream changes.
- `app/controllers/application_controller.rb`:
Upstream made code style changes in a method that is entirely replaced
in glitch-soc.
Ignored the change.
- `app/models/account.rb`:
Code style changes textually close to glitch-soc-specific changes.
Ported upstream changes.
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream code style changes.
Ignored them.
2023-02-25 14:00:40 +01:00
e56145661c
Add `lang` attribute to preview card ( #23869 )
2023-02-24 20:04:38 +01:00
808c9a7cf4
Increase contrast of upload progress background ( #23836 )
2023-02-23 12:58:42 +01:00
6bfb54dccc
New Crowdin updates ( #23625 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-02-22 21:16:02 +09:00
1f844d0d18
Fix sidebar cut-off on small screens in admin UI ( #23764 )
2023-02-21 10:06:13 +01:00
82c464d4d0
Add `lang` tag to native language names in language picker ( #23749 )
2023-02-21 09:23:39 +01:00
b5b0bc17e8
Change compose form checkbox to native input with `appearance: none` ( #22949 )
2023-02-20 11:32:27 +01:00
2dbe2b56aa
Make larger part of status clickable ( #23621 )
2023-02-20 08:11:23 +01:00
ae3812d182
Rename JSX files with proper `.jsx` extension ( #23733 )
2023-02-20 03:20:59 +01:00
01654e8830
[Glitch] Fix focus point of already-attached media not saving after edit
...
Port 6ce20a89f5
2023-02-19 10:54:04 +01:00
eb3d03a52a
[Glitch] Fix bad type for spellCheck attribute
...
Port 2c8bb9a76a
2023-02-19 10:53:44 +01:00
0bf3bbf662
[Glitch] Enable ESLint Promise plugin defaults
...
Port a80ff32d9a
2023-02-19 10:53:18 +01:00
63992c6900
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/dependabot.yml`:
Upstream made changes while we have dropped this file.
Keep the file deleted.
- `.prettierignore`:
Upstream made changes at the end of the file, where we
had our extra lines.
Just moved our extra lines back at the end.
- `app/serializers/initial_state_serializer.rb`:
Upstream code style changes.
Applied them.
- `app/services/backup_service.rb`:
Upstream code style changes.
Applied them.
2023-02-19 10:42:55 +01:00
6ce20a89f5
Fix focus point of already-attached media not saving after edit ( #23566 )
2023-02-19 07:11:18 +01:00
efe3fb00c7
Merge pull request #2112 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2023-02-18 22:05:11 +01:00
b0e7d10f63
[Glitch] Upgrade to Stylelint 15 with Prettier
...
Port 6417e06194
2023-02-18 16:02:12 +01:00
a0bef6bdb6
[Glitch] Enable ESLint no-useless-escape
...
Port 1c2ca9557f
2023-02-18 16:02:12 +01:00
70984c6f65
[Glitch] Enable ESLint import recommended rules
...
Port 2663b421be
2023-02-18 16:02:12 +01:00
623b6543b2
New Crowdin updates ( #2111 )
...
* New translations en.json (Korean)
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.json (Portuguese)
[ci skip]
* Fix root key name in pt-PT translation file
* Fix normalization issue with ES translation
* Fix issue with `no` locale in glitch-soc
2023-02-18 11:16:30 +01:00
2c8bb9a76a
Fix bad type for spellCheck attribute ( #23638 )
2023-02-17 09:51:27 +01:00
a80ff32d9a
Enable ESLint Promise plugin defaults ( #22229 )
2023-02-16 15:30:56 +09:00
4ed26b106c
New Crowdin updates ( #23527 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-02-16 10:23:03 +09:00
6c64af449c
[Glitch] Fix case-sensitive check for previously used hashtags
...
Port 28bc6265bf
2023-02-13 20:05:36 +01:00
b525ce4bf9
[Glitch] Fix attached media uploads not being cleared when replying to a post
...
Port 3c1e48d304
2023-02-13 20:04:45 +01:00
92d1e05c3e
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.prettierignore`:
Upstream added a line at the end, glitch-soc had extra entries at the end.
Added upstream's new line before glitch-soc's.
- `Gemfile.lock`:
Upstream updated dependencies while glitch-soc has an extra one (hcaptcha).
Updated dependencies like upstream did.
- `app/controllers/api/v1/statuses_controller.rb`:
Not a real conflict, upstream added a parameter (`allowed_mentions`) where
glitch-soc already had an extra one (`content_type`).
Added upstream's new parameter.
- `app/javascript/styles/fonts/roboto-mono.scss`:
A lot of lines were changed upstream due to code style changes, and a lot
of those lines had path changes to accomodate glitch-soc's theming system.
Applied upstream's style changes.
- `app/javascript/styles/fonts/roboto.scss`:
A lot of lines were changed upstream due to code style changes, and a lot
of those lines had path changes to accomodate glitch-soc's theming system.
Applied upstream's style changes.
2023-02-13 19:35:35 +01:00
2663b421be
Enable ESLint import recommended rules ( #23315 )
2023-02-13 15:12:31 +01:00
1c2ca9557f
Enable ESLint no-useless-escape ( #23311 )
2023-02-13 15:12:14 +01:00
28bc6265bf
Fix case-sensitive check for previously used hashtags ( #23526 )
2023-02-13 14:54:08 +01:00
6417e06194
Upgrade to Stylelint 15 with Prettier ( #23558 )
2023-02-13 04:57:03 +01:00
ab546780eb
fix hashtag ordering ( #2107 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2023-02-12 18:58:02 +01:00
84c2fdb503
New Crowdin updates ( #2100 )
...
* New translations en.json (Korean)
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
2023-02-12 18:16:08 +01:00
6917c854d1
Merge branch 'main' into glitch-soc/merge-upstream
2023-02-10 22:49:59 +01:00
3c1e48d304
Fix attached media uploads not being cleared when replying to a post ( #23504 )
2023-02-10 22:03:35 +01:00
b21f5906b9
New Crowdin updates ( #23413 )
...
* New translations en.json (Esperanto)
* New translations en.yml (Slovak)
* New translations en.json (Burmese)
* New translations en.yml (Korean)
* New translations en.json (Burmese)
* New translations en.json (Burmese)
* New translations en.yml (Finnish)
* New translations simple_form.en.yml (Finnish)
* New translations en.json (Burmese)
* New translations en.yml (Burmese)
* New translations en.yml (Burmese)
* New translations en.json (Burmese)
* New translations activerecord.en.yml (Burmese)
* New translations en.yml (Burmese)
* New translations activerecord.en.yml (Burmese)
* New translations en.json (German)
* New translations simple_form.en.yml (German)
* New translations en.json (Catalan)
* New translations en.yml (Burmese)
* New translations en.yml (Burmese)
* New translations en.yml (Russian)
* New translations doorkeeper.en.yml (Russian)
* New translations simple_form.en.yml (Russian)
* New translations en.json (Russian)
* New translations en.json (Belarusian)
* New translations en.json (Belarusian)
* New translations en.json (Esperanto)
* New translations en.yml (Esperanto)
* New translations doorkeeper.en.yml (Korean)
* New translations en.json (Burmese)
* New translations en.yml (Slovak)
* New translations en.yml (Belarusian)
* New translations simple_form.en.yml (Belarusian)
* New translations simple_form.en.yml (Esperanto)
* New translations doorkeeper.en.yml (Esperanto)
* New translations activerecord.en.yml (Esperanto)
* New translations devise.en.yml (Esperanto)
* New translations en.yml (English, United Kingdom)
* New translations en.yml (Asturian)
* New translations simple_form.en.yml (Asturian)
* New translations en.yml (Asturian)
* New translations doorkeeper.en.yml (Asturian)
* New translations en.json (Asturian)
* New translations en.yml (Asturian)
* New translations en.json (Asturian)
* New translations en.json (Korean)
* New translations en.yml (Korean)
* New translations en.json (Korean)
* New translations en.yml (Korean)
* New translations devise.en.yml (Korean)
* New translations simple_form.en.yml (Korean)
* New translations en.json (Welsh)
* New translations en.yml (Welsh)
* New translations simple_form.en.yml (Welsh)
* New translations activerecord.en.yml (Welsh)
* New translations devise.en.yml (Welsh)
* New translations doorkeeper.en.yml (Welsh)
* New translations en.yml (Burmese)
* New translations en.yml (Burmese)
* New translations en.yml (Burmese)
* New translations en.json (Silesian)
* New translations en.yml (Occitan)
* New translations en.yml (Turkish)
* New translations simple_form.en.yml (Turkish)
* New translations en.json (Occitan)
* New translations activerecord.en.yml (Turkish)
* New translations doorkeeper.en.yml (Turkish)
* Normalize
* Remove unused locales
---------
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-02-11 05:42:08 +09:00
f925f5bf2f
[Glitch] Add scrolling to Compare history modal
...
Port 7406c66b77
2023-02-09 13:03:41 +01:00
54e6fa1363
[Glitch] Show spinner while loading follow requests
...
Port 059a055e65
2023-02-09 13:02:32 +01:00
Nick Schonning