25d36b6edd
Autofix Rubocop Style/RedundantArgument ( #23798 )
2 years ago
65669d3c57
Fix more haml-lint Rubocop ( #24107 )
2 years ago
32418f0ff3
[Glitch] Center the text itself in upload area
...
Port a52ccd7ad9
2 years ago
17fb58bff3
[Glitch] add modal message when editing toot
...
Port 8770473dbb
2 years ago
3ef5f62abf
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
75131e7bf7
Setup haml-lint CI with todo config ( #23524 )
2 years ago
a232a1feb8
Fix misleading error code when receiving invalid WebAuthn credentials ( #23568 )
2 years ago
cf50667e26
Fix incorrect post links in strikes when the account is remote ( #23611 )
2 years ago
9875be09fe
Fix dashboard crash on ElasticSearch server error ( #23751 )
2 years ago
39c7236649
Redirect users to SLO at the IdP after logging them out of Mastodon. ( #24020 )
2 years ago
1d0ad558ff
Change sidekiq-bulk's batch size from 10,000 to 1,000 jobs in one Redis call ( #24034 )
2 years ago
d258ec8e3b
Prefer the stored location as after_sign_in_path in Omniauth Callback Controller ( #24073 )
2 years ago
a52ccd7ad9
Center the text itself in upload area ( #24029 )
2 years ago
684a970b3c
Unescape HTML entities ( #24019 )
2 years ago
dfa1be4ab4
Remove unused TOCGenerator ( #23986 )
2 years ago
8770473dbb
add modal message when editing toot ( #23936 )
...
Co-authored-by: PauloVilarinho <paulotarsobranco@hotmail.com>
2 years ago
21db91a0a8
Remove sidebar dead code ( #23984 )
2 years ago
86f8aa2db2
Fix unconfirmed accounts being registered as active users ( #23803 )
2 years ago
c4cf92094e
Do not strip tags from `Setting.site_short_description` ( #23975 )
2 years ago
7f3b0dedeb
Refactor glitch-soc rich text SCSS
2 years ago
1317553f3a
[Glitch] Only offer translation for supported languages
...
Port 5a8c651e8f
2 years ago
9a1bd1c3e9
[Glitch] Switched bookmark and favourites around
...
Port a1347f456e
2 years ago
03ac84b0f4
[Glitch] Fix duplicate “Publish” button on mobile
...
Port b55fc883b6
2 years ago
7623e18124
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
bb4e211c86
New Crowdin updates ( #2118 )
...
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
2 years ago
0e476f3c4f
[Glitch] Add `lang` attribute to media and poll options
...
Port d3eefead30
2 years ago
82a6cf4012
Enable Rubocop for app/views ( #23874 )
2 years ago
cb868228bd
Do not leave Mastodon when clicking “Back” ( #23953 )
2 years ago
7f4412eeeb
User mailer spec coverage improvements ( #23905 )
2 years ago
c40d5e5a8f
Misc coverage improvements for validators ( #23928 )
2 years ago
922837dc96
Upgrade to latest redis-rb 4.x and fix deprecations ( #23616 )
...
Co-authored-by: Jean Boussier <jean.boussier@gmail.com>
2 years ago
b00f945d92
Remove implied StandardError rescue ( #23942 )
2 years ago
050f1669c6
Fix original account being unfollowed on migration before the follow request could be sent ( #21957 )
2 years ago
ddde4e0d95
Change `ActivityPub::DeliveryWorker` retries to be spread out more ( #21956 )
2 years ago
5a8c651e8f
Only offer translation for supported languages ( #23879 )
2 years ago
6b16b77ab0
Fix external authentication not running onboarding code for new users ( #23458 )
2 years ago
d6679d1751
Add mail headers to avoid auto-replies ( #23597 )
2 years ago
f94aa70b81
Fix error when displaying post history of a trendable post in the admin interface ( #23574 )
2 years ago
a1347f456e
Switched bookmark and favourites around ( #23701 )
2 years ago
f8bb4d0d6b
Fix server error when failing to follow back followers from `/relationships` ( #23787 )
2 years ago
b55fc883b6
Fix duplicate “Publish” button on mobile ( #23804 )
2 years ago
c2a046ded1
Fix “Remove all followers from the selected domains” being more destructive than it claims ( #23805 )
2 years ago
3a6451c867
Add support for incoming rich text ( #23913 )
2 years ago
276c1d32d6
Merge branch 'main' into glitch-soc/merge-upstream
2 years ago
af578e8ce0
Fix deprecation warning about merging conditions ( #23618 )
2 years ago
b6602f68eb
Spec coverage for HomeHelper ( #23907 )
2 years ago
cb97ba7a2f
New Crowdin updates ( #23802 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2 years ago
56489cdc4f
Autofix Rubocop Style/HashConversion ( #23852 )
2 years ago
cc3633539e
Remove unused admin/announcements helper ( #23899 )
2 years ago
055ed5a616
Remove unused InstancePresenter#sample_accounts method ( #23900 )
2 years ago
4bb39ac3c3
Fix single-record invalid condition on PollVote ( #23810 )
2 years ago
d3eefead30
Add `lang` attribute to media and poll options ( #23891 )
2 years ago
b91756fd4d
Move misc rules from components/index.scss to components/misc.scss
2 years ago
cc94cc86ae
Fix glitch-soc SCSS code style and refactor closer to upstream
2 years ago
b632c5a55a
[Glitch] Add `lang` attribute to preview card
...
Port 8000a8f230
2 years ago
28cb77bd07
[Glitch] Increase contrast of upload progress background
...
Port f4f91bc295
2 years ago
56bec60f25
[Glitch] Fix sidebar cut-off on small screens in admin UI
...
Port 7adde24a95
2 years ago
31455f05fb
[Glitch] Add `lang` tag to native language names in language picker
...
Port 7207a98d39
2 years ago
81ef21a0c8
[Glitch] Rename JSX files with proper `.jsx` extension
...
Port 44a7d87cb1
2 years ago
859eb01aac
Fix building vanilla flavor after JSX change
2 years ago
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.
2 years ago
730bb3e211
Remove unused HTML Validator ( #23866 )
2 years ago
8000a8f230
Add `lang` attribute to preview card ( #23869 )
2 years ago
20b80c62ff
Change auto-deletion throttling constants to better scale with server size ( #23320 )
2 years ago
f4f91bc295
Increase contrast of upload progress background ( #23836 )
2 years ago
2564117131
New Crowdin updates ( #23625 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2 years ago
f682478de8
Fix inefficiency when searching accounts per username in admin interface ( #23801 )
2 years ago
4ff44be134
Autofix Rubocop Rails/Blank ( #23765 )
2 years ago
0cfdd1a401
Enable Rubocop Style/StringConcatenation defaults ( #23792 )
2 years ago
7adde24a95
Fix sidebar cut-off on small screens in admin UI ( #23764 )
2 years ago
7207a98d39
Add `lang` tag to native language names in language picker ( #23749 )
2 years ago
434770f580
Autofix Rubocop Rails/FindById ( #23762 )
2 years ago
9909b4b653
Autofix Rubocop Rails/WhereEquals ( #23759 )
2 years ago
d3b4d4d4f3
Change compose form checkbox to native input with `appearance: none` ( #22949 )
2 years ago
59c8d43d94
Autofix Rubocop Style/RescueStandardError ( #23745 )
2 years ago
62c4aecf8f
Make larger part of status clickable ( #23621 )
2 years ago
af4c95100c
Autofix Rubocop Style/FormatString ( #23743 )
2 years ago
717683d1c3
Autofix Rubocop remaining Layout rules ( #23679 )
2 years ago
d2dcb6c45a
Autofix Rubocop Style/UnpackFirst ( #23741 )
2 years ago
38a1d8bb85
Autofix Rubocop RSpec/ImplicitSubject ( #23721 )
2 years ago
63e6353886
Autofix Rubocop Rails/EnumHash ( #23737 )
2 years ago
44a7d87cb1
Rename JSX files with proper `.jsx` extension ( #23733 )
2 years ago
f0e1b12c10
Autofix Rubocop Style/ExplicitBlockArgument ( #23704 )
2 years ago
aef0051fd0
Enable Rubocop HTTP status rules ( #23717 )
2 years ago
21bf326356
Autofix Rubocop Rails/Pluck ( #23730 )
2 years ago
597767a9f7
Autofix Rubocop Rails/RedundantForeignKey ( #23731 )
2 years ago
dc0cc5a57d
Fix incorrect translation string in glitch-soc captcha feature
2 years ago
8c8358b3cf
[Glitch] Fix focus point of already-attached media not saving after edit
...
Port b2283b6838
2 years ago
229ab559dc
[Glitch] Fix bad type for spellCheck attribute
...
Port cde13349cb
2 years ago
6fdd596cc8
[Glitch] Enable ESLint Promise plugin defaults
...
Port 5e1c0c3d94
2 years ago
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.
2 years ago
b2283b6838
Fix focus point of already-attached media not saving after edit ( #23566 )
2 years ago
81ad6c2e39
Autofix Rubocop Style/StringLiterals ( #23695 )
2 years ago
2177daeae9
Autofix Rubocop Style/RedundantBegin ( #23703 )
2 years ago
4c68189d2b
Merge pull request #2112 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2 years ago
ea9a1d79df
[Glitch] Upgrade to Stylelint 15 with Prettier
...
Port 0c9d455ea5
2 years ago
7e64eef73b
[Glitch] Enable ESLint no-useless-escape
...
Port db2c58d47a
2 years ago
587f6b3b06
[Glitch] Enable ESLint import recommended rules
...
Port eddfb33dfe
2 years ago
c38bd17657
Autofix Rubocop Style/TrailingCommaInArguments ( #23694 )
2 years ago
ab7816a414
Autofix Rubocop Style/Lambda ( #23696 )
2 years ago
Nick Schonning
Rodion Borisov
PauloVilarinho
Claire
CSDUMMI
Christian Schmidt
Matt Jankowski
Terry Garcia
Jean byroot Boussier
Eugen Rochko
Tim Lucas
Botao Wang
Renaud Chaput