6fdd596cc8
[Glitch] Enable ESLint Promise plugin defaults
...
Port 5e1c0c3d94
2023-02-19 10:53:18 +01:00
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
b2283b6838
Fix focus point of already-attached media not saving after edit ( #23566 )
2023-02-19 07:11:18 +01:00
81ad6c2e39
Autofix Rubocop Style/StringLiterals ( #23695 )
2023-02-19 07:38:14 +09:00
2177daeae9
Autofix Rubocop Style/RedundantBegin ( #23703 )
2023-02-19 07:09:40 +09:00
4c68189d2b
Merge pull request #2112 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2023-02-18 22:05:11 +01:00
ea9a1d79df
[Glitch] Upgrade to Stylelint 15 with Prettier
...
Port 0c9d455ea5
2023-02-18 16:02:12 +01:00
7e64eef73b
[Glitch] Enable ESLint no-useless-escape
...
Port db2c58d47a
2023-02-18 16:02:12 +01:00
587f6b3b06
[Glitch] Enable ESLint import recommended rules
...
Port eddfb33dfe
2023-02-18 16:02:12 +01:00
c38bd17657
Autofix Rubocop Style/TrailingCommaInArguments ( #23694 )
2023-02-18 12:39:58 +01:00
ab7816a414
Autofix Rubocop Style/Lambda ( #23696 )
2023-02-18 12:39:00 +01:00
e2a3ebb271
Autofix Rubocop Style/IfUnlessModifier ( #23697 )
2023-02-18 12:37:47 +01:00
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
8aee4de034
Autofix Rubocop Style/PerlBackrefs ( #23649 )
2023-02-18 14:20:20 +09:00
a6f77aa28a
Autofix Rubocop Lint/AmbiguousOperatorPrecedence ( #23681 )
2023-02-18 04:30:23 +01:00
e2567df860
Enable Lint/RedundantCopDisableDirective ( #23687 )
2023-02-18 04:30:14 +01:00
634368c491
Autofix Rubocop Lint/SymbolConversion ( #23683 )
2023-02-18 03:23:49 +01:00
669f6d2c0a
Run rubocop formatting except line length ( #23632 )
2023-02-18 06:56:20 +09:00
cde13349cb
Fix bad type for spellCheck attribute ( #23638 )
2023-02-17 09:51:27 +01:00
5e1c0c3d94
Enable ESLint Promise plugin defaults ( #22229 )
2023-02-16 15:30:56 +09:00
630975bf41
New Crowdin updates ( #23527 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-02-16 10:23:03 +09:00
fb8503e861
Upgrade to Ruby 3.2 ( #22928 )
...
Co-authored-by: Matthew Ford <matt@bitzesty.com>
2023-02-15 08:30:27 +01:00
66f715550e
Add `memorial` attribute to REST API ( #23591 )
2023-02-14 13:50:55 +01:00
40fc917a86
[Glitch] Fix case-sensitive check for previously used hashtags
...
Port 4da5f77d92
2023-02-13 20:05:36 +01:00
58291b31fa
[Glitch] Fix attached media uploads not being cleared when replying to a post
...
Port bae17ebe5e
2023-02-13 20:04:45 +01:00
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
d6930b3847
Add API parameter to safeguard unexpect mentions in new posts ( #18350 )
2023-02-13 16:36:29 +01:00
eddfb33dfe
Enable ESLint import recommended rules ( #23315 )
2023-02-13 15:12:31 +01:00
db2c58d47a
Enable ESLint no-useless-escape ( #23311 )
2023-02-13 15:12:14 +01:00
4da5f77d92
Fix case-sensitive check for previously used hashtags ( #23526 )
2023-02-13 14:54:08 +01:00
5f56818f9e
Change followed_by link to location=all if account is local on /admin/accounts/:id page ( #23467 )
2023-02-13 14:39:00 +01:00
0c9d455ea5
Upgrade to Stylelint 15 with Prettier ( #23558 )
2023-02-13 04:57:03 +01:00
ee42505452
fix hashtag ordering ( #2107 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2023-02-12 18:58:02 +01:00
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
87419f9307
Merge branch 'main' into glitch-soc/merge-upstream
2023-02-10 22:49:59 +01:00
0c9eac80d8
Fix unbounded recursion in post discovery ( #23506 )
...
* Add a limit to how many posts can get fetched as a result of a single request
* Add tests
* Always pass `request_id` when processing `Announce` activities
---------
Co-authored-by: nametoolong <nametoolong@users.noreply.github.com>
2023-02-10 22:16:37 +01:00
bae17ebe5e
Fix attached media uploads not being cleared when replying to a post ( #23504 )
2023-02-10 22:03:35 +01:00
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
4ceadc65b0
Merge branch 'main' into glitch-soc/merge-upstream
2023-02-10 13:48:21 +01:00
a9c220242b
Fix admin-set follow recommandations being case-sensitive ( #23500 )
...
Fixes #23472
2023-02-10 11:14:58 +01:00
67de888bad
Fix server status URL being a required server setting ( #23499 )
2023-02-10 10:20:43 +01:00
5e37906083
[Glitch] Add scrolling to Compare history modal
...
Port e8cb3ee827
2023-02-09 13:03:41 +01:00
2dfbdc3f9d
[Glitch] Show spinner while loading follow requests
...
Port c1f32c9c14
2023-02-09 13:02:32 +01:00
8fd6c36243
[Glitch] Spell check input fields
...
Port 67744ee779
2023-02-09 12:59:48 +01:00
95e2cab22e
[Glitch] Add setting for status page URL
...
Port 8f590b0a21
2023-02-09 12:58:11 +01:00
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
832595d1e7
Remove posts count and last posts from ActivityPub representation of hashtag collections ( #23460 )
2023-02-08 17:57:25 +01:00
0592937264
Apply Rubocop Rails/WhereNot ( #23448 )
...
* Apply Rubocop Rails/WhereNot
* Update spec for where.not
2023-02-08 10:39:57 +01:00
0d1f192c54
Apply Rubocop Performance/BlockGivenWithExplicitBlock ( #23441 )
...
* Apply Rubocop Performance/BlockGivenWithExplicitBlock
* Unprefix used block parameter
2023-02-08 10:36:23 +01:00
26ac2447b4
Apply Rubocop Style/EmptyElse ( #23449 )
2023-02-08 07:08:39 +01:00
Nick Schonning
Claire
Christian Schmidt
Eugen Rochko
Aaron Patterson
Dean Bassett
Jeong Arm
cadars