e63524f457
Update retention model sql query ( #24249 )
2 years ago
9bda933740
Change media upload limits and remove client-side resizing ( #23726 )
2 years ago
ef127c964a
Change design of account rows in web UI ( #24247 )
2 years ago
6e8711ff91
Add missing parenthesis ( #24238 )
2 years ago
d1b057a0ac
Remove legacy decorators syntax ( #18357 )
2 years ago
b46125224c
Remove isNaN polyfill ( #24224 )
2 years ago
16da4a09e8
Fix broken links in account gallery ( #24218 )
2 years ago
b4f60bc6de
[Glitch] Fit the max-width of media in .prose to parent box
...
Port 0a9def5498
2 years ago
5ac380c122
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/status.rb`:
Upstream added lines close to a glitch-soc only line, not a real conflict.
Applied upstream's changes (added hooks) while keeping glitch-soc's changes
(`local_only` scope).
- `config/environments/production.rb`:
Upstream removed a header, while we have glitch-soc specific ones.
Removed the header removed upstream.
2 years ago
2626097869
Fix Rails cache namespace being overriden with `v2` for cached statuses ( #24202 )
2 years ago
a7a578a055
Remove unused InstancePresenter methods ( #24206 )
2 years ago
38c84f57b6
Refactoring relations_map ( #24195 )
2 years ago
0a9def5498
Fit the max-width of media in .prose to parent box ( #24180 )
2 years ago
7bef11630d
Remove references to non-existent actions ( #24183 )
2 years ago
02ac94490a
Add getting-started-misc to route ( #2141 )
...
* Add getting-started-misc to web_app_paths
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
* Add signed in check to navigation entries
Enabling routing for getting-started-misc allows the column to be directly accessible, which showed every entry and threw unnecessary errors.
Also fixed the keys as these were literally "i++".
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
* Remove "Extended information" from getting-started-misc
I couldn't find any reference to this translation string, so I removed it too.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
---------
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2 years ago
94cbd808b5
Webhooks for local status.create, status.update, account.update ( #24133 )
2 years ago
3091a184ca
Merge branch 'main' into glitch-soc/merge-upstream
2 years ago
160f38f03d
Workaround the ActiveRecord / Marshal serialization bug on Ruby 3.2 ( #24142 )
...
Co-authored-by: Jean Boussier <jean.boussier@gmail.com>
2 years ago
b22b4bac03
Include config/ and update all rubcop deps ( #23963 )
2 years ago
d75a1e5054
Link to the Identity provider's account settings from the account settings ( #24100 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
8f97ffe91e
[Glitch] Replace `Status#translatable?` with language matrix in separate endpoint
...
Port bd047acc35
2 years ago
193250556c
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream changed their README, we have our own.
Kept ours.
- `app/helpers/application_helper.rb`:
Minor code style fix upstream, on a line that is different in glitch-soc
due to the different theming system.
Applied the code style fix to our own code.
- `app/views/settings/preferences/appearance/show.html.haml`:
Code style fix on a line next to lines exclusive to glitch-soc.
Applied upstream changes.
- `yarn.lock`:
Upstream updated a dependency textually close to a glitch-soc-only
dependency.
Updated the dependency like upstream did.
2 years ago
8fdf49b11d
Add warning for object storage misconfiguration ( #24137 )
2 years ago
75e5a6e437
Change user backups to use expiring URLs for download when possible ( #24136 )
2 years ago
a085901108
New Crowdin updates ( #23904 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2 years ago
bd047acc35
Replace `Status#translatable?` with language matrix in separate endpoint ( #24037 )
2 years ago
630436ab2d
Refactor monkey-patching of `PrivateAddressCheck` ( #24122 )
2 years ago
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
e2a3ebb271
Autofix Rubocop Style/IfUnlessModifier ( #23697 )
2 years ago
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
2 years ago
8aee4de034
Autofix Rubocop Style/PerlBackrefs ( #23649 )
2 years ago
a6f77aa28a
Autofix Rubocop Lint/AmbiguousOperatorPrecedence ( #23681 )
2 years ago
e2567df860
Enable Lint/RedundantCopDisableDirective ( #23687 )
2 years ago
634368c491
Autofix Rubocop Lint/SymbolConversion ( #23683 )
2 years ago
669f6d2c0a
Run rubocop formatting except line length ( #23632 )
2 years ago
cde13349cb
Fix bad type for spellCheck attribute ( #23638 )
2 years ago
5e1c0c3d94
Enable ESLint Promise plugin defaults ( #22229 )
2 years ago
630975bf41
New Crowdin updates ( #23527 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2 years ago
fb8503e861
Upgrade to Ruby 3.2 ( #22928 )
...
Co-authored-by: Matthew Ford <matt@bitzesty.com>
2 years ago
66f715550e
Add `memorial` attribute to REST API ( #23591 )
2 years ago
40fc917a86
[Glitch] Fix case-sensitive check for previously used hashtags
...
Port 4da5f77d92
2 years ago
58291b31fa
[Glitch] Fix attached media uploads not being cleared when replying to a post
...
Port bae17ebe5e
2 years ago
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.
2 years ago
d6930b3847
Add API parameter to safeguard unexpect mentions in new posts ( #18350 )
2 years ago
eddfb33dfe
Enable ESLint import recommended rules ( #23315 )
2 years ago
db2c58d47a
Enable ESLint no-useless-escape ( #23311 )
2 years ago
4da5f77d92
Fix case-sensitive check for previously used hashtags ( #23526 )
2 years ago
5f56818f9e
Change followed_by link to location=all if account is local on /admin/accounts/:id page ( #23467 )
2 years ago
0c9d455ea5
Upgrade to Stylelint 15 with Prettier ( #23558 )
2 years ago
ee42505452
fix hashtag ordering ( #2107 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2 years ago
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]
2 years ago
Matt Jankowski
Eugen Rochko
Yamagishi Kazutoshi
Nick Schonning
Christian Schmidt
mogamin
Claire
Takeshi Umeda
Plastikmensch
Vyr Cossont
Jean byroot Boussier
CSDUMMI
Rodion Borisov
PauloVilarinho
Terry Garcia
Tim Lucas
Botao Wang
Renaud Chaput
Aaron Patterson
Dean Bassett
Jeong Arm