Claire
276c1d32d6
Merge branch 'main' into glitch-soc/merge-upstream
2023-03-02 17:32:38 +01:00
Eugen Rochko
cb97ba7a2f
New Crowdin updates ( #23802 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-02-28 23:01:05 +09:00
Christian Schmidt
d3eefead30
Add lang attribute to media and poll options ( #23891 )
2023-02-26 20:13:27 +01:00
Claire
b91756fd4d
Move misc rules from components/index.scss to components/misc.scss
2023-02-25 23:47:21 +01:00
Claire
cc94cc86ae
Fix glitch-soc SCSS code style and refactor closer to upstream
2023-02-25 23:46:23 +01:00
Christian Schmidt
b632c5a55a
[Glitch] Add lang attribute to preview card
...
Port 8000a8f230
2023-02-25 14:43:57 +01:00
Tim Lucas
28cb77bd07
[Glitch] Increase contrast of upload progress background
...
Port f4f91bc295
2023-02-25 14:43:24 +01:00
Botao Wang
56bec60f25
[Glitch] Fix sidebar cut-off on small screens in admin UI
...
Port 7adde24a95
2023-02-25 14:40:29 +01:00
Claire
31455f05fb
[Glitch] Add lang tag to native language names in language picker
...
Port 7207a98d39
2023-02-25 14:37:05 +01:00
Renaud Chaput
81ef21a0c8
[Glitch] Rename JSX files with proper .jsx extension
...
Port 44a7d87cb1
2023-02-25 14:35:31 +01:00
Claire
859eb01aac
Fix building vanilla flavor after JSX change
2023-02-25 14:28:59 +01:00
Claire
4ed09276d5
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.prettierignore`:
Upstream added a line at the end of the file, while glitch-soc had its own
extra lines.
Took upstream's change.
- `CONTRIBUTING.md`:
We have our custom CONTRIBUTING.md quoting upstream. Upstream made changes.
Ported upstream changes.
- `app/controllers/application_controller.rb`:
Upstream made code style changes in a method that is entirely replaced
in glitch-soc.
Ignored the change.
- `app/models/account.rb`:
Code style changes textually close to glitch-soc-specific changes.
Ported upstream changes.
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream code style changes.
Ignored them.
2023-02-25 14:00:40 +01:00
Christian Schmidt
8000a8f230
Add lang attribute to preview card ( #23869 )
2023-02-24 20:04:38 +01:00
Tim Lucas
f4f91bc295
Increase contrast of upload progress background ( #23836 )
2023-02-23 12:58:42 +01:00
Eugen Rochko
2564117131
New Crowdin updates ( #23625 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-02-22 21:16:02 +09:00
Botao Wang
7adde24a95
Fix sidebar cut-off on small screens in admin UI ( #23764 )
2023-02-21 10:06:13 +01:00
Claire
7207a98d39
Add lang tag to native language names in language picker ( #23749 )
2023-02-21 09:23:39 +01:00
Claire
d3b4d4d4f3
Change compose form checkbox to native input with appearance: none ( #22949 )
2023-02-20 11:32:27 +01:00
Christian Schmidt
62c4aecf8f
Make larger part of status clickable ( #23621 )
2023-02-20 08:11:23 +01:00
Renaud Chaput
44a7d87cb1
Rename JSX files with proper .jsx extension ( #23733 )
2023-02-20 03:20:59 +01:00
Claire
8c8358b3cf
[Glitch] Fix focus point of already-attached media not saving after edit
...
Port b2283b6838
2023-02-19 10:54:04 +01:00
Christian Schmidt
229ab559dc
[Glitch] Fix bad type for spellCheck attribute
...
Port cde13349cb
2023-02-19 10:53:44 +01:00
Nick Schonning
6fdd596cc8
[Glitch] Enable ESLint Promise plugin defaults
...
Port 5e1c0c3d94
2023-02-19 10:53:18 +01:00
Claire
7452a95998
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/dependabot.yml`:
Upstream made changes while we have dropped this file.
Keep the file deleted.
- `.prettierignore`:
Upstream made changes at the end of the file, where we
had our extra lines.
Just moved our extra lines back at the end.
- `app/serializers/initial_state_serializer.rb`:
Upstream code style changes.
Applied them.
- `app/services/backup_service.rb`:
Upstream code style changes.
Applied them.
2023-02-19 10:42:55 +01:00
Claire
b2283b6838
Fix focus point of already-attached media not saving after edit ( #23566 )
2023-02-19 07:11:18 +01:00
Claire
4c68189d2b
Merge pull request #2112 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2023-02-18 22:05:11 +01:00
Nick Schonning
ea9a1d79df
[Glitch] Upgrade to Stylelint 15 with Prettier
...
Port 0c9d455ea5
2023-02-18 16:02:12 +01:00
Nick Schonning
7e64eef73b
[Glitch] Enable ESLint no-useless-escape
...
Port db2c58d47a
2023-02-18 16:02:12 +01:00
Claire
587f6b3b06
[Glitch] Enable ESLint import recommended rules
...
Port eddfb33dfe
2023-02-18 16:02:12 +01:00
Claire
2be88d1930
New Crowdin updates ( #2111 )
...
* New translations en.json (Korean)
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.json (Portuguese)
[ci skip]
* Fix root key name in pt-PT translation file
* Fix normalization issue with ES translation
* Fix issue with `no` locale in glitch-soc
2023-02-18 11:16:30 +01:00
Christian Schmidt
cde13349cb
Fix bad type for spellCheck attribute ( #23638 )
2023-02-17 09:51:27 +01:00
Nick Schonning
5e1c0c3d94
Enable ESLint Promise plugin defaults ( #22229 )
2023-02-16 15:30:56 +09:00
Eugen Rochko
630975bf41
New Crowdin updates ( #23527 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-02-16 10:23:03 +09:00
Dean Bassett
40fc917a86
[Glitch] Fix case-sensitive check for previously used hashtags
...
Port 4da5f77d92
2023-02-13 20:05:36 +01:00
Claire
58291b31fa
[Glitch] Fix attached media uploads not being cleared when replying to a post
...
Port bae17ebe5e
2023-02-13 20:04:45 +01:00
Claire
ce84d163cc
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.prettierignore`:
Upstream added a line at the end, glitch-soc had extra entries at the end.
Added upstream's new line before glitch-soc's.
- `Gemfile.lock`:
Upstream updated dependencies while glitch-soc has an extra one (hcaptcha).
Updated dependencies like upstream did.
- `app/controllers/api/v1/statuses_controller.rb`:
Not a real conflict, upstream added a parameter (`allowed_mentions`) where
glitch-soc already had an extra one (`content_type`).
Added upstream's new parameter.
- `app/javascript/styles/fonts/roboto-mono.scss`:
A lot of lines were changed upstream due to code style changes, and a lot
of those lines had path changes to accomodate glitch-soc's theming system.
Applied upstream's style changes.
- `app/javascript/styles/fonts/roboto.scss`:
A lot of lines were changed upstream due to code style changes, and a lot
of those lines had path changes to accomodate glitch-soc's theming system.
Applied upstream's style changes.
2023-02-13 19:35:35 +01:00
Nick Schonning
eddfb33dfe
Enable ESLint import recommended rules ( #23315 )
2023-02-13 15:12:31 +01:00
Nick Schonning
db2c58d47a
Enable ESLint no-useless-escape ( #23311 )
2023-02-13 15:12:14 +01:00
Dean Bassett
4da5f77d92
Fix case-sensitive check for previously used hashtags ( #23526 )
2023-02-13 14:54:08 +01:00
Nick Schonning
0c9d455ea5
Upgrade to Stylelint 15 with Prettier ( #23558 )
2023-02-13 04:57:03 +01:00
Dean Bassett
ee42505452
fix hashtag ordering ( #2107 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2023-02-12 18:58:02 +01:00
Claire
8eb74c88ec
New Crowdin updates ( #2100 )
...
* New translations en.json (Korean)
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
2023-02-12 18:16:08 +01:00
Claire
87419f9307
Merge branch 'main' into glitch-soc/merge-upstream
2023-02-10 22:49:59 +01:00
Claire
bae17ebe5e
Fix attached media uploads not being cleared when replying to a post ( #23504 )
2023-02-10 22:03:35 +01:00
Eugen Rochko
71ae17e8f5
New Crowdin updates ( #23413 )
...
* New translations en.json (Esperanto)
* New translations en.yml (Slovak)
* New translations en.json (Burmese)
* New translations en.yml (Korean)
* New translations en.json (Burmese)
* New translations en.json (Burmese)
* New translations en.yml (Finnish)
* New translations simple_form.en.yml (Finnish)
* New translations en.json (Burmese)
* New translations en.yml (Burmese)
* New translations en.yml (Burmese)
* New translations en.json (Burmese)
* New translations activerecord.en.yml (Burmese)
* New translations en.yml (Burmese)
* New translations activerecord.en.yml (Burmese)
* New translations en.json (German)
* New translations simple_form.en.yml (German)
* New translations en.json (Catalan)
* New translations en.yml (Burmese)
* New translations en.yml (Burmese)
* New translations en.yml (Russian)
* New translations doorkeeper.en.yml (Russian)
* New translations simple_form.en.yml (Russian)
* New translations en.json (Russian)
* New translations en.json (Belarusian)
* New translations en.json (Belarusian)
* New translations en.json (Esperanto)
* New translations en.yml (Esperanto)
* New translations doorkeeper.en.yml (Korean)
* New translations en.json (Burmese)
* New translations en.yml (Slovak)
* New translations en.yml (Belarusian)
* New translations simple_form.en.yml (Belarusian)
* New translations simple_form.en.yml (Esperanto)
* New translations doorkeeper.en.yml (Esperanto)
* New translations activerecord.en.yml (Esperanto)
* New translations devise.en.yml (Esperanto)
* New translations en.yml (English, United Kingdom)
* New translations en.yml (Asturian)
* New translations simple_form.en.yml (Asturian)
* New translations en.yml (Asturian)
* New translations doorkeeper.en.yml (Asturian)
* New translations en.json (Asturian)
* New translations en.yml (Asturian)
* New translations en.json (Asturian)
* New translations en.json (Korean)
* New translations en.yml (Korean)
* New translations en.json (Korean)
* New translations en.yml (Korean)
* New translations devise.en.yml (Korean)
* New translations simple_form.en.yml (Korean)
* New translations en.json (Welsh)
* New translations en.yml (Welsh)
* New translations simple_form.en.yml (Welsh)
* New translations activerecord.en.yml (Welsh)
* New translations devise.en.yml (Welsh)
* New translations doorkeeper.en.yml (Welsh)
* New translations en.yml (Burmese)
* New translations en.yml (Burmese)
* New translations en.yml (Burmese)
* New translations en.json (Silesian)
* New translations en.yml (Occitan)
* New translations en.yml (Turkish)
* New translations simple_form.en.yml (Turkish)
* New translations en.json (Occitan)
* New translations activerecord.en.yml (Turkish)
* New translations doorkeeper.en.yml (Turkish)
* Normalize
* Remove unused locales
---------
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-02-11 05:42:08 +09:00
cadars
5e37906083
[Glitch] Add scrolling to Compare history modal
...
Port e8cb3ee827
2023-02-09 13:03:41 +01:00
Christian Schmidt
2dfbdc3f9d
[Glitch] Show spinner while loading follow requests
...
Port c1f32c9c14
2023-02-09 13:02:32 +01:00
Christian Schmidt
8fd6c36243
[Glitch] Spell check input fields
...
Port 67744ee779
2023-02-09 12:59:48 +01:00
Eugen Rochko
95e2cab22e
[Glitch] Add setting for status page URL
...
Port 8f590b0a21
2023-02-09 12:58:11 +01:00
Claire
85558a5e18
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.
2023-02-09 12:46:12 +01:00
