Kouhai
ac9104875b
th: fix extension
2023-04-22 00:38:08 -07:00
Kouhai
ee1dc4a0d1
th: Merge remote-tracking branch 'glitch/main'
2023-04-22 00:38:08 -07:00
Kouhai
da1aa87c6f
th: Merge remote-tracking branch 'glitch/main'
2023-04-22 00:38:08 -07:00
Kouhai
705fd6c182
th: Merge remote-tracking branch 'glitch/main'
2023-04-22 00:38:08 -07:00
Kouhai
a936e75d02
th: Merge remote-tracking branch 'glitch/main'
2023-04-22 00:38:08 -07:00
Claire
f7a679a4f5
New Crowdin updates ( #2118 )
...
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
2023-03-05 20:38:18 +01:00
Christian Schmidt
b50a08b15b
[Glitch] Add lang attribute to media and poll options
...
Port 41655e16ea
2023-03-05 17:52:53 +01:00
Claire
a95dc48e01
Merge branch 'main' into glitch-soc/merge-upstream
2023-03-02 17:32:38 +01:00
Eugen Rochko
096f622340
New Crowdin updates ( #23802 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-02-28 23:01:05 +09:00
Christian Schmidt
41655e16ea
Add lang attribute to media and poll options ( #23891 )
2023-02-26 20:13:27 +01:00
Claire
42f73a411c
Move misc rules from components/index.scss to components/misc.scss
2023-02-25 23:47:21 +01:00
Claire
59b7c6e3d8
Fix glitch-soc SCSS code style and refactor closer to upstream
2023-02-25 23:46:23 +01:00
Christian Schmidt
5eaad2ae5b
[Glitch] Add lang attribute to preview card
...
Port e56145661c
2023-02-25 14:43:57 +01:00
Tim Lucas
650ea1316a
[Glitch] Increase contrast of upload progress background
...
Port 808c9a7cf4
2023-02-25 14:43:24 +01:00
Botao Wang
213b82d0a4
[Glitch] Fix sidebar cut-off on small screens in admin UI
...
Port 1f844d0d18
2023-02-25 14:40:29 +01:00
Claire
5548b2c73f
[Glitch] Add lang tag to native language names in language picker
...
Port 82c464d4d0
2023-02-25 14:37:05 +01:00
Renaud Chaput
295d193e7f
[Glitch] Rename JSX files with proper .jsx extension
...
Port ae3812d182
2023-02-25 14:35:31 +01:00
Claire
f3cd30942c
Fix building vanilla flavor after JSX change
2023-02-25 14:28:59 +01:00
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.
2023-02-25 14:00:40 +01:00
Christian Schmidt
e56145661c
Add lang attribute to preview card ( #23869 )
2023-02-24 20:04:38 +01:00
Tim Lucas
808c9a7cf4
Increase contrast of upload progress background ( #23836 )
2023-02-23 12:58:42 +01:00
Eugen Rochko
6bfb54dccc
New Crowdin updates ( #23625 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-02-22 21:16:02 +09:00
Botao Wang
1f844d0d18
Fix sidebar cut-off on small screens in admin UI ( #23764 )
2023-02-21 10:06:13 +01:00
Claire
82c464d4d0
Add lang tag to native language names in language picker ( #23749 )
2023-02-21 09:23:39 +01:00
Claire
b5b0bc17e8
Change compose form checkbox to native input with appearance: none ( #22949 )
2023-02-20 11:32:27 +01:00
Christian Schmidt
2dbe2b56aa
Make larger part of status clickable ( #23621 )
2023-02-20 08:11:23 +01:00
Renaud Chaput
ae3812d182
Rename JSX files with proper .jsx extension ( #23733 )
2023-02-20 03:20:59 +01:00
Claire
01654e8830
[Glitch] Fix focus point of already-attached media not saving after edit
...
Port 6ce20a89f5
2023-02-19 10:54:04 +01:00
Christian Schmidt
eb3d03a52a
[Glitch] Fix bad type for spellCheck attribute
...
Port 2c8bb9a76a
2023-02-19 10:53:44 +01:00
Nick Schonning
0bf3bbf662
[Glitch] Enable ESLint Promise plugin defaults
...
Port a80ff32d9a
2023-02-19 10:53:18 +01:00
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.
2023-02-19 10:42:55 +01:00
Claire
6ce20a89f5
Fix focus point of already-attached media not saving after edit ( #23566 )
2023-02-19 07:11:18 +01:00
Claire
efe3fb00c7
Merge pull request #2112 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2023-02-18 22:05:11 +01:00
Nick Schonning
b0e7d10f63
[Glitch] Upgrade to Stylelint 15 with Prettier
...
Port 6417e06194
2023-02-18 16:02:12 +01:00
Nick Schonning
a0bef6bdb6
[Glitch] Enable ESLint no-useless-escape
...
Port 1c2ca9557f
2023-02-18 16:02:12 +01:00
Claire
70984c6f65
[Glitch] Enable ESLint import recommended rules
...
Port 2663b421be
2023-02-18 16:02:12 +01:00
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
2023-02-18 11:16:30 +01:00
Christian Schmidt
2c8bb9a76a
Fix bad type for spellCheck attribute ( #23638 )
2023-02-17 09:51:27 +01:00
Nick Schonning
a80ff32d9a
Enable ESLint Promise plugin defaults ( #22229 )
2023-02-16 15:30:56 +09:00
Eugen Rochko
4ed26b106c
New Crowdin updates ( #23527 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-02-16 10:23:03 +09:00
Dean Bassett
6c64af449c
[Glitch] Fix case-sensitive check for previously used hashtags
...
Port 28bc6265bf
2023-02-13 20:05:36 +01:00
Claire
b525ce4bf9
[Glitch] Fix attached media uploads not being cleared when replying to a post
...
Port 3c1e48d304
2023-02-13 20:04:45 +01:00
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.
2023-02-13 19:35:35 +01:00
Nick Schonning
2663b421be
Enable ESLint import recommended rules ( #23315 )
2023-02-13 15:12:31 +01:00
Nick Schonning
1c2ca9557f
Enable ESLint no-useless-escape ( #23311 )
2023-02-13 15:12:14 +01:00
Dean Bassett
28bc6265bf
Fix case-sensitive check for previously used hashtags ( #23526 )
2023-02-13 14:54:08 +01:00
Nick Schonning
6417e06194
Upgrade to Stylelint 15 with Prettier ( #23558 )
2023-02-13 04:57:03 +01:00
Dean Bassett
ab546780eb
fix hashtag ordering ( #2107 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2023-02-12 18:58:02 +01:00
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]
2023-02-12 18:16:08 +01:00
Claire
6917c854d1
Merge branch 'main' into glitch-soc/merge-upstream
2023-02-10 22:49:59 +01:00
