Claire
348aed03cf
Merge commit '0d919f27beb6e4e7a562a6eed8f354415b5c217e' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/dependabot.yml`:
Upstream made changes, but we had removed it.
Discarded upstream changes.
- `.rubocop_todo.yml`:
Upstream regenerated the file, we had some glitch-soc-specific ignores.
- `app/models/account_statuses_filter.rb`:
Minor upstream code style change where glitch-soc had slightly different code
due to handling of local-only posts.
Updated to match upstream's code style.
- `app/models/status.rb`:
Upstream moved ActiveRecord callback definitions, glitch-soc had an extra one.
Moved the definitions as upstream did.
- `app/services/backup_service.rb`:
Upstream rewrote a lot of the backup service, glitch-soc had changes because
of exporting local-only posts.
Took upstream changes and added back code to deal with local-only posts.
- `config/routes.rb`:
Upstream split the file into different files, while glitch-soc had a few
extra routes.
Extra routes added to `config/routes/settings.rb`, `config/routes/api.rb`
and `config/routes/admin.rb`
- `db/schema.rb`:
Upstream has new migrations, while glitch-soc had an extra migration.
Updated the expected serial number to match upstream's.
- `lib/mastodon/version.rb`:
Upstream added support to set version tags from environment variables, while
glitch-soc has an extra `+glitch` tag.
Changed the code to support upstream's feature but prepending a `+glitch`.
- `spec/lib/activitypub/activity/create_spec.rb`:
Minor code style change upstream, while glitch-soc has extra tests due to
`directMessage` handling.
Applied upstream's changes while keeping glitch-soc's extra tests.
- `spec/models/concerns/account_interactions_spec.rb`:
Minor code style change upstream, while glitch-soc has extra tests.
Applied upstream's changes while keeping glitch-soc's extra tests.
2 years ago
Claire
2847b0423b
Fix glitch-soc's thread line styling ( #2214 )
...
Thread lines were misaligned in glitch-soc because we have less padding and
larger avatar sizes.
2 years ago
fusagiko / takayamaki
dd098625f0
[Glitch] Add type annotation for RelativeTimestamp component
...
Port 90e4ab9f8f
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
fusagiko / takayamaki
c17c65aa57
[Glitch] Rewrite Icon and IconWithBadge with typescript
...
Port 27a750cc04
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Eugen Rochko
5bfff5807a
[Glitch] Fix icons having an image role
...
Port c7924acf16
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire
acc7cdc664
[Glitch] Fix audio player width in thread view
...
Port 9cf043f63a
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Nick Schonning
55561098c4
[Glitch] Add eslint-plugin-jsdoc
...
Port 0224c3c0d9
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Christian Schmidt
a9089a2458
[Glitch] Fix media description not being cleared
...
Port 6ccea199ca
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire
2aaf3528ca
Merge commit 'd548faf69321260ab4c2a16759ca77773189126a' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/styles/mastodon/forms.scss`:
Conflict because we ran eslint autofix on upstream files.
- `config/initializers/content_security_policy.rb`:
Code style changes but we have a different version.
Kept our version.
- `streaming/index.js`:
Upstream fixed a typo close to glitch-soc-only code.
Applied upstream's changes.
2 years ago
Claire
c90f09d36f
Fix more JS linting issues ( #2212 )
...
* Fix uses of intl.formatMessages without default messages
* Ignore lint issue for ColumnLink button
2 years ago
fusagiko / takayamaki
4ab18dee50
Rewrite Domain component as function component ( #24896 )
2 years ago
fusagiko / takayamaki
01caf92d80
Use LayoutType from is_mobile in actions/app ( #24863 )
2 years ago
Claire
db240323f6
Fix some more JS linting issues ( #2211 )
...
* Minor refactor and linting fixup in `flavours/glitch/actions/accounts.js`
This is some added boilerplate but it's much more consistent with the remaining
of the code, and avoids the linting issue.
* Fix missing /privacy-policy link in DM warning because of wrongly-named import
* Fix unnecessary import
* Fix regexp in flavours/glitch/utils/hashtag.js
2 years ago
たいち ひ
5f709b1601
Add TypeScript support for `mastodon` alias and image imports ( #24895 )
2 years ago
たいち ひ
13a16f3054
Rewrite RadioButton component as FC ( #24897 )
2 years ago
たいち ひ
c1ccb55a59
Rewrite Image component as function component ( #24893 )
2 years ago
たいち ひ
23a97effdb
Rewrite <NotSignedInIndicator /> as FC ( #24903 )
2 years ago
たいち ひ
daecca565e
Rewrite <Check /> as FC ( #24901 )
2 years ago
Claire
12e8bcac9d
Fix some more Javascript linting issues and discrepancies with upstream ( #2209 )
...
* Fix typo in flavours/glitch/features/video/index.js
* Fix various linting issues and discrepancies with upstream
2 years ago
Claire
43c40b5df8
Fix thread lines not being properly updated when new posts are received ( #2210 )
2 years ago
Plastikmensch
ef5df7fc66
Reset language to default when cancelling a reply ( #2114 )
...
When cancelling a reply, the language was still set to the language of the replied to toot.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2 years ago
Claire
e390c26429
Fix some of the Javascript linting issues, as well as bugs and unneeded divergences with upstream ( #2208 )
...
* Run eslint --fix
* Fix linting issues in video player and reduce divergences with upstream
This includes a behavior change of not auto-looping videos anymore. I don't
remember loops being ever intended, and they have been removed from upstream
a while ago, but we somehow missed the change.
* Fix lint issues in `app/javascript/flavours/glitch/selectors/index.js`
Those were basically caused by dead code that isn't present upstream, so
that brings us closer to upstream as well.
* Fix linting issue and bug in streaming/index.js
* Fix linting issues in config/webpack/shared.js
* Fix unused import in flavours/glitch/features/ui/index.js
* Fix linting issues and reduce divergences from upstream in flavours/glitch/features/ui/components/video_modal.jsx
* Fix linting issues in flavours/glitch/reducers
* Fix linting issues in glitch-soc onboarding modal
* Fix linting issues in flavours/glitch/features/ui/components/navigation_panel.jsx
* Remove dead code for unused local setting navbar_under
* Fix various linting issues
* Fix linting issues in flavours/glitch/components/scrollable_list.jsx and reduce divergences with upstream
2 years ago
Claire
b80dc7d2ed
Fix SCSS linting issues ( #2207 )
...
* Disable font-family-no-missing-generic-family-keyword for font-awesome accessibility icons
* Run stylelint --fix
* Avoid `@extend` directives with doodle modal CSS
* Drop use of `@extend` for notification cleanup buttons SCSS
* Run prettier on SCSS
2 years ago
Claire
481aed8061
New Crowdin updates ( #2202 )
...
* New translations en.json (Russian)
[ci skip]
* New translations en.json (Russian)
[ci skip]
2 years ago
fusagiko / takayamaki
2c894915dc
Rewrite VerifiedBadge component as function component ( #24892 )
2 years ago
Claire
f18f692f65
Fix compose textarea scroll behavior ( #24872 )
2 years ago
S.H
2a651be35a
Fix column back button error ( #24867 )
2 years ago
Nick Schonning
c366c93cfd
Fail ESLint for Warnings in CI ( #24836 )
2 years ago
Florin
1421a8efbd
Fix Back button going outside the app ( #24835 )
2 years ago
Renaud Chaput
e1985e14f6
Fixes build errors from some previous TS-related commits ( #24811 )
2 years ago
fusagiko / takayamaki
9ed91c444e
Rewrite actions/app.ts and reducers/missed_updates.ts with createAction ( #24801 )
2 years ago
Renaud Chaput
7bc13c1ca3
Remove MastodonMap TS type ( #24807 )
2 years ago
fusagiko / takayamaki
6fa4054a5d
Add type annotation for some js files ( #24787 )
2 years ago
Claire
d76495d080
Fix incorrect import of redux store ( #24805 )
2 years ago
Claire
52ed627d9e
Fix incorrect box shadow on avatar in thread view ( #24800 )
2 years ago
fusagiko / takayamaki
69bd3a86f3
use configureStore of redux-toolkit instead of createStore of redux ( #24790 )
2 years ago
Eugen Rochko
d6808a561e
Add ALT badges to media that has alternative text in web UI ( #24782 )
2 years ago
Claire
8c43856691
Change media elements to use aspect-ratio rather than compute height themselves ( #24686 )
2 years ago
fusagiko / takayamaki
fc4bb5ed66
Add type annotation for Blurhash component ( #24750 )
2 years ago
fusagiko / takayamaki
bee49de3db
Add type annotation for IconButton component ( #24753 )
2 years ago
Nick Schonning
7a13eb370f
Bump stylelint-config-standard-scss from 7.0.1 to 9.0.0 ( #24755 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2 years ago
fusagiko / takayamaki
90e4ab9f8f
Add type annotation for RelativeTimestamp component ( #24749 )
2 years ago
fusagiko / takayamaki
27a750cc04
Rewrite Icon and IconWithBadge with typescript ( #24747 )
2 years ago
Eugen Rochko
b9f44a797a
New Crowdin updates ( #24678 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2 years ago
Claire
9dfb594a45
Fix pop-in player placeholder layout in thread view ( #24715 )
2 years ago
Claire
9cf043f63a
Fix audio player width in thread view ( #24713 )
2 years ago
Nick Schonning
0224c3c0d9
Add eslint-plugin-jsdoc ( #24719 )
2 years ago
Christian Schmidt
6ccea199ca
Fix media description not being cleared ( #24720 )
2 years ago
Claire
eb3911d9bf
Restore translations from not-yet-ported onboarding changes as glitch-soc translations
2 years ago
Eugen Rochko
ffb5a3d4f3
[Glitch] Change logo version in header based on screen size in web UI
...
Port 4e6e4bcc4d
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Nick Schonning
c4e35a3f68
[Glitch] Enable formatjs/prefer-pound-in-plural
...
Port 86d0a0b7d8
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire
a1a60257c5
Disable full-width media in thread view
2 years ago
Claire
a6a1587450
[Glitch] Fix thread lines in right-to-left locales ( #24714 )
...
Port 4e7a3a2faf
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire
c82f3a67c1
[Glitch] Fix sass warning about deprecated slash as division ( #24653 )
...
Port 3141130720
to glitch-soc
Co-authored-by: Nick Schonning <nschonni@gmail.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Eugen Rochko
a2a800c212
[Glitch] Add lines to threads in web UI
...
Port 4141f9228c
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Eugen Rochko
bf04ff4601
[Glitch] Change label from "For you" to "People" on explore screen in web UI
...
Port a6c7401225
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Chike Nwaenie
1b1a7e5a51
[Glitch] Change styling of the recommended accounts to allow bio to be more visible
...
Port 84adcaa474
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Christian Schmidt
ab2df6fb69
[Glitch] Use CSS to trim long card descriptions
...
Port 4613dfe97b
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire
5c4f034e9b
[Glitch] Fix infinite loop in emoji replacement code
...
Port a55f461b4b
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire
53e8b2dc7e
[Glitch] Fix characters being emojified even when using Variation Selector 15 (text)
...
Port 2473078db7
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
fusagiko / takayamaki
e45bb3f893
[Glitch] Allow `==` when null checking
...
Port f14395c2cf
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire
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.
2 years ago
Claire
4e7a3a2faf
Fix thread lines in right-to-left locales ( #24714 )
2 years ago
Claire
febcc47cb3
Fix wrong classes `audio` and `video` instead of `audio-player` and `video-player` in CSS ( #24711 )
2 years ago
Eugen Rochko
ff65e8e974
Add default post text to onboarding flow in web UI ( #24705 )
2 years ago
Eugen Rochko
4e6e4bcc4d
Change logo version in header based on screen size in web UI ( #24707 )
2 years ago
Eugen Rochko
a6c7401225
Change label from "For you" to "People" on explore screen in web UI ( #24706 )
2 years ago
Claire
7aed94ab13
Fix refering to unused `preview-card` CSS class instead of `status-card` ( #24696 )
2 years ago
Claire
4fb3d20faf
Fix preview cards layout in thread view ( #24677 )
2 years ago
Eugen Rochko
231c132159
New Crowdin updates ( #24617 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2 years ago
Plastikmensch
c33ecc00fa
[Glitch] [Proposal] Make able to write React in Typescript ( #2190 )
...
Port 4866812b28
to glitch-soc
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2 years ago
Claire
3141130720
Fix sass warning about deprecated slash as division ( #24653 )
...
Co-authored-by: Nick Schonning <nschonni@gmail.com>
2 years ago
Plastikmensch
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>
2 years ago
Plastikmensch
10259df1be
Change `drawer--header` to `drawer__header` ( #2189 )
...
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2 years ago
Eugen Rochko
d94f500d9c
Add more tips to onboarding flow in web UI ( #24646 )
2 years ago
Eugen Rochko
49493f8b50
Change hashtags and mentions in bios to open in-app in web UI ( #24643 )
2 years ago
Eugen Rochko
1af9d25c8a
Fix cutting off first letter of hashtag links sometimes in web UI ( #24623 )
2 years ago
Nick Schonning
86d0a0b7d8
Enable formatjs/prefer-pound-in-plural ( #24622 )
2 years ago
Eugen Rochko
4141f9228c
Add lines to threads in web UI ( #24549 )
2 years ago
Nick Schonning
92e237574f
Remove empty Kushubian (csb) local files ( #24151 )
2 years ago
Chike Nwaenie
84adcaa474
Change styling of the recommended accounts to allow bio to be more visible ( #24480 )
2 years ago
Christian Schmidt
4613dfe97b
Use CSS to trim long card descriptions ( #24265 )
2 years ago
Eugen Rochko
30666618ea
Add new onboarding flow to web UI ( #24619 )
2 years ago
Claire
f353e2b0b5
Fix JS crashing if initial-state is not set ( #2193 )
...
Fixes issues with the JS for at least sign-up pages not working
2 years ago
Eugen Rochko
4a0aa54a87
New Crowdin updates ( #24517 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2 years ago
fusagiko / takayamaki
0015bd91a6
[Glitch] Rewrite AnimatedNumber component with React hooks
...
Port b72a9eb02e
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
fusagiko / takayamaki
eadf9807fb
[Glitch] Rewrite GIFV component with React hooks
...
Port e8450b1dc2
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Eugen Rochko
0bc7beb1b1
[Glitch] Add client-side validation for taken username in sign-up form
...
Port 39bb8504b5
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire
3919549c96
[Glitch] Fix crash when trying to open the filter modal
...
Port 8e36b04fd2
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Eugen Rochko
7642a3bb67
[Glitch] Add progress indicator to sign-up flow
...
Port 9a7a4d79ec
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Ivan Rodriguez
98bc47e3ca
[Glitch] Fix status title for statuses without text
...
Port 9b7e66c109
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Nick Schonning
b31e7d43ea
[Glitch] typo: collapsable -> collapsible
...
Port de18852ec7
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
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.
2 years ago
Claire
a55f461b4b
Fix infinite loop in emoji replacement code ( #24615 )
2 years ago
Claire
2473078db7
Fix characters being emojified even when using Variation Selector 15 (text) ( #20949 )
2 years ago
fusagiko / takayamaki
f14395c2cf
Allow `==` when null checking ( #24593 )
2 years ago
fusagiko / takayamaki
b72a9eb02e
Rewrite AnimatedNumber component with React hooks ( #24559 )
2 years ago
Claire
8e36b04fd2
Fix crash when trying to open the filter modal ( #24556 )
2 years ago
fusagiko / takayamaki
d7a0f21886
Rewrite AvatarOverlay component with React hooks ( #24543 )
2 years ago
Eugen Rochko
d509c41d38
[Glitch] Change all components to use the same error page in web UI
...
Port 8b0c634a8a
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire
d6e6a036b4
[Glitch] Add “In Memoriam” banner back to profiles
...
Port e5498861d4
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire
0332ac95c0
[Glitch] Fix tab arrows on RTL layouts
...
Port 98022f6f5d
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire
fca86b29d9
Merge branch 'main' into glitch-soc/merge-upstream
2 years ago
Plastikmensch
da094537d6
[Glitch] Refactor styles to use logical properties for positioning ( #2156 )
...
Port 5ec33534f8
and 0679fcd2f1
to glitch-soc
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2 years ago
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]
2 years ago
fusagiko / takayamaki
e8450b1dc2
Rewrite GIFV component with React hooks ( #24552 )
2 years ago
Eugen Rochko
9a7a4d79ec
Add progress indicator to sign-up flow ( #24545 )
2 years ago
Eugen Rochko
39bb8504b5
Add client-side validation for taken username in sign-up form ( #24546 )
2 years ago
Ivan Rodriguez
9b7e66c109
Fix status title for statuses without text ( #24359 )
2 years ago
Nick Schonning
de18852ec7
typo: collapsable -> collapsible ( #24521 )
2 years ago
Claire
98022f6f5d
Fix tab arrows on RTL layouts ( #24520 )
2 years ago
Claire
da451d859f
Fix missing translation strings in en.json and defaultMessages.json ( #24518 )
2 years ago
Claire
e5498861d4
Add “In Memoriam” banner back to profiles ( #23614 )
2 years ago
Eugen Rochko
7636512acb
New Crowdin updates ( #24447 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2 years ago
Eugen Rochko
8b0c634a8a
Change all components to use the same error page in web UI ( #24512 )
2 years ago
Claire
db3900bf4c
Run `yarn manage:translations`
2 years ago
Claire
ba8ba4f476
Move glitch-soc-only translation strings out of `app/javascript/mastodono/locales`
2 years ago
Nick Schonning
3237eb3759
[Glitch] Ensure tabIndex is number instead of string
...
Port 53376db94c
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Christian Schmidt
3e1e35b8ec
[Glitch] Fix loading spinner + infinite scroll for private mentions
...
Port c9fed25d56
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Nick Schonning
61e2fa8b76
[Glitch] Enable Stylelint property-no-unknown
...
Port 24919590a0
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Christian Schmidt
b32dbd5500
[Glitch] Fix tooltip for dates without time
...
Port 07497b9956
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Nick Schonning
8aafeb72cf
[Glitch] Remove Array.prototype.includes polyfill
...
Port e9df65bad0
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Christian Schmidt
95a401efa4
[Glitch] Fix account header image missing in low-res
...
Port b2e306d3db
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Christian Schmidt
ba35f8f630
[Glitch] Fix height of announcements not being updated when using reduced animations
...
Port 2507c0a462
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Nick Schonning
e9fd7d9e02
[Glitch] Update display_media typing to string
...
Port a334f64652
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Nick Schonning
bd52e88774
[Glitch] Set marginRight as string
...
Port 37e98d9d56
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Nick Schonning
499485585e
[Glitch] SUBMIT doesn't exist on XMLHttpRequest
...
Port d5a6c93808
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Nick Schonning
970001fd77
[Glitch] HTML string attributes set as booleans
...
Port 4ba81aa8dd
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
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.
2 years ago
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.
2 years ago
Christian Schmidt
07497b9956
Fix tooltip for dates without time ( #24244 )
2 years ago
Christian Schmidt
c9fed25d56
Fix loading spinner + infinite scroll for private mentions ( #24446 )
2 years ago
Nick Schonning
e9df65bad0
Remove Array.prototype.includes polyfill ( #24234 )
2 years ago
Christian Schmidt
b2e306d3db
Fix account header image missing in low-res ( #24433 )
2 years ago
Eugen Rochko
66cbd18531
New Crowdin updates ( #24378 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2 years ago
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
2 years ago
Christian Schmidt
2507c0a462
Fix height of announcements not being updated when using reduced animations ( #24354 )
2 years ago
Nick Schonning
a334f64652
Update display_media typing to string ( #24416 )
2 years ago
Nick Schonning
37e98d9d56
Set marginRight as string ( #24422 )
2 years ago
Nick Schonning
d5a6c93808
SUBMIT doesn't exist on XMLHttpRequest ( #24423 )
2 years ago
Nick Schonning
24919590a0
Enable Stylelint property-no-unknown ( #24404 )
2 years ago
Claire
0679fcd2f1
Fix styling regressions from RTL layout refactor ( #24415 )
2 years ago
Nick Schonning
53376db94c
Ensure tabIndex is number instead of string ( #24409 )
2 years ago
Nick Schonning
4ba81aa8dd
HTML string attributes set as booleans ( #24408 )
2 years ago
Rubicon Rowe
f49d2ec5a3
[Glitch] Fix inconsistent radius in drawer
...
Port ffa9249c1e
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire
8364f82281
Merge branch 'main' into glitch-soc/merge-upstream
2 years ago
Rubicon Rowe
ffa9249c1e
Fix inconsistent radius in drawer ( #24407 )
2 years ago
Nick Schonning
72a1dd736a
Align typings with installed versions ( #24410 )
2 years ago
Christian Schmidt
90ecb96dba
[Glitch] Add colour to follow button when hashtag is being followed
...
Port d5da587d27
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire
5fbae7cb2a
Merge branch 'main' into glitch-soc/merge-upstream
2 years ago
Christian Schmidt
d5da587d27
Add colour to follow button when hashtag is being followed ( #24361 )
2 years ago
Eugen Rochko
1c1bbbebd6
New Crowdin updates ( #24276 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2 years ago
Nick Schonning
d0bf149232
Move ESLint configs to overrides ( #24370 )
2 years ago
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>
2 years ago
Claire
b12fcd3d7a
Merge branch 'main' into glitch-soc/merge-upstream
2 years ago
Eugen Rochko
d22e712648
Change search pop-out in web UI ( #24305 )
2 years ago
Eugen Rochko
4e63f1e64b
Fix regressions from change in account row design in web UI ( #24343 )
2 years ago
Tdxdxoz
f9cc42d6db
[Glitch] Fix: set multiColumn value for /explore Statuses
...
Port d339684df5
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Nick Schonning
bba0493afe
[Glitch] Move marky to devDependency
...
Port a159e8e5e1
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
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.
2 years ago
Eugen Rochko
868d478b1b
Change "direct message" nomenclature to "private mention" in web UI ( #24248 )
2 years ago
Tdxdxoz
d339684df5
Fix: set multiColumn value for /explore Statuses ( #24314 )
2 years ago
Nick Schonning
a159e8e5e1
Move marky to devDependency ( #24258 )
2 years ago
Eugen Rochko
5b9c983305
New Crowdin updates ( #24130 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2 years ago
Eugen Rochko
5ec33534f8
Refactor styles to use logical properties for positioning ( #23944 )
2 years ago
neatchee
a73b29e8cc
[Glitch] Remove legacy decorators syntax
...
Port e272fc91e4
to glitch-soc
2 years ago
Nick Schonning
57e9fc7e5a
[Glitch] Remove isNaN polyfill
...
Port 169b9c9b13
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire
6a5a699fbb
Merge branch 'main' into glitch-soc/main
2 years ago
Eugen Rochko
1d2a941bc8
Change media upload limits and remove client-side resizing ( #23726 )
2 years ago
Eugen Rochko
f185c40714
Change design of account rows in web UI ( #24247 )
2 years ago
Yamagishi Kazutoshi
8b68ca7e61
Add missing parenthesis ( #24238 )
2 years ago
Yamagishi Kazutoshi
e272fc91e4
Remove legacy decorators syntax ( #18357 )
2 years ago
Nick Schonning
169b9c9b13
Remove isNaN polyfill ( #24224 )
2 years ago
Christian Schmidt
61e7fe2e2a
Fix broken links in account gallery ( #24218 )
2 years ago
mogamin
aa45960804
[Glitch] Fit the max-width of media in .prose to parent box
...
Port 6ffb8609f9
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
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.
2 years ago
mogamin
6ffb8609f9
Fit the max-width of media in .prose to parent box ( #24180 )
2 years ago
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>
2 years ago
Christian Schmidt
bb60db4471
[Glitch] Replace `Status#translatable?` with language matrix in separate endpoint
...
Port 7583523bf0
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
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.
2 years ago
Eugen Rochko
83f302c101
New Crowdin updates ( #23904 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2 years ago
Christian Schmidt
7583523bf0
Replace `Status#translatable?` with language matrix in separate endpoint ( #24037 )
2 years ago
Rodion Borisov
20af3cc038
[Glitch] Center the text itself in upload area
...
Port 100ada1e2b
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
PauloVilarinho
08685405f1
[Glitch] add modal message when editing toot
...
Port c4c1c8aecc
to glitch-soc
Co-authored-by: PauloVilarinho <paulotarsobranco@hotmail.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
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.
2 years ago
Rodion Borisov
100ada1e2b
Center the text itself in upload area ( #24029 )
2 years ago
PauloVilarinho
c4c1c8aecc
add modal message when editing toot ( #23936 )
...
Co-authored-by: PauloVilarinho <paulotarsobranco@hotmail.com>
2 years ago
Claire
5f94d33a67
Refactor glitch-soc rich text SCSS
2 years ago
Christian Schmidt
a813ea3c25
[Glitch] Only offer translation for supported languages
...
Port cc0c37cd69
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Terry Garcia
81aac88f65
[Glitch] Switched bookmark and favourites around
...
Port f5fe444913
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire
05763031f1
[Glitch] Fix duplicate “Publish” button on mobile
...
Port 3faa229d8d
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire
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.
2 years ago
Claire
f7a679a4f5
New Crowdin updates ( #2118 )
...
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
2 years ago
Christian Schmidt
b50a08b15b
[Glitch] Add `lang` attribute to media and poll options
...
Port 41655e16ea
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Christian Schmidt
50b76430b4
Do not leave Mastodon when clicking “Back” ( #23953 )
2 years ago
Christian Schmidt
cc0c37cd69
Only offer translation for supported languages ( #23879 )
2 years ago
Terry Garcia
f5fe444913
Switched bookmark and favourites around ( #23701 )
2 years ago
Claire
3faa229d8d
Fix duplicate “Publish” button on mobile ( #23804 )
2 years ago
Claire
16c8144b1c
Add support for incoming rich text ( #23913 )
2 years ago
Claire
a95dc48e01
Merge branch 'main' into glitch-soc/merge-upstream
2 years ago
Eugen Rochko
096f622340
New Crowdin updates ( #23802 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2 years ago
Christian Schmidt
41655e16ea
Add `lang` attribute to media and poll options ( #23891 )
2 years ago
Claire
42f73a411c
Move misc rules from components/index.scss to components/misc.scss
2 years ago
Claire
59b7c6e3d8
Fix glitch-soc SCSS code style and refactor closer to upstream
2 years ago
Christian Schmidt
5eaad2ae5b
[Glitch] Add `lang` attribute to preview card
...
Port e56145661c
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Tim Lucas
650ea1316a
[Glitch] Increase contrast of upload progress background
...
Port 808c9a7cf4
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Botao Wang
213b82d0a4
[Glitch] Fix sidebar cut-off on small screens in admin UI
...
Port 1f844d0d18
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire
5548b2c73f
[Glitch] Add `lang` tag to native language names in language picker
...
Port 82c464d4d0
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Renaud Chaput
295d193e7f
[Glitch] Rename JSX files with proper `.jsx` extension
...
Port ae3812d182
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire
f3cd30942c
Fix building vanilla flavor after JSX change
2 years ago
Claire
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.
2 years ago
Christian Schmidt
e56145661c
Add `lang` attribute to preview card ( #23869 )
2 years ago
Tim Lucas
808c9a7cf4
Increase contrast of upload progress background ( #23836 )
2 years ago
Eugen Rochko
6bfb54dccc
New Crowdin updates ( #23625 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2 years ago
Botao Wang
1f844d0d18
Fix sidebar cut-off on small screens in admin UI ( #23764 )
2 years ago
Claire
82c464d4d0
Add `lang` tag to native language names in language picker ( #23749 )
2 years ago
Claire
b5b0bc17e8
Change compose form checkbox to native input with `appearance: none` ( #22949 )
2 years ago
Christian Schmidt
2dbe2b56aa
Make larger part of status clickable ( #23621 )
2 years ago
Renaud Chaput
ae3812d182
Rename JSX files with proper `.jsx` extension ( #23733 )
2 years ago
Claire
01654e8830
[Glitch] Fix focus point of already-attached media not saving after edit
...
Port 6ce20a89f5
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Christian Schmidt
eb3d03a52a
[Glitch] Fix bad type for spellCheck attribute
...
Port 2c8bb9a76a
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Nick Schonning
0bf3bbf662
[Glitch] Enable ESLint Promise plugin defaults
...
Port a80ff32d9a
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire
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.
2 years ago
Claire
6ce20a89f5
Fix focus point of already-attached media not saving after edit ( #23566 )
2 years ago
Claire
efe3fb00c7
Merge pull request #2112 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2 years ago
Nick Schonning
b0e7d10f63
[Glitch] Upgrade to Stylelint 15 with Prettier
...
Port 6417e06194
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Nick Schonning
a0bef6bdb6
[Glitch] Enable ESLint no-useless-escape
...
Port 1c2ca9557f
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire
70984c6f65
[Glitch] Enable ESLint import recommended rules
...
Port 2663b421be
to glitch-soc
2 years ago
Claire
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
2 years ago
Christian Schmidt
2c8bb9a76a
Fix bad type for spellCheck attribute ( #23638 )
2 years ago
Nick Schonning
a80ff32d9a
Enable ESLint Promise plugin defaults ( #22229 )
2 years ago
Eugen Rochko
4ed26b106c
New Crowdin updates ( #23527 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2 years ago
Dean Bassett
6c64af449c
[Glitch] Fix case-sensitive check for previously used hashtags
...
Port 28bc6265bf
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire
b525ce4bf9
[Glitch] Fix attached media uploads not being cleared when replying to a post
...
Port 3c1e48d304
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire
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.
2 years ago
Nick Schonning
2663b421be
Enable ESLint import recommended rules ( #23315 )
2 years ago
Nick Schonning
1c2ca9557f
Enable ESLint no-useless-escape ( #23311 )
2 years ago
Dean Bassett
28bc6265bf
Fix case-sensitive check for previously used hashtags ( #23526 )
2 years ago
Nick Schonning
6417e06194
Upgrade to Stylelint 15 with Prettier ( #23558 )
2 years ago
Dean Bassett
ab546780eb
fix hashtag ordering ( #2107 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2 years ago
Claire
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]
2 years ago
Claire
6917c854d1
Merge branch 'main' into glitch-soc/merge-upstream
2 years ago
Claire
3c1e48d304
Fix attached media uploads not being cleared when replying to a post ( #23504 )
2 years ago
Eugen Rochko
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>
2 years ago
cadars
f925f5bf2f
[Glitch] Add scrolling to Compare history modal
...
Port 7406c66b77
to glitch-soc
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Christian Schmidt
54e6fa1363
[Glitch] Show spinner while loading follow requests
...
Port 059a055e65
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Christian Schmidt
71629f6f99
[Glitch] Spell check input fields
...
Port 9b74ffa7e0
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Eugen Rochko
664847db15
[Glitch] Add setting for status page URL
...
Port 92e5feb621
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
Claire
5f26e6e7ca
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Minor upstream change, our README is completely different.
Kept ours.
- `lib/tasks/assets.rake`:
glitch-soc has extra code to deal with its theming system,
upstream changed a line that exists in glitch-soc.
Applied upstream changes.
2 years ago
Eugen Rochko
dc6a090adc
New Crowdin updates ( #23393 )
...
* New translations en.yml (Portuguese)
* New translations en.yml (Romanian)
* New translations en.yml (Spanish)
* New translations en.yml (Afrikaans)
* New translations en.yml (Arabic)
* New translations en.yml (Belarusian)
* New translations en.yml (Czech)
* New translations en.yml (Danish)
* New translations en.yml (Greek)
* New translations en.yml (Basque)
* New translations en.yml (Hungarian)
* New translations en.yml (Armenian)
* New translations en.yml (Italian)
* New translations en.yml (Galician)
* New translations en.yml (Slovak)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Polish)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Georgian)
* New translations en.yml (Korean)
* New translations en.yml (Lithuanian)
* New translations en.yml (Macedonian)
* New translations en.yml (Punjabi)
* New translations en.yml (Slovenian)
* New translations en.yml (Albanian)
* New translations en.yml (Serbian (Cyrillic))
* New translations en.yml (Swedish)
* New translations en.yml (Turkish)
* New translations en.yml (Ukrainian)
* New translations en.yml (Urdu (Pakistan))
* New translations en.yml (Icelandic)
* New translations simple_form.en.yml (Icelandic)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.yml (Indonesian)
* New translations en.yml (Persian)
* New translations en.yml (Tamil)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Spanish, Mexico)
* New translations en.yml (Bengali)
* New translations en.yml (Marathi)
* New translations en.yml (Thai)
* New translations en.yml (Croatian)
* New translations en.yml (Kazakh)
* New translations en.yml (Latvian)
* New translations en.yml (Hindi)
* New translations en.yml (Malay)
* New translations en.yml (Telugu)
* New translations en.yml (Burmese)
* New translations en.yml (Welsh)
* New translations en.yml (Faroese)
* New translations en.yml (Uyghur)
* New translations simple_form.en.yml (Greek)
* New translations simple_form.en.yml (Hebrew)
* New translations en.json (Japanese)
* New translations en.json (Romanian)
* New translations en.json (Afrikaans)
* New translations en.json (Danish)
* New translations en.json (Greek)
* New translations en.json (Frisian)
* New translations en.json (Basque)
* New translations en.json (Irish)
* New translations en.json (Hebrew)
* New translations en.json (Hungarian)
* New translations en.yml (Chinese Traditional, Hong Kong)
* New translations en.yml (Tatar)
* New translations en.yml (Malayalam)
* New translations en.yml (Breton)
* New translations en.yml (Latin)
* New translations en.yml (Bosnian)
* New translations en.yml (French, Quebec)
* New translations en.yml (Sinhala)
* New translations en.yml (Cornish)
* New translations en.yml (Kannada)
* New translations en.yml (Scottish Gaelic)
* New translations en.yml (Asturian)
* New translations en.yml (Aragonese)
* New translations en.yml (Serbian (Latin))
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Sorani (Kurdish))
* New translations en.yml (Scots)
* New translations en.yml (Igbo)
* New translations en.yml (Corsican)
* New translations en.yml (Sardinian)
* New translations en.yml (Sanskrit)
* New translations en.yml (Kabyle)
* New translations en.yml (Taigi)
* New translations en.yml (Silesian)
* New translations en.yml (Standard Moroccan Tamazight)
* New translations en.json (Uzbek)
* New translations en.yml (Uzbek)
* New translations en.json (Kashubian)
* New translations en.yml (Kashubian)
* New translations simple_form.en.yml (Slovenian)
* New translations en.json (Georgian)
* New translations en.json (Lithuanian)
* New translations en.json (Macedonian)
* New translations en.json (Norwegian)
* New translations en.json (Punjabi)
* New translations en.json (Polish)
* New translations en.json (Russian)
* New translations en.json (Slovenian)
* New translations en.json (Serbian (Cyrillic))
* New translations en.json (Swedish)
* New translations en.json (Turkish)
* New translations en.json (Ukrainian)
* New translations en.json (Urdu (Pakistan))
* New translations en.json (Galician)
* New translations en.json (Persian)
* New translations en.json (Tamil)
* New translations en.json (Spanish, Argentina)
* New translations en.json (Spanish, Mexico)
* New translations en.json (Bengali)
* New translations en.json (Marathi)
* New translations en.json (Norwegian Nynorsk)
* New translations en.json (Latvian)
* New translations en.json (Hindi)
* New translations en.json (Malay)
* New translations en.json (Telugu)
* New translations en.json (Burmese)
* New translations en.json (Faroese)
* New translations en.json (Uyghur)
* New translations en.json (Chinese Traditional, Hong Kong)
* New translations en.json (Tatar)
* New translations en.json (Malayalam)
* New translations en.json (Breton)
* New translations en.json (Latin)
* New translations en.json (Bosnian)
* New translations en.json (French, Quebec)
* New translations en.json (Sinhala)
* New translations en.json (Cornish)
* New translations en.json (Kannada)
* New translations en.json (Scottish Gaelic)
* New translations en.json (Asturian)
* New translations en.json (Aragonese)
* New translations en.json (Occitan)
* New translations en.json (Kurmanji (Kurdish))
* New translations en.json (Sorani (Kurdish))
* New translations en.json (Scots)
* New translations en.json (Igbo)
* New translations en.json (Corsican)
* New translations en.json (Sardinian)
* New translations en.json (Sanskrit)
* New translations en.json (Kabyle)
* New translations en.json (Ido)
* New translations en.json (Taigi)
* New translations en.json (Silesian)
* New translations en.json (Standard Moroccan Tamazight)
* New translations en.json (Catalan)
* New translations en.json (German)
* New translations en.json (Korean)
* New translations en.json (Portuguese)
* New translations en.json (Thai)
* New translations simple_form.en.yml (Catalan)
* New translations en.yml (Thai)
* New translations simple_form.en.yml (Dutch)
* New translations simple_form.en.yml (Portuguese)
* New translations simple_form.en.yml (Spanish, Argentina)
* New translations simple_form.en.yml (Thai)
* New translations en.json (Hungarian)
* New translations en.json (Spanish, Argentina)
* New translations en.json (German)
* New translations en.json (Dutch)
* New translations en.yml (German)
* New translations simple_form.en.yml (Dutch)
* New translations simple_form.en.yml (German)
* New translations en.json (German)
* New translations en.json (Italian)
* New translations en.json (Albanian)
* New translations en.yml (German)
* New translations en.yml (Russian)
* New translations simple_form.en.yml (German)
* New translations simple_form.en.yml (Italian)
* New translations simple_form.en.yml (Albanian)
* New translations simple_form.en.yml (Latvian)
* New translations en.json (Polish)
* New translations en.json (Russian)
* New translations en.json (Serbian (Cyrillic))
* New translations en.json (Latvian)
* New translations simple_form.en.yml (Czech)
* New translations simple_form.en.yml (Polish)
* New translations simple_form.en.yml (Turkish)
* New translations simple_form.en.yml (Ukrainian)
* New translations en.json (Turkish)
* New translations en.json (Ukrainian)
* New translations simple_form.en.yml (Italian)
* New translations en.json (French)
* New translations en.json (Czech)
* New translations simple_form.en.yml (French)
* New translations en.json (Slovak)
* New translations simple_form.en.yml (Slovak)
* New translations en.json (German)
* New translations en.json (English, United Kingdom)
* New translations en.json (Esperanto)
* New translations en.yml (German)
* New translations en.yml (Esperanto)
* New translations simple_form.en.yml (English, United Kingdom)
* New translations simple_form.en.yml (Esperanto)
* New translations en.yml (Slovak)
* New translations simple_form.en.yml (German)
* New translations en.json (Spanish)
* New translations en.yml (Asturian)
* New translations simple_form.en.yml (Basque)
* New translations simple_form.en.yml (Spanish)
* New translations en.json (Basque)
* New translations en.json (Belarusian)
* New translations en.json (Finnish)
* New translations simple_form.en.yml (Finnish)
* New translations simple_form.en.yml (Dutch)
* New translations simple_form.en.yml (Faroese)
* New translations en.json (Faroese)
* New translations en.json (Korean)
* New translations en.json (Vietnamese)
* New translations simple_form.en.yml (Vietnamese)
* New translations en.json (Korean)
* New translations simple_form.en.yml (Finnish)
* New translations simple_form.en.yml (Hebrew)
* New translations simple_form.en.yml (Hungarian)
* New translations simple_form.en.yml (Galician)
* New translations en.json (Galician)
* New translations simple_form.en.yml (Polish)
* New translations en.json (French)
* New translations en.yml (French)
* New translations en.json (French)
* New translations en.yml (French)
* New translations simple_form.en.yml (French)
* New translations activerecord.en.yml (French)
* New translations devise.en.yml (French)
* New translations doorkeeper.en.yml (French)
* New translations en.json (Icelandic)
* New translations en.yml (French)
* New translations simple_form.en.yml (French)
* New translations en.json (French)
* New translations en.yml (French)
* New translations simple_form.en.yml (French)
* New translations doorkeeper.en.yml (French)
* New translations en.json (French)
* New translations simple_form.en.yml (French)
* New translations simple_form.en.yml (Danish)
* New translations en.json (Danish)
* New translations en.yml (English, United Kingdom)
* New translations en.yml (Asturian)
* New translations en.json (Korean)
* New translations en.yml (Korean)
* New translations simple_form.en.yml (Estonian)
* New translations en.json (Estonian)
* New translations simple_form.en.yml (Estonian)
* New translations simple_form.en.yml (Frisian)
* New translations en.json (Frisian)
* Normalize
---------
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2 years ago