Christian Schmidt
16da4a09e8
Fix broken links in account gallery ( #24218 )
2023-03-23 05:17:29 +01:00
mogamin
b4f60bc6de
[Glitch] Fit the max-width of media in .prose to parent box
...
Port 0a9def5498
2023-03-22 20:00:33 +01:00
Claire
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.
2023-03-22 19:50:11 +01:00
Claire
2626097869
Fix Rails cache namespace being overriden with v2 for cached statuses ( #24202 )
2023-03-22 15:47:44 +01:00
Matt Jankowski
a7a578a055
Remove unused InstancePresenter methods ( #24206 )
2023-03-22 14:15:22 +01:00
Takeshi Umeda
38c84f57b6
Refactoring relations_map ( #24195 )
2023-03-21 10:32:58 +01:00
Jeremy Kescher
946c91d7d9
Merge remote-tracking branch 'upstream/main' into develop
2023-03-20 23:22:41 +01:00
mogamin
0a9def5498
Fit the max-width of media in .prose to parent box ( #24180 )
2023-03-20 20:04:25 +01:00
Matt Jankowski
7bef11630d
Remove references to non-existent actions ( #24183 )
2023-03-20 20:03:44 +01:00
Plastikmensch
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>
2023-03-19 17:26:02 +01:00
Vyr Cossont
94cbd808b5
Webhooks for local status.create, status.update, account.update ( #24133 )
2023-03-19 07:47:54 +01:00
Jeremy Kescher
2cb88f5baa
Merge remote-tracking branch 'upstream/main' into develop
...
Conflicts:
- .github/workflows/build-image.yml
We don't use GitHub Actions for building Docker images.
- Gemfile.lock
Versions were upgraded upstream that conflicted with our changes, simply applied upstream changes.
2023-03-19 01:57:28 +01:00
Claire
3091a184ca
Merge branch 'main' into glitch-soc/merge-upstream
2023-03-18 11:21:03 +01:00
Jean byroot Boussier
160f38f03d
Workaround the ActiveRecord / Marshal serialization bug on Ruby 3.2 ( #24142 )
...
Co-authored-by: Jean Boussier <jean.boussier@gmail.com>
2023-03-17 14:37:30 +01:00
Jean Boussier
03a96ba2e1
Workaround the ActiveRecord / Marshal serialization bug on Ruby 3.2
...
Fix: https://github.com/mastodon/mastodon/issues/23644
As mentioned on that other thread, the issue arise when a `Status`
is created with SHAPE_TOO_COMPLEX making the instance variable ordering
unpredictable.
But we can sidestep that issue using code inspired from Shopify/paquito.
I added some code in the test environment initializer to cause this
issue to be reproduced and prove this change fixes it.
This code is also easily converted into a monkey patch.
2023-03-17 11:37:22 +00:00
Nick Schonning
b22b4bac03
Include config/ and update all rubcop deps ( #23963 )
2023-03-17 10:13:28 +01:00
CSDUMMI
d75a1e5054
Link to the Identity provider's account settings from the account settings ( #24100 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-03-17 10:09:01 +01:00
Jeremy Kescher
080569b3fd
Remove fetch_value issue logging
...
Since we've moved back to Ruby 3.1.3 in 9aa172f7dfhttps://github.com/mastodon/mastodon/issues/23644#issuecomment-1472637530 .
As such, we no longer need this logging, and should be able to upgrade past Ruby 3.1 once the marshaller does ordering correctly again or Rails is changed to do custom marshalling.
2023-03-17 07:54:37 +01:00
Jeremy Kescher
24e9a23fe6
Merge remote-tracking branch 'upstream/main' into develop, bump version
...
Conflicts:
- .github/workflows/build-image.yml
We're not building an image with GitHub Actions.
2023-03-17 07:27:28 +01:00
Christian Schmidt
8f97ffe91e
[Glitch] Replace Status#translatable? with language matrix in separate endpoint
...
Port bd047acc35
2023-03-16 23:21:08 +01:00
Claire
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.
2023-03-16 23:12:59 +01:00
Claire
8fdf49b11d
Add warning for object storage misconfiguration ( #24137 )
2023-03-16 22:47:01 +01:00
Eugen Rochko
75e5a6e437
Change user backups to use expiring URLs for download when possible ( #24136 )
2023-03-16 22:46:52 +01:00
Eugen Rochko
a085901108
New Crowdin updates ( #23904 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-03-16 21:02:00 +09:00
Christian Schmidt
bd047acc35
Replace Status#translatable? with language matrix in separate endpoint ( #24037 )
2023-03-16 11:07:24 +01:00
Eugen Rochko
630436ab2d
Refactor monkey-patching of PrivateAddressCheck ( #24122 )
2023-03-16 04:33:38 +01:00
Nick Schonning
25d36b6edd
Autofix Rubocop Style/RedundantArgument ( #23798 )
2023-03-16 10:34:00 +09:00
Nick Schonning
65669d3c57
Fix more haml-lint Rubocop ( #24107 )
2023-03-15 20:07:43 +01:00
Jeremy Kescher
ddc4022845
Merge remote-tracking branch 'upstream/main' into develop
...
# Conflicts:
# Gemfile.lock
# app/javascript/flavours/glitch/initial_state.js
# app/javascript/mastodon/initial_state.js
# app/lib/feed_manager.rb
# app/services/batched_remove_status_service.rb
# lib/mastodon/feeds_cli.rb
2023-03-15 14:13:29 +01:00
Rodion Borisov
32418f0ff3
[Glitch] Center the text itself in upload area
...
Port a52ccd7ad9
2023-03-15 09:33:48 +01:00
PauloVilarinho
17fb58bff3
[Glitch] add modal message when editing toot
...
Port 8770473dbb
2023-03-15 09:33:14 +01:00
Claire
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.
2023-03-15 09:16:10 +01:00
Nick Schonning
75131e7bf7
Setup haml-lint CI with todo config ( #23524 )
2023-03-15 04:15:36 +01:00
Claire
a232a1feb8
Fix misleading error code when receiving invalid WebAuthn credentials ( #23568 )
2023-03-15 04:15:20 +01:00
Claire
cf50667e26
Fix incorrect post links in strikes when the account is remote ( #23611 )
2023-03-15 04:14:47 +01:00
Claire
9875be09fe
Fix dashboard crash on ElasticSearch server error ( #23751 )
2023-03-15 04:01:49 +01:00
CSDUMMI
39c7236649
Redirect users to SLO at the IdP after logging them out of Mastodon. ( #24020 )
2023-03-15 03:52:40 +01:00
Claire
1d0ad558ff
Change sidekiq-bulk's batch size from 10,000 to 1,000 jobs in one Redis call ( #24034 )
2023-03-15 03:45:15 +01:00
Jeremy Kescher
b457636e9a
Update fetch_value logging patch
...
https://github.com/mastodon/mastodon/issues/23644#issuecomment-1461863404
2023-03-14 10:29:05 +01:00
Jeremy Kescher
d092a01cea
Use Rails.logger.warn instead of puts
2023-03-14 09:45:50 +01:00
Jeremy Kescher
2d076504d9
Log what's causing the fetch_value errors.
...
Port of https://github.com/mastodon/mastodon/issues/23644#issuecomment-1461863404
2023-03-13 22:34:28 +01:00
CSDUMMI
d258ec8e3b
Prefer the stored location as after_sign_in_path in Omniauth Callback Controller ( #24073 )
2023-03-13 00:06:27 +01:00
Rodion Borisov
a52ccd7ad9
Center the text itself in upload area ( #24029 )
2023-03-09 14:35:44 +01:00
Christian Schmidt
684a970b3c
Unescape HTML entities ( #24019 )
2023-03-08 19:56:41 +01:00
Matt Jankowski
dfa1be4ab4
Remove unused TOCGenerator ( #23986 )
2023-03-06 17:33:58 +01:00
PauloVilarinho
8770473dbb
add modal message when editing toot ( #23936 )
...
Co-authored-by: PauloVilarinho <paulotarsobranco@hotmail.com>
2023-03-06 17:33:09 +01:00
Jeremy Kescher
047286d54e
Merge remote-tracking branch 'upstream/main' into develop
...
# Conflicts:
# Gemfile.lock
2023-03-06 16:33:21 +01:00
Claire
21db91a0a8
Remove sidebar dead code ( #23984 )
2023-03-06 16:25:35 +01:00
Claire
86f8aa2db2
Fix unconfirmed accounts being registered as active users ( #23803 )
2023-03-06 16:00:08 +01:00
Christian Schmidt
c4cf92094e
Do not strip tags from Setting.site_short_description ( #23975 )
2023-03-06 15:37:19 +01:00
Claire
7f3b0dedeb
Refactor glitch-soc rich text SCSS
2023-03-05 21:31:45 +01:00
Christian Schmidt
1317553f3a
[Glitch] Only offer translation for supported languages
...
Port 5a8c651e8f
2023-03-05 21:19:04 +01:00
Terry Garcia
9a1bd1c3e9
[Glitch] Switched bookmark and favourites around
...
Port a1347f456e
2023-03-05 21:07:55 +01:00
Claire
03ac84b0f4
[Glitch] Fix duplicate “Publish” button on mobile
...
Port b55fc883b6
2023-03-05 21:07:10 +01:00
Claire
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.
2023-03-05 20:46:56 +01:00
Claire
bb4e211c86
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
0e476f3c4f
[Glitch] Add lang attribute to media and poll options
...
Port d3eefead30
2023-03-05 17:52:53 +01:00
Jeremy Kescher
7318b74ebf
Merge remote-tracking branch 'upstream/main' into develop
...
# Conflicts:
# Gemfile.lock
# app/models/notification.rb
# config/locales/simple_form.de.yml
2023-03-05 12:34:16 +01:00
Nick Schonning
82a6cf4012
Enable Rubocop for app/views ( #23874 )
2023-03-05 00:33:52 +01:00
Christian Schmidt
cb868228bd
Do not leave Mastodon when clicking “Back” ( #23953 )
2023-03-04 23:18:19 +01:00
Matt Jankowski
7f4412eeeb
User mailer spec coverage improvements ( #23905 )
2023-03-04 17:16:11 +01:00
Matt Jankowski
c40d5e5a8f
Misc coverage improvements for validators ( #23928 )
2023-03-04 17:00:00 +01:00
Jean byroot Boussier
922837dc96
Upgrade to latest redis-rb 4.x and fix deprecations ( #23616 )
...
Co-authored-by: Jean Boussier <jean.boussier@gmail.com>
2023-03-04 16:38:28 +01:00
Nick Schonning
b00f945d92
Remove implied StandardError rescue ( #23942 )
2023-03-03 22:49:16 +01:00
Claire
050f1669c6
Fix original account being unfollowed on migration before the follow request could be sent ( #21957 )
2023-03-03 21:13:55 +01:00
Claire
ddde4e0d95
Change ActivityPub::DeliveryWorker retries to be spread out more ( #21956 )
2023-03-03 21:08:22 +01:00
Christian Schmidt
5a8c651e8f
Only offer translation for supported languages ( #23879 )
2023-03-03 21:06:31 +01:00
Claire
6b16b77ab0
Fix external authentication not running onboarding code for new users ( #23458 )
2023-03-03 20:45:55 +01:00
Claire
d6679d1751
Add mail headers to avoid auto-replies ( #23597 )
2023-03-03 20:44:46 +01:00
Claire
f94aa70b81
Fix error when displaying post history of a trendable post in the admin interface ( #23574 )
2023-03-03 20:44:02 +01:00
Terry Garcia
a1347f456e
Switched bookmark and favourites around ( #23701 )
2023-03-03 20:37:49 +01:00
Claire
f8bb4d0d6b
Fix server error when failing to follow back followers from /relationships ( #23787 )
2023-03-03 20:36:18 +01:00
Claire
b55fc883b6
Fix duplicate “Publish” button on mobile ( #23804 )
2023-03-03 20:25:36 +01:00
Claire
c2a046ded1
Fix “Remove all followers from the selected domains” being more destructive than it claims ( #23805 )
2023-03-03 20:25:15 +01:00
Claire
3a6451c867
Add support for incoming rich text ( #23913 )
2023-03-03 20:19:29 +01:00
Claire
276c1d32d6
Merge branch 'main' into glitch-soc/merge-upstream
2023-03-02 17:32:38 +01:00
Matt Jankowski
af578e8ce0
Fix deprecation warning about merging conditions ( #23618 )
2023-03-02 16:21:04 +01:00
Matt Jankowski
b6602f68eb
Spec coverage for HomeHelper ( #23907 )
2023-03-02 10:04:14 +01:00
Eugen Rochko
cb97ba7a2f
New Crowdin updates ( #23802 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-02-28 23:01:05 +09:00
Nick Schonning
56489cdc4f
Autofix Rubocop Style/HashConversion ( #23852 )
2023-02-28 22:59:19 +09:00
Matt Jankowski
cc3633539e
Remove unused admin/announcements helper ( #23899 )
2023-02-28 11:56:50 +01:00
Matt Jankowski
055ed5a616
Remove unused InstancePresenter#sample_accounts method ( #23900 )
2023-02-27 19:03:35 +01:00
Matt Jankowski
4bb39ac3c3
Fix single-record invalid condition on PollVote ( #23810 )
2023-02-27 09:31:15 +01:00
Christian Schmidt
d3eefead30
Add lang attribute to media and poll options ( #23891 )
2023-02-26 20:13:27 +01:00
Claire
b91756fd4d
Move misc rules from components/index.scss to components/misc.scss
2023-02-25 23:47:21 +01:00
Claire
cc94cc86ae
Fix glitch-soc SCSS code style and refactor closer to upstream
2023-02-25 23:46:23 +01:00
Christian Schmidt
b632c5a55a
[Glitch] Add lang attribute to preview card
...
Port 8000a8f230
2023-02-25 14:43:57 +01:00
Tim Lucas
28cb77bd07
[Glitch] Increase contrast of upload progress background
...
Port f4f91bc295
2023-02-25 14:43:24 +01:00
Botao Wang
56bec60f25
[Glitch] Fix sidebar cut-off on small screens in admin UI
...
Port 7adde24a95
2023-02-25 14:40:29 +01:00
Claire
31455f05fb
[Glitch] Add lang tag to native language names in language picker
...
Port 7207a98d39
2023-02-25 14:37:05 +01:00
Renaud Chaput
81ef21a0c8
[Glitch] Rename JSX files with proper .jsx extension
...
Port 44a7d87cb1
2023-02-25 14:35:31 +01:00
Claire
859eb01aac
Fix building vanilla flavor after JSX change
2023-02-25 14:28:59 +01:00
Claire
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.
2023-02-25 14:00:40 +01:00
Matt Jankowski
730bb3e211
Remove unused HTML Validator ( #23866 )
2023-02-24 20:06:32 +01:00
Christian Schmidt
8000a8f230
Add lang attribute to preview card ( #23869 )
2023-02-24 20:04:38 +01:00
Claire
20b80c62ff
Change auto-deletion throttling constants to better scale with server size ( #23320 )
2023-02-23 16:52:40 +01:00
Tim Lucas
f4f91bc295
Increase contrast of upload progress background ( #23836 )
2023-02-23 12:58:42 +01:00
Eugen Rochko
2564117131
New Crowdin updates ( #23625 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-02-22 21:16:02 +09:00
Claire
f682478de8
Fix inefficiency when searching accounts per username in admin interface ( #23801 )
2023-02-22 11:53:13 +01:00
Nick Schonning
4ff44be134
Autofix Rubocop Rails/Blank ( #23765 )
2023-02-22 09:57:56 +09:00
Nick Schonning
0cfdd1a401
Enable Rubocop Style/StringConcatenation defaults ( #23792 )
2023-02-22 09:54:36 +09:00
Botao Wang
7adde24a95
Fix sidebar cut-off on small screens in admin UI ( #23764 )
2023-02-21 10:06:13 +01:00
Claire
7207a98d39
Add lang tag to native language names in language picker ( #23749 )
2023-02-21 09:23:39 +01:00
Nick Schonning
434770f580
Autofix Rubocop Rails/FindById ( #23762 )
2023-02-21 10:21:48 +09:00
Jeremy Kescher
0e634397c3
Merge remote-tracking branch 'upstream/main' into develop
...
# Conflicts:
# .github/workflows/build-image.yml
# Gemfile.lock
2023-02-21 00:40:08 +01:00
Nick Schonning
9909b4b653
Autofix Rubocop Rails/WhereEquals ( #23759 )
2023-02-21 03:20:56 +09:00
Claire
d3b4d4d4f3
Change compose form checkbox to native input with appearance: none ( #22949 )
2023-02-20 11:32:27 +01:00
Nick Schonning
59c8d43d94
Autofix Rubocop Style/RescueStandardError ( #23745 )
2023-02-20 11:01:20 +01:00
Christian Schmidt
62c4aecf8f
Make larger part of status clickable ( #23621 )
2023-02-20 08:11:23 +01:00
Nick Schonning
af4c95100c
Autofix Rubocop Style/FormatString ( #23743 )
2023-02-20 07:58:33 +01:00
Nick Schonning
717683d1c3
Autofix Rubocop remaining Layout rules ( #23679 )
2023-02-20 06:58:28 +01:00
Nick Schonning
d2dcb6c45a
Autofix Rubocop Style/UnpackFirst ( #23741 )
2023-02-20 06:51:43 +01:00
Nick Schonning
38a1d8bb85
Autofix Rubocop RSpec/ImplicitSubject ( #23721 )
2023-02-20 05:00:48 +01:00
Nick Schonning
63e6353886
Autofix Rubocop Rails/EnumHash ( #23737 )
2023-02-20 05:00:36 +01:00
Renaud Chaput
44a7d87cb1
Rename JSX files with proper .jsx extension ( #23733 )
2023-02-20 03:20:59 +01:00
Nick Schonning
f0e1b12c10
Autofix Rubocop Style/ExplicitBlockArgument ( #23704 )
2023-02-20 11:18:08 +09:00
Nick Schonning
aef0051fd0
Enable Rubocop HTTP status rules ( #23717 )
2023-02-20 11:16:40 +09:00
Nick Schonning
21bf326356
Autofix Rubocop Rails/Pluck ( #23730 )
2023-02-20 02:28:40 +01:00
Nick Schonning
597767a9f7
Autofix Rubocop Rails/RedundantForeignKey ( #23731 )
2023-02-20 02:19:40 +01:00
Claire
dc0cc5a57d
Fix incorrect translation string in glitch-soc captcha feature
2023-02-19 11:02:27 +01:00
Claire
8c8358b3cf
[Glitch] Fix focus point of already-attached media not saving after edit
...
Port b2283b6838
2023-02-19 10:54:04 +01:00
Christian Schmidt
229ab559dc
[Glitch] Fix bad type for spellCheck attribute
...
Port cde13349cb
2023-02-19 10:53:44 +01:00
Nick Schonning
6fdd596cc8
[Glitch] Enable ESLint Promise plugin defaults
...
Port 5e1c0c3d94
2023-02-19 10:53:18 +01:00
Claire
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
Claire
b2283b6838
Fix focus point of already-attached media not saving after edit ( #23566 )
2023-02-19 07:11:18 +01:00
Nick Schonning
81ad6c2e39
Autofix Rubocop Style/StringLiterals ( #23695 )
2023-02-19 07:38:14 +09:00
Nick Schonning
2177daeae9
Autofix Rubocop Style/RedundantBegin ( #23703 )
2023-02-19 07:09:40 +09:00
Jeremy Kescher
4a6cc45f9d
Merge remote-tracking branch 'upstream/main' into develop
...
# Conflicts:
# Gemfile
# Gemfile.lock
# config/sidekiq.yml
2023-02-18 22:38:53 +01:00
Claire
4c68189d2b
Merge pull request #2112 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2023-02-18 22:05:11 +01:00
Nick Schonning
ea9a1d79df
[Glitch] Upgrade to Stylelint 15 with Prettier
...
Port 0c9d455ea5
2023-02-18 16:02:12 +01:00
Nick Schonning
7e64eef73b
[Glitch] Enable ESLint no-useless-escape
...
Port db2c58d47a
2023-02-18 16:02:12 +01:00
Claire
587f6b3b06
[Glitch] Enable ESLint import recommended rules
...
Port eddfb33dfe
2023-02-18 16:02:12 +01:00
Nick Schonning
c38bd17657
Autofix Rubocop Style/TrailingCommaInArguments ( #23694 )
2023-02-18 12:39:58 +01:00
Nick Schonning
ab7816a414
Autofix Rubocop Style/Lambda ( #23696 )
2023-02-18 12:39:00 +01:00
Nick Schonning
e2a3ebb271
Autofix Rubocop Style/IfUnlessModifier ( #23697 )
2023-02-18 12:37:47 +01:00
Claire
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
Nick Schonning
8aee4de034
Autofix Rubocop Style/PerlBackrefs ( #23649 )
2023-02-18 14:20:20 +09:00
Nick Schonning
a6f77aa28a
Autofix Rubocop Lint/AmbiguousOperatorPrecedence ( #23681 )
2023-02-18 04:30:23 +01:00
Nick Schonning
e2567df860
Enable Lint/RedundantCopDisableDirective ( #23687 )
2023-02-18 04:30:14 +01:00
Nick Schonning
634368c491
Autofix Rubocop Lint/SymbolConversion ( #23683 )
2023-02-18 03:23:49 +01:00
Nick Schonning
669f6d2c0a
Run rubocop formatting except line length ( #23632 )
2023-02-18 06:56:20 +09:00
Christian Schmidt
cde13349cb
Fix bad type for spellCheck attribute ( #23638 )
2023-02-17 09:51:27 +01:00
Jeremy Kescher
8de39432a9
Merge remote-tracking branch 'upstream/main' into develop
...
# Conflicts:
# .github/workflows/build-image.yml
# Gemfile.lock
# app/javascript/flavours/glitch/actions/interactions.js
# config/initializers/rack_attack.rb
# config/locales/en_GB.yml
2023-02-17 00:26:21 +01:00
Nick Schonning
5e1c0c3d94
Enable ESLint Promise plugin defaults ( #22229 )
2023-02-16 15:30:56 +09:00
Eugen Rochko
630975bf41
New Crowdin updates ( #23527 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-02-16 10:23:03 +09:00
Aaron Patterson
fb8503e861
Upgrade to Ruby 3.2 ( #22928 )
...
Co-authored-by: Matthew Ford <matt@bitzesty.com>
2023-02-15 08:30:27 +01:00
Claire
66f715550e
Add memorial attribute to REST API ( #23591 )
2023-02-14 13:50:55 +01:00
Dean Bassett
40fc917a86
[Glitch] Fix case-sensitive check for previously used hashtags
...
Port 4da5f77d92
2023-02-13 20:05:36 +01:00
Claire
58291b31fa
[Glitch] Fix attached media uploads not being cleared when replying to a post
...
Port bae17ebe5e
2023-02-13 20:04:45 +01:00
Claire
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
Claire
d6930b3847
Add API parameter to safeguard unexpect mentions in new posts ( #18350 )
2023-02-13 16:36:29 +01:00
Nick Schonning
eddfb33dfe
Enable ESLint import recommended rules ( #23315 )
2023-02-13 15:12:31 +01:00
Nick Schonning
db2c58d47a
Enable ESLint no-useless-escape ( #23311 )
2023-02-13 15:12:14 +01:00
Dean Bassett
4da5f77d92
Fix case-sensitive check for previously used hashtags ( #23526 )
2023-02-13 14:54:08 +01:00
Jeong Arm
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
Nick Schonning
0c9d455ea5
Upgrade to Stylelint 15 with Prettier ( #23558 )
2023-02-13 04:57:03 +01:00
Dean Bassett
ee42505452
fix hashtag ordering ( #2107 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2023-02-12 18:58:02 +01:00
Claire
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
Claire
87419f9307
Merge branch 'main' into glitch-soc/merge-upstream
2023-02-10 22:49:59 +01:00
Claire
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
Claire
bae17ebe5e
Fix attached media uploads not being cleared when replying to a post ( #23504 )
2023-02-10 22:03:35 +01:00
Eugen Rochko
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
Claire
4ceadc65b0
Merge branch 'main' into glitch-soc/merge-upstream
2023-02-10 13:48:21 +01:00
Claire
a9c220242b
Fix admin-set follow recommandations being case-sensitive ( #23500 )
...
Fixes #23472
2023-02-10 11:14:58 +01:00
Claire
67de888bad
Fix server status URL being a required server setting ( #23499 )
2023-02-10 10:20:43 +01:00
cadars
5e37906083
[Glitch] Add scrolling to Compare history modal
...
Port e8cb3ee827
2023-02-09 13:03:41 +01:00
Christian Schmidt
2dfbdc3f9d
[Glitch] Show spinner while loading follow requests
...
Port c1f32c9c14
2023-02-09 13:02:32 +01:00
Christian Schmidt
8fd6c36243
[Glitch] Spell check input fields
...
Port 67744ee779
2023-02-09 12:59:48 +01:00
Eugen Rochko
95e2cab22e
[Glitch] Add setting for status page URL
...
Port 8f590b0a21
2023-02-09 12:58:11 +01:00
Claire
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
Claire
832595d1e7
Remove posts count and last posts from ActivityPub representation of hashtag collections ( #23460 )
2023-02-08 17:57:25 +01:00
Nick Schonning
0592937264
Apply Rubocop Rails/WhereNot ( #23448 )
...
* Apply Rubocop Rails/WhereNot
* Update spec for where.not
2023-02-08 10:39:57 +01:00
Nick Schonning
0d1f192c54
Apply Rubocop Performance/BlockGivenWithExplicitBlock ( #23441 )
...
* Apply Rubocop Performance/BlockGivenWithExplicitBlock
* Unprefix used block parameter
2023-02-08 10:36:23 +01:00
Nick Schonning
26ac2447b4
Apply Rubocop Style/EmptyElse ( #23449 )
2023-02-08 07:08:39 +01:00
Nick Schonning
f68bb52556
Apply Rubocop Style/NegatedIfElseCondition ( #23451 )
2023-02-08 07:07:36 +01:00
Nick Schonning
8c1b65c7dd
Apply Rubocop Style/RedundantAssignment ( #23452 )
2023-02-08 07:06:50 +01:00
Nick Schonning
d3f59f52c3
Apply Rubocop Performance/StringReplacement ( #23445 )
2023-02-08 03:21:21 +01:00
Nick Schonning
203739dd3a
Apply Rubocop Performance/StringIdentifierArgument ( #23444 )
2023-02-08 02:36:20 +01:00
Nick Schonning
2e652aa81c
Apply Rubocop Performance/RedundantSplitRegexpArgument ( #23443 )
...
* Apply Rubocop Performance/RedundantSplitRegexpArgument
* Update app/controllers/concerns/signature_verification.rb
2023-02-08 02:25:20 +01:00
Nick Schonning
ef8988aef2
Apply Rubocop Performance/DoubleStartEndWith ( #23442 )
2023-02-08 10:06:48 +09:00
Nick Schonning
cec005068f
Apply Rubocop Performance/RedundantBlockCall ( #23440 )
2023-02-08 00:58:18 +01:00
Nick Schonning
ed570050c6
Autofix Rails/EagerEvaluationLogMessage ( #23429 )
...
* Autofix Rails/EagerEvaluationLogMessage
* Update spec for debug block syntax
2023-02-07 03:44:36 +01:00
Claire
9edefc779f
Fix UserCleanupScheduler crash when an unconfirmed account has a moderation note ( #23318 )
...
* Fix `UserCleanupScheduler` crash when an unconfirmed account has a moderation note
* Add tests
2023-02-07 01:14:44 +01:00
Jeong Arm
523a86618f
Fix account serializer crash if account doesn't have a user ( #23428 )
2023-02-07 01:03:26 +01:00
Claire
bb89f0af8a
Fix ActivityPub::ProcessingWorker error on incoming malformed JSON-LD ( #23416 )
2023-02-06 21:00:58 +01:00
Eugen Rochko
e2207af3d7
New Crowdin updates ( #23393 )
...
* New translations en.yml (Portuguese)
* New translations en.yml (Romanian)
* New translations en.yml (Spanish)
* New translations en.yml (Afrikaans)
* New translations en.yml (Arabic)
* New translations en.yml (Belarusian)
* New translations en.yml (Czech)
* New translations en.yml (Danish)
* New translations en.yml (Greek)
* New translations en.yml (Basque)
* New translations en.yml (Hungarian)
* New translations en.yml (Armenian)
* New translations en.yml (Italian)
* New translations en.yml (Galician)
* New translations en.yml (Slovak)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Polish)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Georgian)
* New translations en.yml (Korean)
* New translations en.yml (Lithuanian)
* New translations en.yml (Macedonian)
* New translations en.yml (Punjabi)
* New translations en.yml (Slovenian)
* New translations en.yml (Albanian)
* New translations en.yml (Serbian (Cyrillic))
* New translations en.yml (Swedish)
* New translations en.yml (Turkish)
* New translations en.yml (Ukrainian)
* New translations en.yml (Urdu (Pakistan))
* New translations en.yml (Icelandic)
* New translations simple_form.en.yml (Icelandic)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.yml (Indonesian)
* New translations en.yml (Persian)
* New translations en.yml (Tamil)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Spanish, Mexico)
* New translations en.yml (Bengali)
* New translations en.yml (Marathi)
* New translations en.yml (Thai)
* New translations en.yml (Croatian)
* New translations en.yml (Kazakh)
* New translations en.yml (Latvian)
* New translations en.yml (Hindi)
* New translations en.yml (Malay)
* New translations en.yml (Telugu)
* New translations en.yml (Burmese)
* New translations en.yml (Welsh)
* New translations en.yml (Faroese)
* New translations en.yml (Uyghur)
* New translations simple_form.en.yml (Greek)
* New translations simple_form.en.yml (Hebrew)
* New translations en.json (Japanese)
* New translations en.json (Romanian)
* New translations en.json (Afrikaans)
* New translations en.json (Danish)
* New translations en.json (Greek)
* New translations en.json (Frisian)
* New translations en.json (Basque)
* New translations en.json (Irish)
* New translations en.json (Hebrew)
* New translations en.json (Hungarian)
* New translations en.yml (Chinese Traditional, Hong Kong)
* New translations en.yml (Tatar)
* New translations en.yml (Malayalam)
* New translations en.yml (Breton)
* New translations en.yml (Latin)
* New translations en.yml (Bosnian)
* New translations en.yml (French, Quebec)
* New translations en.yml (Sinhala)
* New translations en.yml (Cornish)
* New translations en.yml (Kannada)
* New translations en.yml (Scottish Gaelic)
* New translations en.yml (Asturian)
* New translations en.yml (Aragonese)
* New translations en.yml (Serbian (Latin))
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Sorani (Kurdish))
* New translations en.yml (Scots)
* New translations en.yml (Igbo)
* New translations en.yml (Corsican)
* New translations en.yml (Sardinian)
* New translations en.yml (Sanskrit)
* New translations en.yml (Kabyle)
* New translations en.yml (Taigi)
* New translations en.yml (Silesian)
* New translations en.yml (Standard Moroccan Tamazight)
* New translations en.json (Uzbek)
* New translations en.yml (Uzbek)
* New translations en.json (Kashubian)
* New translations en.yml (Kashubian)
* New translations simple_form.en.yml (Slovenian)
* New translations en.json (Georgian)
* New translations en.json (Lithuanian)
* New translations en.json (Macedonian)
* New translations en.json (Norwegian)
* New translations en.json (Punjabi)
* New translations en.json (Polish)
* New translations en.json (Russian)
* New translations en.json (Slovenian)
* New translations en.json (Serbian (Cyrillic))
* New translations en.json (Swedish)
* New translations en.json (Turkish)
* New translations en.json (Ukrainian)
* New translations en.json (Urdu (Pakistan))
* New translations en.json (Galician)
* New translations en.json (Persian)
* New translations en.json (Tamil)
* New translations en.json (Spanish, Argentina)
* New translations en.json (Spanish, Mexico)
* New translations en.json (Bengali)
* New translations en.json (Marathi)
* New translations en.json (Norwegian Nynorsk)
* New translations en.json (Latvian)
* New translations en.json (Hindi)
* New translations en.json (Malay)
* New translations en.json (Telugu)
* New translations en.json (Burmese)
* New translations en.json (Faroese)
* New translations en.json (Uyghur)
* New translations en.json (Chinese Traditional, Hong Kong)
* New translations en.json (Tatar)
* New translations en.json (Malayalam)
* New translations en.json (Breton)
* New translations en.json (Latin)
* New translations en.json (Bosnian)
* New translations en.json (French, Quebec)
* New translations en.json (Sinhala)
* New translations en.json (Cornish)
* New translations en.json (Kannada)
* New translations en.json (Scottish Gaelic)
* New translations en.json (Asturian)
* New translations en.json (Aragonese)
* New translations en.json (Occitan)
* New translations en.json (Kurmanji (Kurdish))
* New translations en.json (Sorani (Kurdish))
* New translations en.json (Scots)
* New translations en.json (Igbo)
* New translations en.json (Corsican)
* New translations en.json (Sardinian)
* New translations en.json (Sanskrit)
* New translations en.json (Kabyle)
* New translations en.json (Ido)
* New translations en.json (Taigi)
* New translations en.json (Silesian)
* New translations en.json (Standard Moroccan Tamazight)
* New translations en.json (Catalan)
* New translations en.json (German)
* New translations en.json (Korean)
* New translations en.json (Portuguese)
* New translations en.json (Thai)
* New translations simple_form.en.yml (Catalan)
* New translations en.yml (Thai)
* New translations simple_form.en.yml (Dutch)
* New translations simple_form.en.yml (Portuguese)
* New translations simple_form.en.yml (Spanish, Argentina)
* New translations simple_form.en.yml (Thai)
* New translations en.json (Hungarian)
* New translations en.json (Spanish, Argentina)
* New translations en.json (German)
* New translations en.json (Dutch)
* New translations en.yml (German)
* New translations simple_form.en.yml (Dutch)
* New translations simple_form.en.yml (German)
* New translations en.json (German)
* New translations en.json (Italian)
* New translations en.json (Albanian)
* New translations en.yml (German)
* New translations en.yml (Russian)
* New translations simple_form.en.yml (German)
* New translations simple_form.en.yml (Italian)
* New translations simple_form.en.yml (Albanian)
* New translations simple_form.en.yml (Latvian)
* New translations en.json (Polish)
* New translations en.json (Russian)
* New translations en.json (Serbian (Cyrillic))
* New translations en.json (Latvian)
* New translations simple_form.en.yml (Czech)
* New translations simple_form.en.yml (Polish)
* New translations simple_form.en.yml (Turkish)
* New translations simple_form.en.yml (Ukrainian)
* New translations en.json (Turkish)
* New translations en.json (Ukrainian)
* New translations simple_form.en.yml (Italian)
* New translations en.json (French)
* New translations en.json (Czech)
* New translations simple_form.en.yml (French)
* New translations en.json (Slovak)
* New translations simple_form.en.yml (Slovak)
* New translations en.json (German)
* New translations en.json (English, United Kingdom)
* New translations en.json (Esperanto)
* New translations en.yml (German)
* New translations en.yml (Esperanto)
* New translations simple_form.en.yml (English, United Kingdom)
* New translations simple_form.en.yml (Esperanto)
* New translations en.yml (Slovak)
* New translations simple_form.en.yml (German)
* New translations en.json (Spanish)
* New translations en.yml (Asturian)
* New translations simple_form.en.yml (Basque)
* New translations simple_form.en.yml (Spanish)
* New translations en.json (Basque)
* New translations en.json (Belarusian)
* New translations en.json (Finnish)
* New translations simple_form.en.yml (Finnish)
* New translations simple_form.en.yml (Dutch)
* New translations simple_form.en.yml (Faroese)
* New translations en.json (Faroese)
* New translations en.json (Korean)
* New translations en.json (Vietnamese)
* New translations simple_form.en.yml (Vietnamese)
* New translations en.json (Korean)
* New translations simple_form.en.yml (Finnish)
* New translations simple_form.en.yml (Hebrew)
* New translations simple_form.en.yml (Hungarian)
* New translations simple_form.en.yml (Galician)
* New translations en.json (Galician)
* New translations simple_form.en.yml (Polish)
* New translations en.json (French)
* New translations en.yml (French)
* New translations en.json (French)
* New translations en.yml (French)
* New translations simple_form.en.yml (French)
* New translations activerecord.en.yml (French)
* New translations devise.en.yml (French)
* New translations doorkeeper.en.yml (French)
* New translations en.json (Icelandic)
* New translations en.yml (French)
* New translations simple_form.en.yml (French)
* New translations en.json (French)
* New translations en.yml (French)
* New translations simple_form.en.yml (French)
* New translations doorkeeper.en.yml (French)
* New translations en.json (French)
* New translations simple_form.en.yml (French)
* New translations simple_form.en.yml (Danish)
* New translations en.json (Danish)
* New translations en.yml (English, United Kingdom)
* New translations en.yml (Asturian)
* New translations en.json (Korean)
* New translations en.yml (Korean)
* New translations simple_form.en.yml (Estonian)
* New translations en.json (Estonian)
* New translations simple_form.en.yml (Estonian)
* New translations simple_form.en.yml (Frisian)
* New translations en.json (Frisian)
* Normalize
---------
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-02-07 02:41:31 +09:00
cadars
e8cb3ee827
Add scrolling to Compare history modal ( #23396 )
...
* Compare history modal: allow vertical scrolling
* Update app/javascript/styles/mastodon/components.scss
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
---------
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-02-06 16:53:31 +01:00
Christian Schmidt
c1f32c9c14
Show spinner while loading follow requests ( #23386 )
2023-02-06 16:50:08 +01:00
Claire
fa433ac5a6
Further JS code style changes
2023-02-04 22:31:47 +01:00
Christian Schmidt
67744ee779
Spell check input fields ( #23395 )
2023-02-04 16:34:21 +01:00
Eugen Rochko
8651ef751e
New Crowdin updates ( #23356 )
...
* New translations en.json (Korean)
* New translations simple_form.en.yml (Japanese)
* New translations en.yml (Korean)
* New translations simple_form.en.yml (Japanese)
* New translations simple_form.en.yml (Finnish)
* New translations en.yml (English, United Kingdom)
* New translations en.yml (Korean)
* New translations en.yml (Esperanto)
* New translations en.json (French)
* New translations en.json (French)
* New translations en.yml (French)
* New translations en.yml (English, United Kingdom)
* New translations en.yml (Esperanto)
* 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.json (Korean)
* New translations en.json (French)
* New translations en.json (French)
* New translations simple_form.en.yml (French)
* New translations en.json (French)
* New translations en.yml (Danish)
* New translations en.yml (Slovak)
* New translations en.yml (Japanese)
* New translations simple_form.en.yml (Catalan)
* New translations simple_form.en.yml (English, United Kingdom)
* New translations simple_form.en.yml (Bulgarian)
* New translations simple_form.en.yml (Danish)
* New translations simple_form.en.yml (Chinese Traditional)
* New translations simple_form.en.yml (Icelandic)
* New translations simple_form.en.yml (Portuguese, Brazilian)
* New translations simple_form.en.yml (Welsh)
* New translations simple_form.en.yml (Basque)
* New translations simple_form.en.yml (Slovak)
* New translations simple_form.en.yml (Spanish)
* New translations simple_form.en.yml (Korean)
* New translations simple_form.en.yml (Dutch)
* New translations simple_form.en.yml (Romanian)
* New translations simple_form.en.yml (Afrikaans)
* New translations simple_form.en.yml (Arabic)
* New translations simple_form.en.yml (Belarusian)
* New translations simple_form.en.yml (Czech)
* New translations simple_form.en.yml (German)
* New translations simple_form.en.yml (Greek)
* New translations simple_form.en.yml (Frisian)
* New translations simple_form.en.yml (Irish)
* New translations simple_form.en.yml (Hebrew)
* New translations simple_form.en.yml (Hungarian)
* New translations simple_form.en.yml (Armenian)
* New translations simple_form.en.yml (Italian)
* New translations en.json (Japanese)
* New translations simple_form.en.yml (Georgian)
* New translations simple_form.en.yml (Norwegian)
* New translations simple_form.en.yml (Polish)
* New translations simple_form.en.yml (Portuguese)
* New translations simple_form.en.yml (Russian)
* New translations simple_form.en.yml (Slovenian)
* New translations simple_form.en.yml (Albanian)
* New translations simple_form.en.yml (Serbian (Cyrillic))
* New translations simple_form.en.yml (Swedish)
* New translations simple_form.en.yml (Turkish)
* New translations simple_form.en.yml (Ukrainian)
* New translations simple_form.en.yml (Chinese Simplified)
* New translations simple_form.en.yml (Vietnamese)
* New translations simple_form.en.yml (Galician)
* New translations simple_form.en.yml (Indonesian)
* New translations simple_form.en.yml (Persian)
* New translations simple_form.en.yml (Tamil)
* New translations simple_form.en.yml (Spanish, Argentina)
* New translations simple_form.en.yml (Spanish, Mexico)
* New translations simple_form.en.yml (Bengali)
* New translations simple_form.en.yml (Thai)
* New translations simple_form.en.yml (Croatian)
* New translations simple_form.en.yml (Norwegian Nynorsk)
* New translations simple_form.en.yml (Kazakh)
* New translations simple_form.en.yml (Estonian)
* New translations simple_form.en.yml (Latvian)
* New translations simple_form.en.yml (Malay)
* New translations simple_form.en.yml (Faroese)
* New translations simple_form.en.yml (Chinese Traditional, Hong Kong)
* New translations simple_form.en.yml (Tatar)
* New translations simple_form.en.yml (Malayalam)
* New translations simple_form.en.yml (Breton)
* New translations simple_form.en.yml (French, Quebec)
* New translations simple_form.en.yml (Sinhala)
* New translations simple_form.en.yml (Scottish Gaelic)
* New translations simple_form.en.yml (Asturian)
* New translations simple_form.en.yml (Aragonese)
* New translations simple_form.en.yml (Occitan)
* New translations simple_form.en.yml (Serbian (Latin))
* New translations simple_form.en.yml (Kurmanji (Kurdish))
* New translations simple_form.en.yml (Sorani (Kurdish))
* New translations simple_form.en.yml (Scots)
* New translations simple_form.en.yml (Corsican)
* New translations simple_form.en.yml (Sardinian)
* New translations simple_form.en.yml (Kabyle)
* New translations simple_form.en.yml (Ido)
* New translations simple_form.en.yml (Standard Moroccan Tamazight)
* New translations simple_form.en.yml (Japanese)
* New translations simple_form.en.yml (Chinese Traditional)
* New translations simple_form.en.yml (Korean)
* New translations en.json (Korean)
* New translations en.yml (Korean)
* New translations simple_form.en.yml (Korean)
* New translations simple_form.en.yml (Hebrew)
* New translations simple_form.en.yml (Ukrainian)
* New translations simple_form.en.yml (Chinese Simplified)
* New translations simple_form.en.yml (Spanish, Mexico)
* Normalize
---------
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-02-04 15:46:08 +09:00
Eugen Rochko
8f590b0a21
Add setting for status page URL ( #23390 )
2023-02-04 04:56:06 +01:00
Claire
3c451cf88f
[Glitch] Fix useless regular-expression character escape detected by CodeQL
2023-02-03 21:14:41 +01:00
Akira Ouchi
8ce02aa6e8
[Glitch] autofocus the compose form again on /share
...
Port e73b55184b
2023-02-03 20:58:15 +01:00
Nick Schonning
372fa3fe36
[Glitch] Update hasOwnProperty calls for ESLint
...
Port 131e6403cc
2023-02-03 20:57:47 +01:00
Claire
155424e52f
[Glitch] Run eslint --fix
...
I don't like it changing files this way, but it's basically what
c49213f0ea
2023-02-03 20:52:07 +01:00
Nick Schonning
ed7cb79723
[Glitch] Remove extra semicolons with ESLint autofix
...
Port d9088ef327
2023-02-03 19:58:44 +01:00
TAKAHASHI Shuuji
1d5395498d
[Glitch] chore: remove intersection-observer for old Safari support
...
Port 9cdd643564
2023-02-03 19:24:32 +01:00
Christian Schmidt
fb9c786baf
[Glitch] Add lang attribute to image description textarea and poll option field
...
Port 2a4f2216d6
2023-02-03 19:23:36 +01:00
Claire
aeacebb3d7
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-image.yml`:
Upstream updated `docker/build-push-action`, and we a different config
for `docker/metadata-action` so the lines directly above were different,
but it's not a real conflict.
Upgraded `docker/build-push-action` as upstream did.
- `app/javascript/mastodon/features/compose/components/compose_form.js`:
Upstream changed the codestyle near a line we had modified to accommodate
configurable character count.
Kept our change.
2023-02-03 19:23:27 +01:00
Eugen Rochko
f98e4c662e
Change link previews for statuses to never use avatar as fallback ( #23376 )
2023-02-03 10:16:47 +01:00
Elizabeth Martín Campos
7e04b15ad8
fix(web-push-notifications): fix favourite push notifications ( #23286 )
...
Fix a bug where clicking in a favourite push notification would result in a 404 (not found) error, since we were redirecting the user to the wrong URL (we were redirecting to /@<user who favourited>/<favourited status id>, when it should be /@<favourited status author>/<favourited status id>)
2023-02-03 09:29:32 +01:00
Claire
20a479ff7c
Change POST /settings/applications/:id to regenerate token on scopes change ( #23359 )
...
Fixes #23096
2023-02-02 12:03:49 +01:00
Nick Schonning
6a5e447753
Address check-i18n warnings ( #23313 )
...
* Address check-i18n warnings
* Add language names to language helpers
2023-02-02 10:14:19 +09:00
Eugen Rochko
b8c31f8110
New Crowdin updates ( #23221 )
...
* New translations en.yml (Serbian (Cyrillic))
* New translations en.yml (Swedish)
* New translations en.yml (Turkish)
* New translations en.yml (Ukrainian)
* New translations en.yml (Urdu (Pakistan))
* New translations en.yml (Icelandic)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.yml (Indonesian)
* New translations en.yml (Persian)
* New translations en.yml (Tamil)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Spanish, Mexico)
* New translations en.yml (Bengali)
* New translations en.yml (Marathi)
* New translations en.yml (Thai)
* New translations en.yml (Croatian)
* New translations en.yml (Kazakh)
* New translations en.yml (Latvian)
* New translations en.yml (Hindi)
* New translations en.yml (Malay)
* New translations en.yml (Telugu)
* New translations en.yml (Burmese)
* New translations en.yml (Welsh)
* New translations en.yml (Faroese)
* New translations en.yml (Uyghur)
* New translations en.yml (Chinese Traditional, Hong Kong)
* New translations en.yml (Tatar)
* New translations en.yml (Malayalam)
* New translations en.yml (Breton)
* New translations en.yml (Latin)
* New translations en.yml (Bosnian)
* New translations en.yml (French, Quebec)
* New translations en.yml (Sinhala)
* New translations en.yml (Cornish)
* New translations en.yml (Kannada)
* New translations en.yml (Scottish Gaelic)
* New translations en.yml (Asturian)
* New translations en.yml (Aragonese)
* New translations en.yml (Serbian (Latin))
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Sorani (Kurdish))
* New translations en.yml (Scots)
* New translations en.yml (Igbo)
* New translations en.yml (Corsican)
* New translations en.yml (Sardinian)
* New translations en.yml (Sanskrit)
* New translations en.yml (Kabyle)
* New translations en.yml (Taigi)
* New translations en.yml (Silesian)
* New translations en.yml (Standard Moroccan Tamazight)
* New translations en.json (Finnish)
* New translations en.json (Albanian)
* New translations en.yml (Catalan)
* New translations en.yml (German)
* New translations en.yml (Finnish)
* New translations en.yml (Hebrew)
* New translations en.yml (Japanese)
* New translations en.yml (Estonian)
* New translations en.yml (Portuguese)
* New translations doorkeeper.en.yml (Icelandic)
* New translations en.yml (Spanish)
* New translations en.yml (Albanian)
* New translations en.yml (Icelandic)
* New translations simple_form.en.yml (Icelandic)
* New translations en.yml (Faroese)
* New translations activerecord.en.yml (Icelandic)
* New translations devise.en.yml (Icelandic)
* New translations en.json (Finnish)
* New translations en.yml (Catalan)
* New translations en.yml (German)
* New translations en.yml (Finnish)
* New translations en.yml (Japanese)
* New translations en.yml (Ukrainian)
* New translations en.yml (Spanish, Mexico)
* New translations en.json (Catalan)
* New translations en.yml (Catalan)
* New translations simple_form.en.yml (Catalan)
* New translations en.yml (Slovenian)
* New translations en.yml (Slovenian)
* New translations en.yml (Korean)
* New translations en.yml (Danish)
* New translations en.yml (Korean)
* New translations en.yml (Latvian)
* New translations en.json (Chinese Traditional)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Danish)
* New translations simple_form.en.yml (Chinese Traditional)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Galician)
* New translations en.json (Finnish)
* New translations en.yml (Finnish)
* New translations simple_form.en.yml (Finnish)
* New translations en.yml (Galician)
* New translations en.yml (German)
* New translations en.yml (Faroese)
* New translations en.json (Welsh)
* New translations doorkeeper.en.yml (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 en.json (Italian)
* New translations en.yml (German)
* New translations en.yml (Italian)
* New translations en.yml (Finnish)
* New translations en.yml (Hebrew)
* New translations en.yml (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations en.yml (Frisian)
* New translations en.yml (Finnish)
* New translations en.yml (Slovak)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Italian)
* New translations en.yml (Finnish)
* New translations en.yml (Turkish)
* New translations en.yml (Estonian)
* New translations en.yml (German)
* New translations en.yml (Estonian)
* New translations en.yml (Turkish)
* New translations en.yml (Thai)
* New translations en.json (Czech)
* New translations en.json (Armenian)
* New translations en.json (Thai)
* New translations doorkeeper.en.yml (Armenian)
* New translations en.yml (Basque)
* New translations en.yml (Armenian)
* New translations en.yml (Thai)
* New translations en.yml (Basque)
* New translations en.yml (Belarusian)
* New translations en.yml (Hungarian)
* New translations en.json (Kazakh)
* New translations en.yml (Slovenian)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.json (Uzbek)
* New translations en.yml (Uzbek)
* New translations simple_form.en.yml (Uzbek)
* New translations activerecord.en.yml (Uzbek)
* New translations devise.en.yml (Uzbek)
* New translations doorkeeper.en.yml (Uzbek)
* New translations en.json (Kashubian)
* New translations en.yml (Kashubian)
* New translations simple_form.en.yml (Kashubian)
* New translations activerecord.en.yml (Kashubian)
* New translations devise.en.yml (Kashubian)
* New translations doorkeeper.en.yml (Kashubian)
* New translations en.json (Uzbek)
* New translations en.json (Uzbek)
* New translations en.yml (Polish)
* New translations en.json (Uzbek)
* New translations activerecord.en.yml (Uzbek)
* New translations en.json (Catalan)
* New translations en.json (Uzbek)
* New translations en.yml (Uzbek)
* New translations en.json (Catalan)
* New translations activerecord.en.yml (Catalan)
* New translations en.json (Uzbek)
* New translations devise.en.yml (Uzbek)
* New translations en.json (Indonesian)
* New translations en.yml (Indonesian)
* New translations en.yml (Hungarian)
* New translations en.yml (Hungarian)
* New translations en.yml (Hungarian)
* New translations en.json (English, United Kingdom)
* New translations simple_form.en.yml (English, United Kingdom)
* New translations en.yml (Czech)
* New translations en.yml (Slovak)
* New translations en.json (Arabic)
* New translations en.yml (Arabic)
* New translations en.json (Arabic)
* New translations en.yml (Arabic)
* New translations en.yml (Frisian)
* New translations en.yml (Frisian)
* New translations en.yml (Slovenian)
* New translations en.yml (Polish)
* New translations en.yml (Polish)
* New translations en.json (English, United Kingdom)
* New translations en.json (Vietnamese)
* New translations en.yml (French)
* New translations en.yml (Italian)
* New translations en.yml (French)
* New translations en.json (Catalan)
* New translations en.json (Belarusian)
* New translations en.yml (Dutch)
* New translations en.yml (Belarusian)
* New translations simple_form.en.yml (Basque)
* New translations doorkeeper.en.yml (Basque)
* New translations en.yml (Basque)
* New translations en.yml (Slovak)
* New translations simple_form.en.yml (Slovak)
* New translations en.yml (Vietnamese)
* New translations en.yml (Vietnamese)
* New translations en.yml (Korean)
* New translations en.yml (Korean)
* New translations devise.en.yml (Korean)
* New translations devise.en.yml (Korean)
* New translations activerecord.en.yml (Korean)
* New translations en.yml (Danish)
* New translations simple_form.en.yml (Danish)
* New translations en.yml (Korean)
* New translations en.yml (Galician)
* New translations simple_form.en.yml (Japanese)
* New translations en.yml (Spanish)
* New translations en.yml (Basque)
* New translations simple_form.en.yml (Japanese)
* New translations en.yml (Swedish)
* New translations simple_form.en.yml (Basque)
* New translations simple_form.en.yml (Spanish)
* New translations doorkeeper.en.yml (Spanish)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.yml (Slovak)
* New translations en.json (Korean)
* New translations en.json (Indonesian)
* New translations en.yml (Korean)
* New translations en.yml (Korean)
* New translations simple_form.en.yml (Korean)
* New translations en.json (Korean)
* New translations en.yml (Danish)
* New translations en.yml (German)
* New translations en.yml (Korean)
* New translations en.json (English, United Kingdom)
* New translations simple_form.en.yml (English, United Kingdom)
* New translations en.json (Dutch)
* New translations en.json (Dutch)
* New translations en.json (Uzbek)
* New translations en.yml (Dutch)
* New translations simple_form.en.yml (Dutch)
* New translations devise.en.yml (Dutch)
* New translations en.json (Dutch)
* New translations en.yml (Dutch)
* New translations simple_form.en.yml (Dutch)
* New translations doorkeeper.en.yml (Russian)
* New translations simple_form.en.yml (Dutch)
* New translations simple_form.en.yml (Japanese)
* New translations en.yml (English, United Kingdom)
* New translations en.json (Korean)
* New translations simple_form.en.yml (Japanese)
* New translations en.json (Bulgarian)
* New translations en.json (Korean)
* New translations en.yml (Belarusian)
* New translations simple_form.en.yml (Japanese)
* New translations en.yml (Korean)
* New translations devise.en.yml (Korean)
* New translations simple_form.en.yml (Korean)
* New translations en.json (Bulgarian)
* New translations en.yml (Korean)
* New translations devise.en.yml (Korean)
* New translations simple_form.en.yml (Korean)
* New translations doorkeeper.en.yml (Korean)
* Normalize
---------
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-02-01 19:59:31 +09:00
Eugen Rochko
4c919812b9
Change number of stored items in home feed from 400 to 800 ( #23349 )
2023-02-01 11:24:22 +01:00
Eugen Rochko
21780c0204
Change notifications per page from 15 to 40 in REST API ( #23348 )
2023-02-01 11:23:54 +01:00
Akira Ouchi
e73b55184b
autofocus the compose form again on /share ( #23094 )
2023-01-30 14:49:10 +01:00
Nick Schonning
131e6403cc
Update hasOwnProperty calls for ESLint ( #23307 )
2023-01-30 03:07:51 +01:00
Nick Schonning
e6192eab9b
Remove unused ESLint disable directives ( #22427 )
2023-01-30 02:11:50 +01:00
Nick Schonning
c49213f0ea
Upgrade ESlint to v8 ( #23305 )
2023-01-30 01:45:35 +01:00
Nick Schonning
d9088ef327
Separate ESLint CI from Superlinter ( #23029 )
...
* Separate ESLint CI from Superlinter
* Correct JS indenting level
* Remove extra semicolons with ESLint autofix
2023-01-29 23:44:03 +01:00
TAKAHASHI Shuuji
9cdd643564
chore: remove intersection-observer for old Safari support ( #23284 )
2023-01-29 19:02:04 +01:00
Christian Schmidt
2a4f2216d6
Add lang attribute to image description textarea and poll option field ( #23293 )
2023-01-29 19:00:19 +01:00
Eugen Rochko
d3f3810fe1
Fix unserialized role on account entities in admin API ( #23290 )
2023-01-29 15:59:58 +01:00
Claire
ec26f7c1b1
New translations en.json (German) ( #2097 )
...
[ci skip]
2023-01-28 10:20:55 +01:00
Jeremy Kescher
27fdb81b65
Merge remote-tracking branch 'upstream/main' into develop
2023-01-27 00:36:49 +01:00
Claire
d9a078e6d3
Add role badges to WebUI ( #2096 )
...
* [Glitch] Add role badges to WebUI
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
* [Glitch] Ensure role name remains readable
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-01-26 23:35:23 +01:00
Claire
cfa92c4ec0
Merge pull request #2095 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2023-01-26 20:16:31 +01:00
neatchee
20abef6590
Allow users to set the trigger height for lengthy toot auto-collapse ( #2070 )
...
* Allow users to set the trigger height for lengthy toot autocollapse
Add a field in the glitch-soc preferences to set the exact height in pixels of a "lengthy toot" where auto-collapse is triggered
Originally authored by Dean Bassett (github.com/deanveloper)
Squashed 3 commits from neatchee/mastodon and returned some values to project defaults:
* ef665c1df5821e684c8da3392049f33243fafa74
* 0fce108d210efe55027a3af061bfc57aaaa83843
* 998f701a2b2e37edbda7dffb11a61f67f5559b18
* Remove bad escape characters
* Apply feedback from glitch-soc code review
- move input width specification to CSS
- adjust language for clarity
* Update comments re: lengthy toot height
* Fix inconsistent indentation
* Use a calculated width that scales better with browser font instead of static 45px width
2023-01-26 19:36:44 +01:00
Claire
fad6633156
Merge branch 'main' into glitch-soc/merge-upstream
2023-01-26 19:31:39 +01:00
Jeremy Kescher
855b0d4dbb
Merge remote-tracking branch 'upstream/main' into develop
...
# Conflicts:
# .github/workflows/build-image.yml
# lib/mastodon/version.rb
2023-01-26 17:27:01 +01:00
Claire
13a2abacc8
Add roles attribute to Account entities in REST API ( #23255 )
2023-01-25 19:55:40 +01:00
Claire
2093436349
[Glitch] Fix styling of featured tags in light theme
...
Port e5ae75bf6a
2023-01-25 17:27:23 +01:00
Claire
0f4637981b
Merge branch 'main' into glitch-soc/merge-upstream
2023-01-25 17:26:38 +01:00
Claire
e5ae75bf6a
Fix styling of featured tags in light theme ( #23252 )
...
* Fix styling of featured tags in light theme
Fixes #23251
* Remove broken highlighting on /settings/featured_tags
2023-01-25 16:28:29 +01:00
Claire
ffea668076
[Glitch] Fix missing filtering on some notification types
...
Port 98779535fe
2023-01-24 20:43:19 +01:00
Claire
853d0f28c5
[Glitch] Add lang attribute to compose textarea and CW field
...
Port 83a8efa9ca
2023-01-24 20:40:48 +01:00
Mina Her
78b822c61d
[Glitch] Make <Audio> to handle volume change
...
Port 3cf60ba267
2023-01-24 20:37:37 +01:00
Claire
cf3ad10e75
[Glitch] Fix upload area display in single-column mode
...
Port 54e798a5a0
2023-01-24 20:36:59 +01:00
Claire
3074338d79
Merge branch 'main' into glitch-soc/merge-upstream
2023-01-24 20:32:31 +01:00
Claire
a5a00d7f7a
Fix email with empty domain name labels passing validation ( #23246 )
...
* Fix email with empty domain name labels passing validation
`EmailMxValidator` would allow empty labels because `Resolv::DNS` is
particularly lenient about them, but the email would be invalid and
unusable.
* Add tests
2023-01-24 20:18:41 +01:00
Claire
dd58db64d8
Change email address input to be disabled for logged-in users when requesting a new confirmation e-mail ( #23247 )
...
Fixes #23093
2023-01-24 20:18:25 +01:00
Claire
6883fddb19
Fix account activation being triggered before email confirmation ( #23245 )
...
* Add tests
* Fix account activation being triggered before email confirmation
Fixes #23098
2023-01-24 19:40:21 +01:00
Claire
4725191d3c
Fix moderation audit log items for warnings having incorrect links ( #23242 )
2023-01-24 18:50:13 +01:00
Claire
83a8efa9ca
Add lang attribute to compose textarea and CW field ( #23240 )
...
Fixes #19858
2023-01-24 18:49:21 +01:00
Mina Her
3cf60ba267
Make <Audio> to handle volume change ( #23187 )
2023-01-24 16:24:46 +01:00
Claire
54e798a5a0
Fix upload area display in single-column mode ( #23217 )
2023-01-23 17:42:58 +01:00
Eugen Rochko
958955cda4
New Crowdin updates ( #23150 )
...
* New translations en.json (Romanian)
* New translations en.json (French)
* New translations en.json (Spanish)
* New translations en.json (Afrikaans)
* New translations en.json (Arabic)
* New translations en.json (Belarusian)
* New translations en.json (Bulgarian)
* New translations en.json (Catalan)
* New translations en.json (Czech)
* New translations en.json (Danish)
* New translations en.json (German)
* New translations en.json (Greek)
* New translations en.json (Frisian)
* New translations en.json (Basque)
* New translations en.json (Finnish)
* New translations en.json (Irish)
* New translations en.json (Hebrew)
* New translations en.json (Hungarian)
* New translations en.json (Armenian)
* New translations en.json (Italian)
* New translations en.json (Japanese)
* New translations en.json (Georgian)
* New translations en.json (Korean)
* New translations en.json (Lithuanian)
* New translations en.json (Macedonian)
* New translations en.json (Dutch)
* New translations en.json (Norwegian)
* New translations en.json (Punjabi)
* New translations en.json (Polish)
* New translations en.json (Portuguese)
* New translations en.json (Russian)
* New translations en.json (Slovak)
* New translations en.json (Slovenian)
* New translations en.json (Albanian)
* New translations en.json (Serbian (Cyrillic))
* New translations en.json (Swedish)
* New translations en.json (Turkish)
* New translations en.json (Ukrainian)
* New translations en.json (Chinese Simplified)
* New translations en.json (Chinese Traditional)
* New translations en.json (Urdu (Pakistan))
* New translations en.json (Vietnamese)
* New translations en.json (Galician)
* New translations en.json (Icelandic)
* New translations en.json (Portuguese, Brazilian)
* New translations en.json (Indonesian)
* New translations en.json (Persian)
* New translations en.json (Tamil)
* New translations en.json (Spanish, Argentina)
* New translations en.json (Spanish, Mexico)
* New translations en.json (Bengali)
* New translations en.json (Marathi)
* New translations en.json (Thai)
* New translations en.json (Croatian)
* New translations en.json (Norwegian Nynorsk)
* New translations en.json (Kazakh)
* New translations en.json (Estonian)
* New translations en.json (Latvian)
* New translations en.json (Hindi)
* New translations en.json (Malay)
* New translations en.json (Telugu)
* New translations en.json (English, United Kingdom)
* New translations en.json (Burmese)
* New translations en.json (Welsh)
* New translations en.json (Faroese)
* New translations en.json (Esperanto)
* New translations en.json (Uyghur)
* New translations en.json (Chinese Traditional, Hong Kong)
* New translations en.json (Tatar)
* New translations en.json (Malayalam)
* New translations en.json (Breton)
* New translations en.json (Latin)
* New translations en.json (Bosnian)
* New translations en.json (French, Quebec)
* New translations en.json (Sinhala)
* New translations en.json (Cornish)
* New translations en.json (Kannada)
* New translations en.json (Scottish Gaelic)
* New translations en.json (Asturian)
* New translations en.json (Aragonese)
* New translations en.json (Occitan)
* New translations en.json (Serbian (Latin))
* New translations en.json (Kurmanji (Kurdish))
* New translations en.json (Sorani (Kurdish))
* New translations en.json (Scots)
* New translations en.json (Igbo)
* New translations en.json (Corsican)
* New translations en.json (Sardinian)
* New translations en.json (Sanskrit)
* New translations en.json (Kabyle)
* New translations en.json (Ido)
* New translations en.json (Taigi)
* New translations en.json (Silesian)
* New translations en.json (Standard Moroccan Tamazight)
* New translations doorkeeper.en.yml (Welsh)
* New translations en.yml (Portuguese, Brazilian)
* 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 en.json (Spanish)
* New translations en.json (German)
* New translations en.json (Frisian)
* New translations en.json (Hebrew)
* New translations en.json (Italian)
* New translations en.json (Polish)
* New translations en.json (Slovak)
* New translations en.json (Swedish)
* New translations en.json (Turkish)
* New translations en.json (Ukrainian)
* New translations en.json (Spanish, Mexico)
* New translations en.json (Faroese)
* New translations en.yml (Polish)
* New translations simple_form.en.yml (Frisian)
* New translations simple_form.en.yml (Spanish, Mexico)
* New translations en.json (Slovenian)
* New translations en.yml (Slovak)
* New translations en.yml (Slovenian)
* New translations en.json (Danish)
* New translations en.json (Chinese Traditional)
* New translations en.json (Serbian (Cyrillic))
* New translations en.json (Korean)
* New translations en.json (Japanese)
* New translations en.json (Korean)
* New translations en.yml (Japanese)
* New translations doorkeeper.en.yml (Japanese)
* New translations simple_form.en.yml (Japanese)
* New translations en.json (Hindi)
* New translations en.json (Galician)
* New translations simple_form.en.yml (Galician)
* New translations en.yml (Galician)
* New translations doorkeeper.en.yml (Galician)
* New translations en.json (Vietnamese)
* New translations en.yml (Vietnamese)
* New translations simple_form.en.yml (Vietnamese)
* New translations en.json (Estonian)
* New translations en.json (Hebrew)
* New translations doorkeeper.en.yml (Belarusian)
* New translations en.json (English, United Kingdom)
* New translations simple_form.en.yml (English, United Kingdom)
* New translations en.json (Portuguese)
* New translations en.yml (Slovak)
* New translations en.json (Hungarian)
* New translations en.json (Korean)
* New translations en.yml (Korean)
* New translations en.json (French)
* New translations en.json (Slovak)
* New translations en.yml (French)
* New translations simple_form.en.yml (French)
* New translations doorkeeper.en.yml (French)
* New translations en.json (Slovak)
* New translations en.yml (Esperanto)
* New translations en.yml (French)
* New translations simple_form.en.yml (French)
* New translations doorkeeper.en.yml (French)
* New translations en.json (Norwegian)
* New translations en.json (Thai)
* New translations en.json (Basque)
* New translations en.json (Tatar)
* New translations en.json (Estonian)
* New translations en.json (Finnish)
* New translations en.json (Estonian)
* New translations en.yml (Finnish)
* New translations simple_form.en.yml (Finnish)
* New translations en.json (Basque)
* New translations en.json (Basque)
* New translations doorkeeper.en.yml (Japanese)
* New translations en.yml (Basque)
* New translations en.json (Arabic)
* New translations en.json (Slovak)
* New translations en.json (Kabyle)
* New translations doorkeeper.en.yml (Arabic)
* New translations en.yml (Arabic)
* New translations simple_form.en.yml (Arabic)
* New translations en.yml (Kabyle)
* New translations en.json (German)
* New translations en.json (Japanese)
* New translations en.json (German)
* New translations en.json (Tatar)
* New translations en.json (Occitan)
* New translations en.yml (Occitan)
* New translations doorkeeper.en.yml (Occitan)
* New translations simple_form.en.yml (Occitan)
* New translations en.json (Tatar)
* New translations en.json (Esperanto)
* New translations en.yml (Esperanto)
* New translations en.yml (Esperanto)
* New translations en.json (Esperanto)
* New translations en.json (Esperanto)
* New translations en.yml (Esperanto)
* New translations simple_form.en.yml (Esperanto)
* New translations en.json (Estonian)
* New translations doorkeeper.en.yml (Estonian)
* New translations en.json (Estonian)
* New translations en.json (Esperanto)
* New translations en.yml (Esperanto)
* New translations doorkeeper.en.yml (Esperanto)
* New translations en.json (Esperanto)
* New translations en.yml (Esperanto)
* New translations simple_form.en.yml (English, United Kingdom)
* New translations en.json (English, United Kingdom)
* New translations en.json (Portuguese, Brazilian)
* New translations en.json (Portuguese, Brazilian)
* New translations doorkeeper.en.yml (Portuguese, Brazilian)
* New translations en.yml (Portuguese, Brazilian)
* New translations simple_form.en.yml (Portuguese, Brazilian)
* New translations en.json (Serbian (Latin))
* New translations en.json (Croatian)
* New translations en.json (Portuguese)
* New translations en.json (Esperanto)
* New translations en.yml (Esperanto)
* New translations en.json (Bulgarian)
* New translations en.json (Esperanto)
* New translations en.yml (Bulgarian)
* New translations simple_form.en.yml (Bulgarian)
* New translations en.yml (Galician)
* New translations en.json (Bulgarian)
* New translations en.json (Bulgarian)
* New translations en.yml (Japanese)
* New translations en.json (Bulgarian)
* New translations en.yml (Japanese)
* New translations devise.en.yml (Bulgarian)
* New translations activerecord.en.yml (Bulgarian)
* New translations devise.en.yml (Bulgarian)
* New translations doorkeeper.en.yml (Bulgarian)
* Normalize
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-01-24 00:37:35 +09:00
Claire
98779535fe
Fix missing filtering on some notification types ( #23211 )
...
* Fix missing warning-type filtering on some notification types
* Fix missing hide-type filtering on some notification types
2023-01-23 13:21:50 +01:00
Markus Unterwaditzer
f2a6e71bb6
Suppress AddressFamilyError in link verification ( #23204 )
...
* Suppress AddressFamilyError
* clarify comment
2023-01-23 13:05:54 +01:00
Claire
448be26b34
Add missing policy attribute to WebPushSubscriptionSerializer ( #23210 )
...
* Add missing `policy` attribute to `WebPushSubscriptionSerializer`
Fixes #23145
* Add tests
2023-01-23 13:05:30 +01:00
Jeremy Kescher
bd30ddd982
Merge remote-tracking branch 'upstream/main' into develop
2023-01-22 11:33:25 +01:00
Claire
3c76f1f6c2
Merge branch 'main' into glitch-soc/merge-upstream
2023-01-21 19:42:58 +01:00
Claire
628dcbb732
Revert "Remove LDSignature on actor Delete activities ( #21466 )" ( #23185 )
...
This reverts commit f4f2b062ec
2023-01-21 15:33:21 +01:00
Eugen Rochko
a4090ab646
[Glitch] Fix wrong text color on some buttons in light theme in web UI
...
Port 13e9d91ba7
2023-01-21 15:08:51 +01:00
Eugen Rochko
0d20b38da7
[Glitch] Fix wrong padding in RTL layout in web UI
...
Port part of 4894deca7e
2023-01-21 15:07:52 +01:00
Claire
3fd3e88b25
Merge branch 'main' into glitch-soc/merge-upstream
2023-01-21 14:58:15 +01:00
Jeong Arm
a1abda39dd
Fix Account Strike causing PG not null validation error ( #23178 )
2023-01-21 10:22:22 +01:00
Vyr Cossont
c4a5e0ca0e
Advertise supported MIME types for statuses ( #2090 )
2023-01-20 13:57:32 +01:00
