a95dc48e01
Merge branch 'main' into glitch-soc/merge-upstream
2 years ago
35cbd0685d
Fix deprecation warning about merging conditions ( #23618 )
2 years ago
5bf8f34842
Spec coverage for HomeHelper ( #23907 )
2 years ago
096f622340
New Crowdin updates ( #23802 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2 years ago
19be243493
Autofix Rubocop Style/HashConversion ( #23852 )
2 years ago
9cf4671ba1
Remove unused admin/announcements helper ( #23899 )
2 years ago
1d248c3f57
Remove unused InstancePresenter#sample_accounts method ( #23900 )
2 years ago
385ae6681d
Fix single-record invalid condition on PollVote ( #23810 )
2 years ago
41655e16ea
Add `lang` attribute to media and poll options ( #23891 )
2 years ago
42f73a411c
Move misc rules from components/index.scss to components/misc.scss
2 years ago
59b7c6e3d8
Fix glitch-soc SCSS code style and refactor closer to upstream
2 years ago
5eaad2ae5b
[Glitch] Add `lang` attribute to preview card
...
Port e56145661c
2 years ago
650ea1316a
[Glitch] Increase contrast of upload progress background
...
Port 808c9a7cf4
2 years ago
213b82d0a4
[Glitch] Fix sidebar cut-off on small screens in admin UI
...
Port 1f844d0d18
2 years ago
5548b2c73f
[Glitch] Add `lang` tag to native language names in language picker
...
Port 82c464d4d0
2 years ago
295d193e7f
[Glitch] Rename JSX files with proper `.jsx` extension
...
Port ae3812d182
2 years ago
f3cd30942c
Fix building vanilla flavor after JSX change
2 years ago
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
c759d6f31d
Remove unused HTML Validator ( #23866 )
2 years ago
e56145661c
Add `lang` attribute to preview card ( #23869 )
2 years ago
bc4837a600
Change auto-deletion throttling constants to better scale with server size ( #23320 )
2 years ago
808c9a7cf4
Increase contrast of upload progress background ( #23836 )
2 years ago
6bfb54dccc
New Crowdin updates ( #23625 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2 years ago
0fb32f919f
Fix inefficiency when searching accounts per username in admin interface ( #23801 )
2 years ago
4f6ad6475e
Autofix Rubocop Rails/Blank ( #23765 )
2 years ago
247bf6e812
Enable Rubocop Style/StringConcatenation defaults ( #23792 )
2 years ago
1f844d0d18
Fix sidebar cut-off on small screens in admin UI ( #23764 )
2 years ago
82c464d4d0
Add `lang` tag to native language names in language picker ( #23749 )
2 years ago
a0e4d69c12
Autofix Rubocop Rails/FindById ( #23762 )
2 years ago
eed0829d3f
Autofix Rubocop Rails/WhereEquals ( #23759 )
2 years ago
b5b0bc17e8
Change compose form checkbox to native input with `appearance: none` ( #22949 )
2 years ago
dd63a919f0
Autofix Rubocop Style/RescueStandardError ( #23745 )
2 years ago
2dbe2b56aa
Make larger part of status clickable ( #23621 )
2 years ago
9b3be79cb5
Autofix Rubocop Style/FormatString ( #23743 )
2 years ago
e6312104c7
Autofix Rubocop remaining Layout rules ( #23679 )
2 years ago
c08d9e5e5c
Autofix Rubocop Style/UnpackFirst ( #23741 )
2 years ago
ac56c3971b
Autofix Rubocop RSpec/ImplicitSubject ( #23721 )
2 years ago
448f0929a7
Autofix Rubocop Rails/EnumHash ( #23737 )
2 years ago
ae3812d182
Rename JSX files with proper `.jsx` extension ( #23733 )
2 years ago
06f8de2e34
Autofix Rubocop Style/ExplicitBlockArgument ( #23704 )
2 years ago
ae51248ffe
Enable Rubocop HTTP status rules ( #23717 )
2 years ago
b8f17330ea
Autofix Rubocop Rails/Pluck ( #23730 )
2 years ago
483fabc53f
Autofix Rubocop Rails/RedundantForeignKey ( #23731 )
2 years ago
e38fe38604
Fix incorrect translation string in glitch-soc captcha feature
2 years ago
01654e8830
[Glitch] Fix focus point of already-attached media not saving after edit
...
Port 6ce20a89f5
2 years ago
eb3d03a52a
[Glitch] Fix bad type for spellCheck attribute
...
Port 2c8bb9a76a
2 years ago
0bf3bbf662
[Glitch] Enable ESLint Promise plugin defaults
...
Port a80ff32d9a
2 years ago
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
6ce20a89f5
Fix focus point of already-attached media not saving after edit ( #23566 )
2 years ago
be1ec56c6d
Autofix Rubocop Style/StringLiterals ( #23695 )
2 years ago
49f1168050
Autofix Rubocop Style/RedundantBegin ( #23703 )
2 years ago
efe3fb00c7
Merge pull request #2112 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2 years ago
b0e7d10f63
[Glitch] Upgrade to Stylelint 15 with Prettier
...
Port 6417e06194
2 years ago
a0bef6bdb6
[Glitch] Enable ESLint no-useless-escape
...
Port 1c2ca9557f
2 years ago
70984c6f65
[Glitch] Enable ESLint import recommended rules
...
Port 2663b421be
2 years ago
7f8439ee07
Autofix Rubocop Style/TrailingCommaInArguments ( #23694 )
2 years ago
3f9d7419d1
Autofix Rubocop Style/Lambda ( #23696 )
2 years ago
793f8c7dd5
Autofix Rubocop Style/IfUnlessModifier ( #23697 )
2 years ago
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
4553bc78ba
Autofix Rubocop Style/PerlBackrefs ( #23649 )
2 years ago
b7d4391c4d
Autofix Rubocop Lint/AmbiguousOperatorPrecedence ( #23681 )
2 years ago
5973a58281
Enable Lint/RedundantCopDisableDirective ( #23687 )
2 years ago
a71a0802d6
Autofix Rubocop Lint/SymbolConversion ( #23683 )
2 years ago
31ca76fe2c
Run rubocop formatting except line length ( #23632 )
2 years ago
2c8bb9a76a
Fix bad type for spellCheck attribute ( #23638 )
2 years ago
a80ff32d9a
Enable ESLint Promise plugin defaults ( #22229 )
2 years ago
4ed26b106c
New Crowdin updates ( #23527 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2 years ago
edc6f486bf
Upgrade to Ruby 3.2 ( #22928 )
...
Co-authored-by: Matthew Ford <matt@bitzesty.com>
2 years ago
d706570d30
Add `memorial` attribute to REST API ( #23591 )
2 years ago
6c64af449c
[Glitch] Fix case-sensitive check for previously used hashtags
...
Port 28bc6265bf
2 years ago
b525ce4bf9
[Glitch] Fix attached media uploads not being cleared when replying to a post
...
Port 3c1e48d304
2 years ago
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
0ae0740826
Add API parameter to safeguard unexpect mentions in new posts ( #18350 )
2 years ago
2663b421be
Enable ESLint import recommended rules ( #23315 )
2 years ago
1c2ca9557f
Enable ESLint no-useless-escape ( #23311 )
2 years ago
28bc6265bf
Fix case-sensitive check for previously used hashtags ( #23526 )
2 years ago
c2cb5defb0
Change followed_by link to location=all if account is local on /admin/accounts/:id page ( #23467 )
2 years ago
6417e06194
Upgrade to Stylelint 15 with Prettier ( #23558 )
2 years ago
ab546780eb
fix hashtag ordering ( #2107 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2 years ago
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
6917c854d1
Merge branch 'main' into glitch-soc/merge-upstream
2 years ago
ea4cffac37
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>
2 years ago
3c1e48d304
Fix attached media uploads not being cleared when replying to a post ( #23504 )
2 years ago
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
fce6c27f41
Merge branch 'main' into glitch-soc/merge-upstream
2 years ago
1a094b002d
Fix admin-set follow recommandations being case-sensitive ( #23500 )
...
Fixes #23472
2 years ago
cdcf981ad7
Fix server status URL being a required server setting ( #23499 )
2 years ago
f925f5bf2f
[Glitch] Add scrolling to Compare history modal
...
Port 7406c66b77
2 years ago
54e6fa1363
[Glitch] Show spinner while loading follow requests
...
Port 059a055e65
2 years ago
71629f6f99
[Glitch] Spell check input fields
...
Port 9b74ffa7e0
2 years ago
664847db15
[Glitch] Add setting for status page URL
...
Port 92e5feb621
2 years ago
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
1c08aef482
Remove posts count and last posts from ActivityPub representation of hashtag collections ( #23460 )
2 years ago
ae45c9ccd4
Apply Rubocop Rails/WhereNot ( #23448 )
...
* Apply Rubocop Rails/WhereNot
* Update spec for where.not
2 years ago
4a49c50e64
Apply Rubocop Performance/BlockGivenWithExplicitBlock ( #23441 )
...
* Apply Rubocop Performance/BlockGivenWithExplicitBlock
* Unprefix used block parameter
2 years ago
d09952cf77
Apply Rubocop Style/EmptyElse ( #23449 )
2 years ago
e0a02f8696
Apply Rubocop Style/NegatedIfElseCondition ( #23451 )
2 years ago
faa8b582de
Apply Rubocop Style/RedundantAssignment ( #23452 )
2 years ago
fd5980fc35
Apply Rubocop Performance/StringReplacement ( #23445 )
2 years ago
67a6f688ca
Apply Rubocop Performance/StringIdentifierArgument ( #23444 )
2 years ago
Claire
Matt Jankowski
Eugen Rochko
Nick Schonning
Christian Schmidt
Tim Lucas
Botao Wang
Renaud Chaput
Aaron Patterson
Dean Bassett
Jeong Arm
cadars