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
75a3da1abf
Change logged-out WebUI HTML pages to be cached for a few seconds ( #24708 )
2023-04-28 10:27:26 +02:00
ff65e8e974
Add default post text to onboarding flow in web UI ( #24705 )
2023-04-28 10:05:34 +02:00
3acc54f7bf
Fix /api/v1/custom_emojis being cached even when unauthenticated API access is disallowed ( #24665 )
2023-04-28 10:01:38 +02:00
4e6e4bcc4d
Change logo version in header based on screen size in web UI ( #24707 )
2023-04-28 10:00:33 +02:00
4438c74c20
Remove display name input from sign-up form ( #24704 )
2023-04-28 08:54:43 +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
3104805285
Remove duplicate react helper method definitions ( #24700 )
2023-04-28 06:35:25 +02:00
519ae8c0c6
Drop EOL Ruby 2.7 ( #24237 )
2023-04-27 01:46:18 +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
dcb91de3ba
React component helper specs ( #24072 )
2023-04-26 18:21:32 +02:00
e82696a4b9
Fix /api/v1/instance/domain_blocks being unconditionally cached ( #24662 )
2023-04-26 11:42:47 +02:00
8c30221a41
Fix /actor needlessly reading session cookie and varying on Signature ( #24664 )
2023-04-26 11:42:26 +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
0cfbe4c4af
Fix some user-independent endpoints potentially reading session cookies ( #24650 )
2023-04-25 22:14:44 +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
31bd0da41f
Fix anonymous visitors getting a session cookie on first visit ( #24584 )
2023-04-25 16:51:38 +02:00
b61ff36351
Change unauthenticated responses to be cached in REST API ( #24348 )
2023-04-25 15:41:34 +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
24d5626e02
Fix crash when SSO_ACCOUNT_SETTINGS is not defined ( #24628 )
2023-04-24 20:26:04 +02:00
1af9d25c8a
Fix cutting off first letter of hashtag links sometimes in web UI ( #24623 )
2023-04-24 09:53:54 +02:00
kouhai dev
7c715a1ec4
th: Merge remote-tracking branch 'glitch/main'
2023-04-23 23:23:28 -07: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
7598355527
Remove `tai` locale ( #23880 )
2023-04-23 22:49:07 +02:00
92e237574f
Remove empty Kushubian (csb) local files ( #24151 )
2023-04-23 22:43:12 +02:00
f01a643897
Remove instance variables from helper usage ( #24203 )
2023-04-23 22:35:54 +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
d8e7a72597
Fix caching logic with regards to Accept-Language, Cookie, and Signature ( #24604 )
2023-04-23 22:27:24 +02:00
59a73ea537
Fix AccountsStatusesCleanupScheduler not spreading deletes across accounts correctly ( #24607 )
2023-04-23 22:25:40 +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
kouhai dev
004c452343
th: Merge remote-tracking branch 'glitch/main'
2023-04-22 01:48:47 -07: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
kouhai dev
bd2edc2d37
th: Merge remote-tracking branch 'glitch/main'
2023-04-22 00:38:08 -07:00
kouhai dev
4be96df50b
th: fix build
2023-04-22 00:38:08 -07:00
kouhai dev
ac9104875b
th: fix extension
2023-04-22 00:38:08 -07:00
kouhai dev
ee1dc4a0d1
th: Merge remote-tracking branch 'glitch/main'
2023-04-22 00:38:08 -07:00
kouhai dev
da1aa87c6f
th: Merge remote-tracking branch 'glitch/main'
2023-04-22 00:38:08 -07:00
kouhai dev
228f9c72d4
th: update models, node/Gemfile state
2023-04-22 00:38:08 -07:00
kouhai dev
705fd6c182
th: Merge remote-tracking branch 'glitch/main'
2023-04-22 00:38:08 -07:00
kouhai dev
a936e75d02
th: Merge remote-tracking branch 'glitch/main'
2023-04-22 00:38:08 -07:00
f769daf908
Change automatic post deletion thresholds and load detection ( #24614 )
2023-04-21 18:14:19 +02:00
a55f461b4b
Fix infinite loop in emoji replacement code ( #24615 )
2023-04-21 18:08:28 +02:00
d1e9e79cb7
Minor clean up and optimization of the automatic post deletion code ( #24613 )
2023-04-21 16:53:50 +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
3ca64638d4
Refactor `Cache-Control` and `Vary` definitions ( #24347 )
2023-04-19 16:07:29 +02:00
335b53ab48
Add trend management to admin API ( #24257 )
2023-04-18 11:33:30 +02:00
a34c422490
Change moderation search an account using the username with @ ( #24242 )
2023-04-17 14:16:36 +02:00
b72a9eb02e
Rewrite AnimatedNumber component with React hooks ( #24559 )
2023-04-17 13:25:15 +02:00
27fab2ce37
Fix crash in NotifyService when trying to send an email notification for polls ( #24558 )
2023-04-17 13:13:36 +02:00
e2760bd0ee
Add user handle to notification mail recipient address ( #24240 )
...
Co-authored-by: luccamps <luccamps@users.noreply.github.com>
Co-authored-by: Leonardo Negreiros de Oliveira <negreirosleo12@gmail.com>
Co-authored-by: Marcio Flavio <mflaviof1995@gmail.com>
Co-authored-by: Gabriel Quaresma <j.quaresmasantos_98@hotmail.com>
2023-04-17 11:06:06 +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
c4708b54b5
Fix default content type setting not applying ( #2176 )
...
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-04-12 20:12:25 +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
1afa6d8cbf
Refactor `Status._insert_record` slightly and tighten the test around reblogs of discarded statuses ( #24516 )
2023-04-12 12:47:05 +02:00
8b0c634a8a
Change all components to use the same error page in web UI ( #24512 )
2023-04-12 12:44:58 +02:00
158d6fcb43
fixed typo in a constant name ( #24511 )
2023-04-12 10:06:57 +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
0cbf19affd
Fix most rubocop issues ( #2165 )
...
* Run rubocop --autocorrect on app/, config/ and lib/, also manually fix some remaining style issues
* Run rubocop --autocorrect-all on db/
* Run rubocop --autocorrect-all on `spec/` and fix remaining issues
2023-04-09 11:25:30 +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
172a4ad9f4
Fix crash in NotifyService when trying to send an email notification for post edits ( #24460 )
2023-04-08 12:51:14 +02:00
2d9cb47a4b
Fix glitch-soc HAML linting issues ( #2166 )
2023-04-07 20:55:28 +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
d30c48c975
Remove unused methods in 2FA OTP Auth Controller ( #24220 )
2023-04-07 14:13:53 +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
caf209b28b
Fix user archive takeouts when using OpenStack Swift ( #24431 )
2023-04-05 19:31:49 +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
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
Claire
kouhai dev