Jeong Arm
8d55cb7d71
[Glitch] Fix trends layout
...
Port 6e0ab6814f
2021-08-09 23:40:31 +02:00
Claire
76c7226eb0
Fix account statuses cleanup settings controller for glitch-soc's theming system
2021-08-09 23:28:06 +02:00
Claire
8ec4be4233
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile.lock`:
Not a real conflict, upstream-updated dependency (redis) textually too
close to glitch-soc-only dependecy.
Updated redis gem like upstream did.
2021-08-09 23:25:49 +02:00
Claire
4ac78e2a06
Add feature to automatically delete old toots ( #16529 )
...
* Add account statuses cleanup policy model
* Record last inspected toot to delete to speed up successive calls to statuses_to_delete
* Add service to cleanup a given account's statuses within a budget
* Add worker to go through account policies and delete old toots
* Fix last inspected status id logic
All existing statuses older or equal to last inspected status id must be
kept by the current policy. This is an invariant that must be kept so that
resuming deletion from the last inspected status remains sound.
* Add tests
* Refactor scheduler and add tests
* Add user interface
* Add support for discriminating based on boosts/favs
* Add UI support for min_reblogs and min_favs, rework UI
* Address first round of review comments
* Replace Snowflake#id_at_start with with_random parameter
* Add tests
* Add tests for StatusesCleanupController
* Rework settings page
* Adjust load-avoiding mechanisms
* Please CodeClimate
2021-08-09 23:11:50 +02:00
Takeshi Umeda
709876bd6c
Fix invalid blurhash handling in Create activity ( #16583 )
2021-08-09 13:33:19 +02:00
Takeshi Umeda
590e1578bf
Fix when MoveWorker cannot get locale from remote account ( #16576 )
2021-08-08 15:31:02 +02:00
Claire
763ab0c7eb
Fix owned account notes not being deleted when an account is deleted ( #16579 )
...
* Add account_notes relationship
* Add tests
* Fix owned account notes not being deleted when an account is deleted
* Add post-migration to clean up orphaned account notes
2021-08-08 15:29:57 +02:00
Jeong Arm
a61645ed30
Add missing Korean translations
2021-08-06 20:06:05 +02:00
Jeong Arm
69b5139d2a
Add Korean translations
2021-08-06 20:06:05 +02:00
Takeshi Umeda
b2875b1864
Fix logout link not working in safari ( #16574 )
2021-08-06 12:14:13 +02:00
Jeong Arm
6e0ab6814f
Fix trends layout ( #16570 )
2021-08-05 13:05:32 +02:00
Claire
2f6ff14198
[Glitch] Fix crashes with Microsoft Translate on Microsoft Edge
...
Port e9659ae031
2021-07-25 13:04:59 +02:00
Claire
34a573ac27
[Glitch] Add confirmation modal when closing media edit modal with unsaved changes
...
Port a8a7066e97
2021-07-25 12:59:03 +02:00
Claire
08139d3cd7
[Glitch] Fix “open” link of media modal not closing modal
...
Port af08229ff4
2021-07-25 12:51:33 +02:00
Claire
b5e10d07ff
Merge branch 'main' into glitch-soc/merge-upstream
2021-07-25 12:48:48 +02:00
Claire
a8a7066e97
Add confirmation modal when closing media edit modal with unsaved changes ( #16518 )
...
* Add confirmation modal when closing media edit modal with unsaved changes
* Move focal point media state to redux so it does not get erased by confirmation dialog
* Change upload modal behavior to keep it open while saving changes
Instead of closing it immediately and losing changes if they fail to save…
* Make it work with react-intl 2.9
2021-07-25 01:14:43 +02:00
Claire
af08229ff4
Fix “open” link of media modal not closing modal ( #16524 )
2021-07-25 01:13:46 +02:00
Claire
1d67acb72f
Fix scoped order warning in RemoveStatusService ( #16531 )
...
Fixes “Scoped order is ignored, it's forced to be batch order.”
2021-07-24 14:41:46 +02:00
Claire
e9659ae031
Fix crashes with Microsoft Translate on Microsoft Edge ( #16525 )
...
Fixes #16509
Microsoft Edge with translation enabled rewrites the DOM in ways that confuse
react and prevent it from working properly. Wrapping the offending parts in
a span avoids this issue.
2021-07-23 02:53:17 +02:00
Claire
d8629e7b86
Add logging of S3-related errors ( #16381 )
2021-07-21 18:34:39 +02:00
Claire
d1c87be8cf
Merge branch 'main' into glitch-soc/merge-upstream
2021-07-17 17:45:35 +02:00
Claire
e54a65013d
Fix replying from modal ( #16516 )
...
Fixes #16515
Not using a router object somehow made `this.history` lag behind the real
browser history whenever pushing a new history item in `replyCompose`.
Not using the context-provided router in this case was an oversight made
when porting glitch-soc changes in #16499 .
2021-07-17 17:06:52 +02:00
Claire
211d5c3c30
Fix inefficiencies in auto-linking code ( #16506 )
...
The auto-linking code basically rewrote the whole string escaping non-ascii
characters in an inefficient way, and building a full character offset map
between the unescaped and escaped texts before sending the contents to
TwitterText's extractor.
Instead of doing that, this commit changes the TwitterText regexps to include
valid IRI characters in addition to valid URI characters.
2021-07-15 15:56:58 +02:00
Claire
3dcf3f2a3a
Fix minor code quality issues ( #16502 )
2021-07-14 05:36:23 +02:00
Claire
30ce6e395c
Fix user email address being banned on self-deletion ( #16503 )
...
* Add tests
* Fix user email address being banned on self-deletion
Fixes #16498
2021-07-14 05:35:49 +02:00
Claire
fc500a6062
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `CONTRIBUTING.md`:
Upstream file has changed and we're quoting it.
Ported the changes.
- `README.md`:
Upstream file has changed but we have a completely different one.
Kept our version.
- `lib/mastodon/version.rb`:
Upstream has changed from `tootsuite/mastodon` to `mastodon/mastodon`,
but we're still `glitch-soc/mastodon`.
Kept our version.
- `spec/presenters/instance_presenter_spec.rb`:
Upstream has changed from `tootsuite/mastodon` to `mastodon/mastodon`,
but we're still `glitch-soc/mastodon`.
Kept our version.
2021-07-13 17:57:15 +02:00
Claire
5a1e072517
Change references to tootsuite/mastodon to mastodon/mastodon ( #16491 )
...
* Change references to tootsuite/mastodon to mastodon/mastodon
* Remove obsolete test fixture
* Replace occurrences of tootsuite/mastodon with mastodon/mastodon in CHANGELOG
And a few other places
2021-07-13 15:46:20 +02:00
Claire
d3791cca0c
Improve modal flow and back button handling ( #16499 )
...
* Refactor shouldUpdateScroll passing
So far, shouldUpdateScroll has been manually passed down from the very top of
the React component hierarchy even though it is a static function common to
all ScrollContainer instances, so replaced that with a custom class extending
ScrollContainer.
* Generalize “press back to close modal” to any modal and to public pages
* Fix boost confirmation modal closing media modal
2021-07-13 15:45:17 +02:00
Claire
e4270cb55a
Please CodeClimate
2021-07-13 13:49:40 +02:00
Claire
19ea6618b1
Small scroll/history behavior fixup to take weird browser patterns into account
2021-07-13 13:21:00 +02:00
Claire
84fbe4d030
Refactor shouldUpdateScroll stuff
2021-07-13 12:51:06 +02:00
Claire
99f28c17de
Fix scroll handling with modals
2021-07-13 11:07:16 +02:00
Claire
6e3d5cbca2
Fix and simplify browser history handling in relation to modals
...
This simplifies the logic to:
- when the last modal gets closed and we're in our history buffer state, go back
- whenever a modal is open, ensure we're in a history buffer state by
potentially pushing one
2021-07-12 20:13:02 +02:00
Claire
c5b4e6b708
Add modal stack to allow better boost modal and media modal interaction.
2021-07-12 17:00:14 +02:00
Claire
ddf3f4cf85
Fix clicking on the pop-up player placeholder expanding the clicked toot
2021-07-12 16:24:53 +02:00
Claire
a85eb7d930
Fix follow suggestions scrolling on mobile view
...
Also simplify the CSS a bit and bring it closer to upstream.
2021-07-12 10:22:57 +02:00
Claire
cdf20f4367
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/serializers/rest/instance_serializer.rb`:
Upstream changed the fields returned by /api/v1/instance by adding a
`configuration` field holding a lot of useful information making our
`max_toot_chars` and `poll_limits` fields obsolete.
Keeping those around for now for compatibility.
- `app/validators/status_length_validator.rb`:
No real conflict, just URL_PLACEHOLDER_CHARS introduced too close to
MAX_CHARS which is defined differently in glitch-soc.
Ported upstream changes.
2021-07-11 21:41:23 +02:00
Eugen Rochko
7095c80373
Add ability to filter reports by origin of target account ( #16487 )
2021-07-11 11:01:38 +02:00
Eugen Rochko
275fa4746b
Add configuration attribute to GET /api/v1/instance ( #16485 )
...
List various values like file size limits and supported mime types
2021-07-10 17:58:41 +02:00
Claire
101f8616fe
[Glitch] Fix pop-in player display when poster has long username or handle
...
Port 1381e0e1d9
2021-07-08 16:23:09 +02:00
Claire
3160e050a9
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/accounts_helper.rb`:
Conflict due to upstream changing how followers count is displayed while we
have an option to hide followers count.
Ported upstream change.
- `app/views/accounts/_header.html.haml`:
Conflict due to upstream changing how followers count is displayed while we
have an option to hide followers count.
Ported upstream change.
- `app/views/directories/index.html.haml`:
Conflict due to upstream changing how followers count is displayed while we
have an option to hide followers count.
Ported upstream change.
2021-07-08 16:17:19 +02:00
Eugen Rochko
771c9d4ba8
Add ability to skip sign-in token authentication for specific users ( #16427 )
...
Remove "active within last two weeks" exception for sign in token requirement
Change admin reset password to lock access until the password is reset
2021-07-08 05:31:28 +02:00
Claire
8569126c2e
Fix upgrade path from 3.4.0 ( #16465 )
...
3.4.1 dropped account_stats.lock_version, but in a way breaking the usual
upgrade path by requiring services to be reloaded after the post-migrations.
Indeed, `self.locking_column = nil` was not enough for Rails to ignore the
`lock_version` column when preparing statements on application load, resulting
in some ActiveRecord queries (typically those involving
`includes(:account_stat)`) erroring out with:
ActiveRecord::StatementInvalid (PG::UndefinedColumn: ERROR: column account_stats.lock_version does not exist
2021-07-07 21:13:30 +02:00
Claire
e2844b7e58
Change number_to_human calls to always use 3-digits precision ( #16469 )
...
Fixes #16435
2021-07-07 21:13:08 +02:00
Claire
1381e0e1d9
Fix pop-in player display when poster has long username or handle ( #16468 )
2021-07-05 19:16:06 +02:00
Claire
49219508bc
Fix anonymous access to outbox not being cached by the reverse proxy ( #16458 )
...
* Fix anonymous access to outbox not being cached by the reverse proxy
Up until now, anonymous access to outbox was marked as public, but with a
0 duration for caching, which means remote proxies would only serve from cache
when the server was completely overwhelmed.
Changed that cache duration to one minute, so that repeated anonymous access
to one account's outbox can be appropriately cached.
Also added `Signature` to the `Vary` header in case a page is requested, so
that authenticated fetches are never served from cache (which only contains
public toots).
* Remove Vary: Accept header from webfinger controller
Indeed, we have stopped returning xrd, and only ever return jrd, so the
Accept request header does not matter anymore.
* Cache negative webfinger hits for 3 minutes
2021-07-03 21:13:47 +02:00
Claire
1e2097afd4
Merge branch 'main' into glitch-soc/merge-upstream
2021-07-02 16:12:11 +02:00
Eugen Rochko
38b3419950
Fix not being able to suspend accounts that already have a canonical e-mail block ( #16455 )
2021-07-02 12:03:15 +02:00
David Sterry
ba8f4535e3
[Glitch] Hide /about/more footer link in limited federation mode
...
Port 7c27ccb8d8
2021-06-30 00:45:00 +02:00
Claire
d1780fb9a4
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/ISSUE_TEMPLATE/bug_report.md`:
Removed upstream, while we had a checkbox telling people to check if the
issue was present upstream. Removed the file as well.
2021-06-30 00:42:52 +02:00
David Sterry
7c27ccb8d8
Fix #16407 ( #16432 )
2021-06-27 22:31:28 +02:00
Claire
a993ff6e2f
Merge branch 'main' into glitch-soc/merge-upstream
2021-06-25 10:44:06 +02:00
Claire
9e5a1daa9b
Fix styling of boost button in media modal not reflecting ability to boost ( #16387 )
2021-06-25 04:45:30 +02:00
Claire
e592e47e19
Fix WebUI crash when a toot with a playing video gets deleted ( #16384 )
...
* Fix WebUI crash when a toot with a playing video gets deleted
* Fix pop-up player not closing the moment a status is deleted
2021-06-25 04:45:17 +02:00
Claire
62bf929684
Merge pull request #1555 from ClearlyClaire/glitch-soc/fixes/video-player-crash
...
[Glitch] Fix WebUI crash when a toot with a playing video gets deleted
2021-06-24 16:00:26 +02:00
Claire
b6f952ec5b
[Glitch] Fix styling of boost button in media modal not reflecting ability to boost
...
Port tootsuite#16387 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-06-24 15:43:04 +02:00
Claire
f024f523b2
Fix pop-up player not closing the moment a status is deleted
...
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-06-24 15:19:18 +02:00
Claire
036ec18fb3
Fix WebUI crash when a toot with a playing video gets deleted
...
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-06-24 15:19:12 +02:00
Claire
86aca08ec6
Merge branch 'main' into glitch-soc/merge-upstream
2021-06-24 08:08:02 +02:00
Claire
1c21dcfa35
Fix newlines in accout notes added by the Move handler ( #16415 )
...
* Fix newlines in account notes added by the move handler
* Make MoveWorker more robust
2021-06-23 23:55:47 +02:00
Claire
262c7bcb57
Add full user agent in tooltips for login activities ( #16428 )
...
Also adds timestamp in HTML itself to not rely on javascript
2021-06-23 16:42:23 +02:00
Claire
979059fbc9
Fix login date not showing up in login history by using “public” pack
2021-06-23 12:21:40 +02:00
Eugen Rochko
d10d1e5eac
[Glitch] Add authentication history
...
Port SCSS changes from d174d12c83
2021-06-23 11:40:18 +02:00
Claire
37fd9670a5
Merge branch 'main' into glitch-soc/merge-upstream
2021-06-23 10:46:24 +02:00
Claire
63b807cffc
Fix serialization of followers/following counts when user hides their network ( #16418 )
...
* Add tests
* Fix serialization of followers/following counts when user hides their network
Fixes #16382
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-06-21 20:14:47 +02:00
Eugen Rochko
d174d12c83
Add authentication history ( #16408 )
2021-06-21 17:07:30 +02:00
Claire
6dd51448a6
[Glitch] Fix OCR failure when erroneous lang data is in cache
...
Port 8428faa085
2021-06-16 11:29:07 +02:00
Claire
4aa78027ea
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile.lock`: upstream-updated dependency (redis) textually too close to
glitch-specific one (redcarpet).
Ported upstream change.
2021-06-16 11:24:55 +02:00
Claire
8428faa085
Fix OCR failure when erroneous lang data is in cache ( #16386 )
...
Fixes #15472
If the Tesseract worker fails at any point, re-try with cache settings that
overwrite the cache. It is difficult to catch more precise errors as those
are pretty opaque and do not occur when loading lang data but when trying to
detect text.
2021-06-15 22:11:07 +02:00
Claire
1ac5427ddc
[Glitch] Update emoji codepoint mappings to v13.1
...
Port f6088922c0
2021-06-03 21:07:35 +02:00
Claire
fa383531a7
[Glitch] Fix deprecated slash as division in SASS files
...
Port be8079f637
2021-06-03 21:06:16 +02:00
Eugen Rochko
d2c9f39c0b
[Glitch] Add assets from Twemoji 13.1.0
...
Port abd7b4636a
2021-06-03 21:05:24 +02:00
Claire
0157caacef
Merge branch 'main' into glitch-soc/merge-upstream
2021-06-03 20:47:02 +02:00
Claire
f6088922c0
Update emoji codepoint mappings to v13.1 ( #16352 )
2021-06-03 16:08:07 +02:00
Eugen Rochko
2fba280353
New Crowdin updates ( #16288 )
...
* New translations en.yml (Galician)
[ci skip]
* New translations activerecord.en.yml (Galician)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations simple_form.en.yml (Chinese Traditional)
[ci skip]
* New translations en.yml (Swedish)
[ci skip]
* New translations en.yml (Swedish)
[ci skip]
* New translations en.yml (Swedish)
[ci skip]
* New translations en.yml (Swedish)
[ci skip]
* New translations en.yml (Swedish)
[ci skip]
* New translations en.yml (Swedish)
[ci skip]
* New translations en.yml (Swedish)
[ci skip]
* New translations devise.en.yml (Swedish)
[ci skip]
* New translations doorkeeper.en.yml (Swedish)
[ci skip]
* New translations en.json (Dutch)
[ci skip]
* New translations en.json (Dutch)
[ci skip]
* New translations en.yml (Dutch)
[ci skip]
* New translations simple_form.en.yml (Dutch)
[ci skip]
* New translations activerecord.en.yml (Dutch)
[ci skip]
* New translations doorkeeper.en.yml (Dutch)
[ci skip]
* New translations en.json (Swedish)
[ci skip]
* New translations en.yml (Swedish)
[ci skip]
* New translations en.yml (Swedish)
[ci skip]
* New translations en.json (Swedish)
[ci skip]
* New translations en.json (Swedish)
[ci skip]
* New translations en.json (Swedish)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations simple_form.en.yml (French)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Romanian)
[ci skip]
* New translations en.yml (Norwegian Nynorsk)
[ci skip]
* New translations en.yml (Welsh)
[ci skip]
* New translations en.yml (Telugu)
[ci skip]
* New translations en.yml (Malay)
[ci skip]
* New translations en.yml (Hindi)
[ci skip]
* New translations en.yml (Latvian)
[ci skip]
* New translations en.yml (Estonian)
[ci skip]
* New translations en.yml (Kazakh)
[ci skip]
* New translations en.yml (Croatian)
[ci skip]
* New translations en.yml (Uyghur)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.yml (Marathi)
[ci skip]
* New translations en.yml (Bengali)
[ci skip]
* New translations en.yml (Spanish, Mexico)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.yml (Tamil)
[ci skip]
* New translations en.yml (Persian)
[ci skip]
* New translations en.yml (Esperanto)
[ci skip]
* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Sorani (Kurdish))
[ci skip]
* New translations en.yml (Silesian)
[ci skip]
* New translations en.yml (Taigi)
[ci skip]
* New translations en.yml (Ido)
[ci skip]
* New translations en.yml (Kabyle)
[ci skip]
* New translations en.yml (Sanskrit)
[ci skip]
* New translations en.yml (Sardinian)
[ci skip]
* New translations en.yml (Corsican)
[ci skip]
* New translations en.yml (Serbian (Latin))
[ci skip]
* New translations en.yml (Tatar)
[ci skip]
* New translations en.yml (Occitan)
[ci skip]
* New translations en.yml (Asturian)
[ci skip]
* New translations en.yml (Scottish Gaelic)
[ci skip]
* New translations en.yml (Kannada)
[ci skip]
* New translations en.yml (Cornish)
[ci skip]
* New translations en.yml (Sinhala)
[ci skip]
* New translations en.yml (Breton)
[ci skip]
* New translations en.yml (Malayalam)
[ci skip]
* New translations en.yml (Indonesian)
[ci skip]
* New translations en.yml (Icelandic)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations en.yml (Italian)
[ci skip]
* New translations en.yml (Armenian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Hebrew)
[ci skip]
* New translations en.yml (Finnish)
[ci skip]
* New translations en.yml (Basque)
[ci skip]
* New translations en.yml (German)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations en.yml (Danish)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations en.yml (Bulgarian)
[ci skip]
* New translations en.yml (Arabic)
[ci skip]
* New translations en.yml (Afrikaans)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Georgian)
[ci skip]
* New translations en.yml (Lithuanian)
[ci skip]
* New translations en.yml (Galician)
[ci skip]
* New translations en.yml (Serbian (Cyrillic))
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Urdu (Pakistan))
[ci skip]
* New translations en.yml (Chinese Traditional)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.yml (Albanian)
[ci skip]
* New translations en.yml (Macedonian)
[ci skip]
* New translations en.yml (Slovenian)
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations en.yml (Punjabi)
[ci skip]
* New translations en.yml (Norwegian)
[ci skip]
* New translations en.yml (Standard Moroccan Tamazight)
[ci skip]
* Update source file en.yml
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Swedish)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.json (Lithuanian)
[ci skip]
* New translations en.json (Lithuanian)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.json (Korean)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations simple_form.en.yml (Chinese Simplified)
[ci skip]
* New translations devise.en.yml (Chinese Simplified)
[ci skip]
* New translations doorkeeper.en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations simple_form.en.yml (Chinese Simplified)
[ci skip]
* New translations en.json (Portuguese)
[ci skip]
* New translations en.json (Malayalam)
[ci skip]
* New translations en.json (Malayalam)
[ci skip]
* New translations en.json (Persian)
[ci skip]
* New translations en.yml (Persian)
[ci skip]
* New translations en.json (Chinese Traditional)
[ci skip]
* New translations en.yml (Chinese Traditional)
[ci skip]
* New translations en.json (Chinese Traditional)
[ci skip]
* New translations en.yml (Chinese Traditional)
[ci skip]
* New translations simple_form.en.yml (Chinese Traditional)
[ci skip]
* New translations activerecord.en.yml (Chinese Traditional)
[ci skip]
* New translations devise.en.yml (Chinese Traditional)
[ci skip]
* New translations en.yml (Chinese Traditional)
[ci skip]
* New translations simple_form.en.yml (Chinese Traditional)
[ci skip]
* New translations doorkeeper.en.yml (Chinese Traditional)
[ci skip]
* New translations devise.en.yml (Chinese Traditional)
[ci skip]
* New translations en.yml (Chinese Traditional)
[ci skip]
* New translations en.json (Croatian)
[ci skip]
* New translations en.json (Telugu)
[ci skip]
* New translations en.json (Malay)
[ci skip]
* New translations en.json (Hindi)
[ci skip]
* New translations en.json (Latvian)
[ci skip]
* New translations en.json (Estonian)
[ci skip]
* New translations en.json (Kazakh)
[ci skip]
* New translations en.json (Norwegian Nynorsk)
[ci skip]
* New translations en.json (Marathi)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Bengali)
[ci skip]
* New translations en.json (Tamil)
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Welsh)
[ci skip]
* New translations en.json (Uyghur)
[ci skip]
* New translations en.json (Urdu (Pakistan))
[ci skip]
* New translations en.json (Sorani (Kurdish))
[ci skip]
* New translations en.json (Silesian)
[ci skip]
* New translations en.json (Taigi)
[ci skip]
* New translations en.json (Ido)
[ci skip]
* New translations en.json (Kabyle)
[ci skip]
* New translations en.json (Sanskrit)
[ci skip]
* New translations en.json (Sardinian)
[ci skip]
* New translations en.json (Serbian (Latin))
[ci skip]
* New translations en.json (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.json (Occitan)
[ci skip]
* New translations en.json (Asturian)
[ci skip]
* New translations en.json (Kannada)
[ci skip]
* New translations en.json (Cornish)
[ci skip]
* New translations en.json (Sinhala)
[ci skip]
* New translations en.json (Breton)
[ci skip]
* New translations en.json (Tatar)
[ci skip]
* New translations en.json (Romanian)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations en.json (Persian)
[ci skip]
* New translations en.json (Arabic)
[ci skip]
* New translations en.json (Afrikaans)
[ci skip]
* New translations en.json (Bulgarian)
[ci skip]
* New translations en.json (Serbian (Cyrillic))
[ci skip]
* New translations en.json (Macedonian)
[ci skip]
* New translations en.json (Slovenian)
[ci skip]
* New translations en.json (Slovak)
[ci skip]
* New translations en.json (Punjabi)
[ci skip]
* New translations en.json (Norwegian)
[ci skip]
* New translations en.json (Georgian)
[ci skip]
* New translations en.json (Armenian)
[ci skip]
* New translations en.json (Hebrew)
[ci skip]
* New translations en.json (Finnish)
[ci skip]
* New translations en.json (Greek)
[ci skip]
* New translations en.json (Standard Moroccan Tamazight)
[ci skip]
* New translations simple_form.en.yml (Scottish Gaelic)
[ci skip]
* New translations en.yml (Scottish Gaelic)
[ci skip]
* New translations activerecord.en.yml (Scottish Gaelic)
[ci skip]
* New translations en.yml (Scottish Gaelic)
[ci skip]
* New translations simple_form.en.yml (Scottish Gaelic)
[ci skip]
* New translations doorkeeper.en.yml (Scottish Gaelic)
[ci skip]
* New translations en.json (Scottish Gaelic)
[ci skip]
* New translations devise.en.yml (Scottish Gaelic)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.json (Spanish, Argentina)
[ci skip]
* New translations simple_form.en.yml (Spanish, Argentina)
[ci skip]
* New translations activerecord.en.yml (Spanish, Argentina)
[ci skip]
* New translations doorkeeper.en.yml (Spanish, Argentina)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* i18n-tasks normalize
* yarn manage:translations
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2021-06-02 21:09:18 +02:00
Eugen Rochko
1410dffdf4
Fix e-mail confirmations API not working correctly ( #16348 )
...
* Fix e-mail confirmations API not working correctly
* Fix typo
2021-06-02 21:07:50 +02:00
Claire
526332c545
Fix account deletion sometimes failing because of optimistic locks ( #16317 )
...
* Fix account deletion sometimes failing because of optimistic locks
In some rare occasions[1], deleting accounts would fail with a
`StaleObjectError` exception.
Indeed, account deletion manually sets the `AccountStat` values without
handling cases where the optimistic locking on `AccountStat` would fail.
To my knowledge, with the rewrite of account counters in #15913 , the
`DeleteAccountService` is now the only place that changes the counters in
a way that is not atomic.
Since in this specific case, we do not care about the previous values of the
account counters, it appears we don't need locking at all for this table
anymore.
[1]: https://discourse.joinmastodon.org/t/account-cant-be-deleted/3602
* Bump MAX_SUPPORTED_VERSION in maintenance script
2021-06-02 17:41:25 +02:00
Claire
be8079f637
Fix deprecated slash as division in SASS files ( #16347 )
...
Fixes #16293
2021-06-01 23:47:27 +02:00
Eugen Rochko
abd7b4636a
Add assets from Twemoji 13.1.0 ( #16345 )
...
* Add assets from Twemoji 13.1.0
* Update emoji-mart
2021-06-01 14:35:49 +02:00
Claire
3b27b09acb
Fix some IDs in instance actor outbox ( #16343 )
2021-05-31 22:59:30 +02:00
Claire
fb8c5979b4
Merge branch 'main' into glitch-soc/merge-upstream
2021-05-31 11:53:57 +02:00
Jeong Arm
5ef216d032
Remove set-cookie header on custom.css ( #16314 )
...
* Remove set-cookie header on custom.css
* Additional fix for set-cookie
2021-05-30 17:57:47 +02:00
Claire
10a31a934f
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream's README got updated, but we have a completely different one.
Kept ours.
2021-05-27 17:58:44 +02:00
Claire
12f8f39e25
Fix media proxy RedisLocks auto-releasing too fast ( #16291 )
...
Follow-up to #16276
2021-05-22 15:00:33 +02:00
Zero King
8027d921ab
[Glitch] Remove duplicate CSS properties
...
Port 028ba13eb3
2021-05-22 13:22:26 +02:00
Claire
1a591ffc8b
[Glitch] Fix unread notification count when polling
...
Port 92f1d739b5
2021-05-22 13:20:07 +02:00
Zero King
bb0c9fcde7
[Glitch] Remove duplicate CSS property of margin
...
Port 689974b1ed
2021-05-22 13:18:32 +02:00
Claire
5f334807d2
Merge branch 'main' into glitch-soc/merge-upstream
2021-05-22 13:11:31 +02:00
Eugen Rochko
01adffdecb
New Crowdin updates ( #16281 )
...
* New translations en.json (Thai)
[ci skip]
* New translations devise.en.yml (Thai)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations devise.en.yml (Thai)
[ci skip]
* New translations en.yml (German)
[ci skip]
* New translations doorkeeper.en.yml (Danish)
[ci skip]
* New translations en.yml (Danish)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations en.yml (Icelandic)
[ci skip]
* Run `i18n-tasks normalize`
* Run `yarn manage:translations`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2021-05-22 00:31:33 +09:00
Eugen Rochko
7f0d58b478
New Crowdin updates ( #16269 )
...
* New translations en.yml (Kazakh)
[ci skip]
* New translations en.json (Kazakh)
[ci skip]
* New translations doorkeeper.en.yml (Norwegian Nynorsk)
[ci skip]
* New translations activerecord.en.yml (Norwegian Nynorsk)
[ci skip]
* New translations simple_form.en.yml (Norwegian Nynorsk)
[ci skip]
* New translations en.yml (Norwegian Nynorsk)
[ci skip]
* New translations en.json (Norwegian Nynorsk)
[ci skip]
* New translations doorkeeper.en.yml (Croatian)
[ci skip]
* New translations en.json (Malayalam)
[ci skip]
* New translations doorkeeper.en.yml (Scottish Gaelic)
[ci skip]
* New translations simple_form.en.yml (Malayalam)
[ci skip]
* New translations activerecord.en.yml (Sardinian)
[ci skip]
* New translations en.yml (Kabyle)
[ci skip]
* New translations en.json (Kabyle)
[ci skip]
* New translations en.yml (Sanskrit)
[ci skip]
* New translations en.json (Sanskrit)
[ci skip]
* New translations doorkeeper.en.yml (Sardinian)
[ci skip]
* New translations simple_form.en.yml (Sardinian)
[ci skip]
* New translations activerecord.en.yml (Kabyle)
[ci skip]
* New translations en.yml (Sardinian)
[ci skip]
* New translations en.json (Sardinian)
[ci skip]
* New translations doorkeeper.en.yml (Corsican)
[ci skip]
* New translations activerecord.en.yml (Corsican)
[ci skip]
* New translations simple_form.en.yml (Corsican)
[ci skip]
* New translations en.yml (Corsican)
[ci skip]
* New translations doorkeeper.en.yml (Sorani (Kurdish))
[ci skip]
* New translations simple_form.en.yml (Kabyle)
[ci skip]
* New translations doorkeeper.en.yml (Kabyle)
[ci skip]
* New translations simple_form.en.yml (Sorani (Kurdish))
[ci skip]
* New translations en.json (Silesian)
[ci skip]
* New translations activerecord.en.yml (Standard Moroccan Tamazight)
[ci skip]
* New translations simple_form.en.yml (Standard Moroccan Tamazight)
[ci skip]
* New translations en.yml (Standard Moroccan Tamazight)
[ci skip]
* New translations en.json (Standard Moroccan Tamazight)
[ci skip]
* New translations en.yml (Silesian)
[ci skip]
* New translations en.json (Ido)
[ci skip]
* New translations en.yml (Taigi)
[ci skip]
* New translations en.json (Taigi)
[ci skip]
* New translations doorkeeper.en.yml (Ido)
[ci skip]
* New translations simple_form.en.yml (Ido)
[ci skip]
* New translations en.yml (Ido)
[ci skip]
* New translations activerecord.en.yml (Sorani (Kurdish))
[ci skip]
* New translations en.yml (Sorani (Kurdish))
[ci skip]
* New translations activerecord.en.yml (Malayalam)
[ci skip]
* New translations activerecord.en.yml (Sinhala)
[ci skip]
* New translations en.yml (Kannada)
[ci skip]
* New translations en.json (Kannada)
[ci skip]
* New translations en.yml (Cornish)
[ci skip]
* New translations en.json (Cornish)
[ci skip]
* New translations doorkeeper.en.yml (Sinhala)
[ci skip]
* New translations simple_form.en.yml (Sinhala)
[ci skip]
* New translations en.yml (Sinhala)
[ci skip]
* New translations en.json (Sinhala)
[ci skip]
* New translations doorkeeper.en.yml (Breton)
[ci skip]
* New translations activerecord.en.yml (Breton)
[ci skip]
* New translations simple_form.en.yml (Breton)
[ci skip]
* New translations en.yml (Breton)
[ci skip]
* New translations en.json (Breton)
[ci skip]
* New translations doorkeeper.en.yml (Malayalam)
[ci skip]
* New translations en.json (Sorani (Kurdish))
[ci skip]
* New translations en.yml (Occitan)
[ci skip]
* New translations doorkeeper.en.yml (Serbian (Latin))
[ci skip]
* New translations activerecord.en.yml (Serbian (Latin))
[ci skip]
* New translations simple_form.en.yml (Serbian (Latin))
[ci skip]
* New translations en.yml (Serbian (Latin))
[ci skip]
* New translations en.json (Serbian (Latin))
[ci skip]
* New translations doorkeeper.en.yml (Occitan)
[ci skip]
* New translations activerecord.en.yml (Occitan)
[ci skip]
* New translations simple_form.en.yml (Occitan)
[ci skip]
* New translations en.json (Occitan)
[ci skip]
* New translations doorkeeper.en.yml (Asturian)
[ci skip]
* New translations activerecord.en.yml (Asturian)
[ci skip]
* New translations simple_form.en.yml (Asturian)
[ci skip]
* New translations en.yml (Asturian)
[ci skip]
* New translations en.json (Asturian)
[ci skip]
* New translations en.json (Spanish, Mexico)
[ci skip]
* New translations activerecord.en.yml (Scottish Gaelic)
[ci skip]
* New translations simple_form.en.yml (Scottish Gaelic)
[ci skip]
* New translations en.yml (Scottish Gaelic)
[ci skip]
* New translations en.yml (Spanish, Mexico)
[ci skip]
* New translations simple_form.en.yml (Icelandic)
[ci skip]
* New translations doorkeeper.en.yml (Spanish, Argentina)
[ci skip]
* New translations en.yml (Norwegian)
[ci skip]
* New translations en.json (Norwegian)
[ci skip]
* New translations doorkeeper.en.yml (Dutch)
[ci skip]
* New translations activerecord.en.yml (Dutch)
[ci skip]
* New translations simple_form.en.yml (Dutch)
[ci skip]
* New translations en.yml (Dutch)
[ci skip]
* New translations en.json (Dutch)
[ci skip]
* New translations activerecord.en.yml (Norwegian)
[ci skip]
* New translations en.yml (Macedonian)
[ci skip]
* New translations en.json (Macedonian)
[ci skip]
* New translations en.yml (Lithuanian)
[ci skip]
* New translations en.json (Lithuanian)
[ci skip]
* New translations doorkeeper.en.yml (Korean)
[ci skip]
* New translations simple_form.en.yml (Norwegian)
[ci skip]
* New translations doorkeeper.en.yml (Norwegian)
[ci skip]
* New translations simple_form.en.yml (Korean)
[ci skip]
* New translations activerecord.en.yml (Russian)
[ci skip]
* New translations simple_form.en.yml (Russian)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations doorkeeper.en.yml (Portuguese)
[ci skip]
* New translations activerecord.en.yml (Portuguese)
[ci skip]
* New translations simple_form.en.yml (Portuguese)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations doorkeeper.en.yml (Polish)
[ci skip]
* New translations en.json (Punjabi)
[ci skip]
* New translations activerecord.en.yml (Polish)
[ci skip]
* New translations simple_form.en.yml (Polish)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations en.yml (Punjabi)
[ci skip]
* New translations activerecord.en.yml (Korean)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations en.json (Slovak)
[ci skip]
* New translations doorkeeper.en.yml (Finnish)
[ci skip]
* New translations simple_form.en.yml (Hungarian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations doorkeeper.en.yml (Hebrew)
[ci skip]
* New translations activerecord.en.yml (Hebrew)
[ci skip]
* New translations simple_form.en.yml (Hebrew)
[ci skip]
* New translations en.yml (Hebrew)
[ci skip]
* New translations en.json (Hebrew)
[ci skip]
* New translations activerecord.en.yml (Finnish)
[ci skip]
* New translations doorkeeper.en.yml (Hungarian)
[ci skip]
* New translations simple_form.en.yml (Finnish)
[ci skip]
* New translations en.yml (Finnish)
[ci skip]
* New translations en.json (Finnish)
[ci skip]
* New translations doorkeeper.en.yml (Basque)
[ci skip]
* New translations activerecord.en.yml (Basque)
[ci skip]
* New translations simple_form.en.yml (Basque)
[ci skip]
* New translations en.yml (Basque)
[ci skip]
* New translations en.json (Armenian)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations doorkeeper.en.yml (Georgian)
[ci skip]
* New translations activerecord.en.yml (Georgian)
[ci skip]
* New translations simple_form.en.yml (Georgian)
[ci skip]
* New translations en.yml (Georgian)
[ci skip]
* New translations en.json (Georgian)
[ci skip]
* New translations doorkeeper.en.yml (Japanese)
[ci skip]
* New translations activerecord.en.yml (Japanese)
[ci skip]
* New translations simple_form.en.yml (Japanese)
[ci skip]
* New translations en.yml (Armenian)
[ci skip]
* New translations doorkeeper.en.yml (Italian)
[ci skip]
* New translations activerecord.en.yml (Italian)
[ci skip]
* New translations simple_form.en.yml (Italian)
[ci skip]
* New translations en.yml (Italian)
[ci skip]
* New translations doorkeeper.en.yml (Armenian)
[ci skip]
* New translations activerecord.en.yml (Armenian)
[ci skip]
* New translations simple_form.en.yml (Armenian)
[ci skip]
* New translations doorkeeper.en.yml (Russian)
[ci skip]
* New translations en.yml (Slovak)
[ci skip]
* New translations activerecord.en.yml (Spanish, Argentina)
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations doorkeeper.en.yml (Icelandic)
[ci skip]
* New translations activerecord.en.yml (Icelandic)
[ci skip]
* New translations en.yml (Icelandic)
[ci skip]
* New translations doorkeeper.en.yml (Galician)
[ci skip]
* New translations activerecord.en.yml (Galician)
[ci skip]
* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations activerecord.en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Urdu (Pakistan))
[ci skip]
* New translations doorkeeper.en.yml (Persian)
[ci skip]
* New translations simple_form.en.yml (Spanish, Argentina)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations doorkeeper.en.yml (Tamil)
[ci skip]
* New translations activerecord.en.yml (Tamil)
[ci skip]
* New translations simple_form.en.yml (Tamil)
[ci skip]
* New translations en.yml (Tamil)
[ci skip]
* New translations en.json (Tamil)
[ci skip]
* New translations activerecord.en.yml (Persian)
[ci skip]
* New translations doorkeeper.en.yml (Portuguese, Brazilian)
[ci skip]
* New translations simple_form.en.yml (Persian)
[ci skip]
* New translations en.yml (Persian)
[ci skip]
* New translations doorkeeper.en.yml (Indonesian)
[ci skip]
* New translations activerecord.en.yml (Indonesian)
[ci skip]
* New translations simple_form.en.yml (Indonesian)
[ci skip]
* New translations en.yml (Indonesian)
[ci skip]
* New translations en.yml (Urdu (Pakistan))
[ci skip]
* New translations doorkeeper.en.yml (Chinese Traditional)
[ci skip]
* New translations simple_form.en.yml (Slovak)
[ci skip]
* New translations simple_form.en.yml (Albanian)
[ci skip]
* New translations en.json (Swedish)
[ci skip]
* New translations doorkeeper.en.yml (Serbian (Cyrillic))
[ci skip]
* New translations activerecord.en.yml (Serbian (Cyrillic))
[ci skip]
* New translations simple_form.en.yml (Serbian (Cyrillic))
[ci skip]
* New translations en.yml (Serbian (Cyrillic))
[ci skip]
* New translations en.json (Serbian (Cyrillic))
[ci skip]
* New translations doorkeeper.en.yml (Albanian)
[ci skip]
* New translations activerecord.en.yml (Albanian)
[ci skip]
* New translations en.yml (Albanian)
[ci skip]
* New translations simple_form.en.yml (Swedish)
[ci skip]
* New translations doorkeeper.en.yml (Slovenian)
[ci skip]
* New translations activerecord.en.yml (Slovenian)
[ci skip]
* New translations simple_form.en.yml (Slovenian)
[ci skip]
* New translations en.yml (Slovenian)
[ci skip]
* New translations en.json (Slovenian)
[ci skip]
* New translations doorkeeper.en.yml (Slovak)
[ci skip]
* New translations activerecord.en.yml (Slovak)
[ci skip]
* New translations en.yml (Swedish)
[ci skip]
* New translations activerecord.en.yml (Swedish)
[ci skip]
* New translations activerecord.en.yml (Chinese Traditional)
[ci skip]
* New translations doorkeeper.en.yml (Ukrainian)
[ci skip]
* New translations simple_form.en.yml (Chinese Traditional)
[ci skip]
* New translations en.yml (Chinese Traditional)
[ci skip]
* New translations doorkeeper.en.yml (Chinese Simplified)
[ci skip]
* New translations activerecord.en.yml (Chinese Simplified)
[ci skip]
* New translations simple_form.en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations activerecord.en.yml (Ukrainian)
[ci skip]
* New translations doorkeeper.en.yml (Swedish)
[ci skip]
* New translations simple_form.en.yml (Ukrainian)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations doorkeeper.en.yml (Turkish)
[ci skip]
* New translations activerecord.en.yml (Turkish)
[ci skip]
* New translations simple_form.en.yml (Turkish)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations doorkeeper.en.yml (Standard Moroccan Tamazight)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.json (Italian)
[ci skip]
* New translations devise.en.yml (Italian)
[ci skip]
* New translations en.json (Czech)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations doorkeeper.en.yml (Czech)
[ci skip]
* New translations en.json (Czech)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations doorkeeper.en.yml (Czech)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.yml (Scottish Gaelic)
[ci skip]
* New translations simple_form.en.yml (Scottish Gaelic)
[ci skip]
* New translations en.yml (Scottish Gaelic)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations doorkeeper.en.yml (Thai)
[ci skip]
* New translations en.yml (Scottish Gaelic)
[ci skip]
* New translations simple_form.en.yml (Scottish Gaelic)
[ci skip]
* New translations activerecord.en.yml (Scottish Gaelic)
[ci skip]
* New translations doorkeeper.en.yml (Scottish Gaelic)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations simple_form.en.yml (Thai)
[ci skip]
* New translations activerecord.en.yml (Thai)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* i18n-tasks normalize
* yarn manage:translations
* Fix normalization and enable es-MX
2021-05-20 00:19:52 +02:00
Claire
9a19227f17
Fix some RedisLocks auto-releasing too fast ( #16276 )
...
* Fix Delete and Create-related locks expiring too fast
Fixes #16238
By default, RedisLock expires after 10 seconds, which may not be enough to
process statuses, especially when those have attached media files.
This commit extends those 10 seconds to 15 minutes, which should be plenty
enough to handle any status, while being short enough to not waste many
sidekiq job retries in the exceedingly rare case in which a sidekiq process
would crash when processing a `Create` or `Delete`.
* Fix other RedisLock autorelease durations
Fixes #15645
- things that only perform a few simple database queries (e.g. finding and
saving a record) have been left unchanged, so they'll still use the default
10s duration
- things that perform significantly more complex database queries have been
changed to a 5 minutes timeout
- things that perform multiple HTTP queries have been changed to a 15 minutes
timeout
2021-05-19 23:52:08 +02:00
Zero King
028ba13eb3
Remove duplicate CSS properties ( #16278 )
2021-05-19 23:51:52 +02:00
Claire
92f1d739b5
Fix unread notification count when polling ( #16272 )
...
* Fix unread notification count when polling
Fixes #16236
* Immediately fetch markers to avoid incorrect unread notification count
2021-05-19 23:51:05 +02:00
Zero King
689974b1ed
Remove duplicate CSS property of margin ( #16277 )
2021-05-18 20:13:44 +02:00
Claire
69737b703a
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`: our READMEs are entirely different and
upstream's has been updated. Kept our README.
2021-05-17 10:30:34 +02:00
Eugen Rochko
132adcc8da
New Crowdin updates ( #16241 )
...
* New translations en.yml (Czech)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations en.json (Czech)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations en.json (Czech)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations en.json (Czech)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations simple_form.en.yml (Czech)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations devise.en.yml (Czech)
[ci skip]
* New translations en.json (Catalan)
[ci skip]
* New translations en.json (Catalan)
[ci skip]
* New translations simple_form.en.yml (Czech)
[ci skip]
* New translations devise.en.yml (Czech)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations simple_form.en.yml (Czech)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations simple_form.en.yml (Chinese Simplified)
[ci skip]
* New translations activerecord.en.yml (Chinese Simplified)
[ci skip]
* New translations devise.en.yml (Chinese Simplified)
[ci skip]
* New translations doorkeeper.en.yml (Chinese Simplified)
[ci skip]
* New translations en.json (Scottish Gaelic)
[ci skip]
* New translations en.yml (Scottish Gaelic)
[ci skip]
* New translations simple_form.en.yml (Japanese)
[ci skip]
* New translations en.json (Scottish Gaelic)
[ci skip]
* New translations simple_form.en.yml (Japanese)
[ci skip]
* i18n-tasks normalize
* Fix normalization
2021-05-16 23:54:25 +02:00
dogelover911
52c4e17f7e
Add width and height to attachments in ActivityPub ( #16245 )
...
Co-authored-by: dogelover911 <dogelover911@localhost>
2021-05-16 23:09:03 +02:00
Eugen Rochko
6528f8162e
New Crowdin updates ( #16207 )
...
* New translations en.yml (Czech)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations simple_form.en.yml (Japanese)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations simple_form.en.yml (Japanese)
[ci skip]
* New translations doorkeeper.en.yml (Japanese)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations simple_form.en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations simple_form.en.yml (Vietnamese)
[ci skip]
* New translations doorkeeper.en.yml (Vietnamese)
[ci skip]
* New translations doorkeeper.en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations simple_form.en.yml (Russian)
[ci skip]
* New translations activerecord.en.yml (Russian)
[ci skip]
* New translations devise.en.yml (Russian)
[ci skip]
* New translations doorkeeper.en.yml (Russian)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations simple_form.en.yml (Vietnamese)
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.json (Russian)
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations simple_form.en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations en.json (Russian)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations devise.en.yml (Hungarian)
[ci skip]
* New translations doorkeeper.en.yml (Hungarian)
[ci skip]
* New translations simple_form.en.yml (Hungarian)
[ci skip]
* New translations simple_form.en.yml (Hungarian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations simple_form.en.yml (Hungarian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations simple_form.en.yml (Hungarian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.json (Corsican)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations simple_form.en.yml (Hungarian)
[ci skip]
* New translations doorkeeper.en.yml (Hungarian)
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Russian)
[ci skip]
* New translations en.json (Scottish Gaelic)
[ci skip]
* New translations en.json (Scottish Gaelic)
[ci skip]
* New translations en.yml (Scottish Gaelic)
[ci skip]
* New translations simple_form.en.yml (Scottish Gaelic)
[ci skip]
* New translations activerecord.en.yml (Scottish Gaelic)
[ci skip]
* New translations devise.en.yml (Scottish Gaelic)
[ci skip]
* New translations doorkeeper.en.yml (Scottish Gaelic)
[ci skip]
* New translations simple_form.en.yml (Vietnamese)
[ci skip]
* New translations en.json (Galician)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations simple_form.en.yml (Chinese Simplified)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations simple_form.en.yml (Chinese Simplified)
[ci skip]
* New translations doorkeeper.en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Scottish Gaelic)
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations en.json (Korean)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations en.json (Korean)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations simple_form.en.yml (Korean)
[ci skip]
* New translations devise.en.yml (Korean)
[ci skip]
* New translations activerecord.en.yml (Hungarian)
[ci skip]
* New translations devise.en.yml (Hungarian)
[ci skip]
* New translations en.json (Korean)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations simple_form.en.yml (Korean)
[ci skip]
* New translations devise.en.yml (Hungarian)
[ci skip]
* New translations en.json (Korean)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations en.json (Korean)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations en.json (Scottish Gaelic)
[ci skip]
* New translations en.json (Czech)
[ci skip]
* New translations en.json (Czech)
[ci skip]
* New translations en.json (Czech)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations simple_form.en.yml (Czech)
[ci skip]
* New translations en.json (Czech)
[ci skip]
* New translations en.json (Czech)
[ci skip]
* New translations en.json (Czech)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations doorkeeper.en.yml (Czech)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations en.json (Cornish)
[ci skip]
* New translations en.yml (Cornish)
[ci skip]
* New translations simple_form.en.yml (Czech)
[ci skip]
* New translations simple_form.en.yml (Czech)
[ci skip]
* New translations simple_form.en.yml (Czech)
[ci skip]
* New translations en.json (Czech)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations simple_form.en.yml (Czech)
[ci skip]
* New translations en.json (Czech)
[ci skip]
* New translations en.json (Czech)
[ci skip]
* New translations en.json (Czech)
[ci skip]
* New translations en.json (Czech)
[ci skip]
* New translations en.json (Czech)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations en.json (Czech)
[ci skip]
* New translations simple_form.en.yml (Czech)
[ci skip]
* New translations simple_form.en.yml (Czech)
[ci skip]
* New translations activerecord.en.yml (Czech)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations en.json (Czech)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations simple_form.en.yml (Czech)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations simple_form.en.yml (Czech)
[ci skip]
* New translations doorkeeper.en.yml (Czech)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations en.json (Czech)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations simple_form.en.yml (Czech)
[ci skip]
* New translations en.json (Czech)
[ci skip]
* i18n-tasks normalize
* yarn manage:translations
2021-05-16 08:27:11 +02:00
Claire
76064e6608
Update fix-duplicates maintenance script to support latest migrations ( #16231 )
...
* Update maintenance script to support latest database migrations
* Update Account#merge_with!
2021-05-12 23:19:44 +02:00
Claire
678e07c544
Fix local-only toggle being buggy when replying to remote toot
2021-05-12 12:38:21 +02:00
