913141c678
Merge pull request #1388 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-07-24 12:32:33 +02:00
753ba9fc23
Fix hover and normal colors for private boost icon being swapped ( #14386 )
2020-07-24 12:19:30 +02:00
5e93c7359d
Fix custom boost icon colors being swapped
2020-07-24 11:58:09 +02:00
b136e621ea
[Glitch] Add custom icon for private boosts
...
Port 956473142c
2020-07-24 11:29:20 +02:00
4d950c71e9
Merge branch 'master' into glitch-soc/master
2020-07-24 11:26:40 +02:00
956473142c
Add custom icon for private boosts ( #14380 )
2020-07-23 23:54:19 +02:00
939a47393c
Fix duplicate notification and delivery of mentions ( #14378 )
2020-07-23 15:41:49 +02:00
16416e940f
Merge pull request #1387 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-07-22 23:21:11 +02:00
d5d856f104
Update translators ( #14374 )
2020-07-22 23:08:27 +02:00
59e0eb1ba0
[Glitch] Change disabled retweet icon
...
Port e93efc0309
2020-07-22 22:57:57 +02:00
c03d1a9ac8
Merge branch 'master' into glitch-soc/merge-upstream
2020-07-22 22:53:46 +02:00
855ada7e93
Fix “Show less for all”/”Show more for all” eye icon not reflecting state
2020-07-22 22:53:10 +02:00
e93efc0309
Change disabled retweet icon ( #14373 )
...
* Change disabled retweet icon
* Hide fontawesome version of boost icon in both reduce-motion and no-reduce-motion
2020-07-22 22:48:51 +02:00
4024952b58
Merge pull request #1385 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-07-22 15:39:36 +02:00
f8e315cd74
[Glitch] Fix keyboard navigation in scrollable lists
...
Port 98f6380dee
2020-07-22 13:51:44 +02:00
4412e2579c
[Glitch] Fix following_counter plural to include "one"
...
Port 17b1d71536
2020-07-22 13:50:58 +02:00
9bdad8f14e
[Glitch] Fix audio player controls color in mastodon-light theme
...
Port 85bc0f9639
2020-07-22 13:50:15 +02:00
b9f351d845
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/mastodon/actions/compose.js`:
Not a “real” conflict, but change too close to a change we made to
fix the vanilla WebUI locally pushing authored local-only toots in the
public TL view.
2020-07-22 13:38:17 +02:00
5d9acc0ce4
Fix not handling Undo on some activity types when they aren't inlined ( #14346 )
...
* Fix not handling Undo on some activity types when they aren't inlined
When receiving an Undo for a non-inlined activity, try looking it up in
database using the URI. The queries are ad-hoc because we don't have a global
index of object URIs, and not all activity types are stored in database with
an index on their URI.
Announces are just statuses, and have an index on URIs, so this check can
be done efficiently.
Accepts cannot be handled at all because we don't record their URI at any
point.
Follows don't have an index on URI, but they have an index on the issuing
account, which should make such queries largely manageable.
Likes don't have an index on URI, they have an index on the issuing account,
but the number of favs per account may be very high, so I decided not to
handle that.
Blocks don't have an index on URI, but they have an index on the issuing
account, which should make such queries largely manageable.
In all cases, if an Undo could not be handled properly, we call `delete_later!`
because that does not require us to know more than the URI of the undone
property.
* Add tests
* Make newer blocks overwrite older ones
Allows re-synchronizing block info by re-blocking and un-blocking again
when the original Undo Block has been lost.
2020-07-22 11:45:35 +02:00
f55dd193f9
Fix RSS feeds not being cachable ( #14368 )
...
* Add tests for some cachable responses
This only covers responses that we should have managed to make cachable
so far. It's not the case of all responses that should be cachable in
the end.
* Fix RSS feeds not being cachable
2020-07-22 11:44:02 +02:00
bcf85b5208
Dereference object URIs in Create and Update messages ( #14359 )
...
* Dereference object URIs in Create and Update messages
Fixes #14353
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
* Refactor, and perform origin check *before* attempting to fetch object
Co-authored-by: Fire Demon <firedemon@creature.cafe>
2020-07-22 11:43:17 +02:00
a8b6524b43
Changed retries and rescued in ActivityPub::ProcessingWorker ( #14355 )
...
* Changed the number of retries and rescued exceptions in ActivityPub::ProcessingWorker
* Remove RecordNotUnique from rescue
2020-07-20 11:26:12 +02:00
fcb3f259e5
Fix to add RedisLock to handle Announce activity ( #14365 )
2020-07-20 11:25:26 +02:00
0ab97107c7
Remove nodejs buildpack from buildpacks ( #14364 )
2020-07-20 09:48:10 +02:00
7540e235a2
Fix movie width and frame_rate returning nil ( #14357 )
...
* Fix movie width and frame_rate returning nil
* Add StreamValidationError and raise
* Fix code style
2020-07-19 22:28:27 +02:00
47931db1f5
Add thumbnail_remote_url in MediaAttachment REST response ( #14358 )
...
* Add thumbnail_remote_url in MediaAttachment REST response
* Change thumbnail_remote_url to preview_remote_url
2020-07-19 19:53:31 +02:00
2ada2ae18a
Fix/14021 behaviour on add or remove toots ( #14212 )
...
* Add toot send by current user at local state after send a new toot
Related to #14021
* Decrement toot counter at profile when remove a toot
Related to #14021
* Remove semicolon at end of line
2020-07-19 17:04:02 +02:00
101485a41f
Fix mimetype returning nil ( #14356 )
2020-07-19 13:09:47 +02:00
a29080256e
helm: add examples of annotation for NGINX upload limits ( #14350 )
2020-07-18 19:30:46 +02:00
d87958e177
ran `yarn manage:translations` ( #14344 )
2020-07-18 19:01:16 +02:00
f2d977914e
Set bundle config in local file, and set path ( #14351 )
2020-07-18 19:00:59 +02:00
98f6380dee
Fix keyboard navigation in scrollable lists ( #14348 )
...
Fixes #14347
2020-07-18 18:55:36 +02:00
17b1d71536
Fix following_counter plural to include "one" ( #14342 )
...
That should've worked just fine, but unfortunately, Crowdin wasn't able
to pick up on our non-existent "one" category, thus appending empty
translation block to people's translations. Empty block WILL BE used by
any ICU FormatMessage library, thus resulting in an empty translation
for "one" category, and that requires immediate fix.
This commit duplicates contents of the "other" plural category.
2020-07-17 07:08:23 +02:00
322d74fc2a
Fix boosted toots from blocked account not being retroactively removed from TL ( #14339 )
...
* Fix boosted toots from blocked account not being retroactively removed from TL
Fixes #14301
* Add test for clear_from_timeline
2020-07-17 07:07:54 +02:00
85bc0f9639
Fix audio player controls color in mastodon-light theme ( #14338 )
...
Fixes #14337
The new audio player sets the background and foreground colors automatically
based on the thumbnail of the audio file, but the mastodon-light theme
overrides the controls' colors with a hardcoded color, which sometimes make
them unreadable.
2020-07-17 07:07:18 +02:00
d668fd8b83
Bump lodash from 4.17.15 to 4.17.19 ( #14321 )
...
Bumps [lodash](https://github.com/lodash/lodash ) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases )
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-07-17 07:06:45 +02:00
66acf8203b
Stop using heroku-buildpack-nodejs ( #14341 )
...
heroku-buildpack-ruby started to install Node 12 by default.
This makes it possible to run Mastodon without heroku-buildpack-nodejs.
2020-07-16 22:01:34 +02:00
801e546ecc
Merge pull request #1383 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-07-16 15:01:13 +02:00
f94cb94767
[Glitch] Fix error when closing a playing audio or video modal
...
Port bfed7dd5f3
2020-07-16 14:44:53 +02:00
1c6c40d17c
Merge branch 'master' into glitch-soc/merge-upstream
2020-07-16 14:43:50 +02:00
ea13e80030
New Crowdin updates ( #14314 )
...
* New translations devise.en.yml (Serbian (Cyrillic))
[ci skip]
* New translations devise.en.yml (Albanian)
[ci skip]
* New translations devise.en.yml (Slovenian)
[ci skip]
* New translations devise.en.yml (Slovak)
[ci skip]
* New translations devise.en.yml (Russian)
[ci skip]
* New translations devise.en.yml (Portuguese)
[ci skip]
* New translations devise.en.yml (Polish)
[ci skip]
* New translations devise.en.yml (Norwegian)
[ci skip]
* New translations devise.en.yml (Dutch)
[ci skip]
* New translations devise.en.yml (Tamil)
[ci skip]
* New translations devise.en.yml (Bengali)
[ci skip]
* New translations devise.en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations devise.en.yml (Ido)
[ci skip]
* New translations devise.en.yml (Corsican)
[ci skip]
* New translations devise.en.yml (Serbian (Latin))
[ci skip]
* New translations devise.en.yml (Occitan)
[ci skip]
* New translations devise.en.yml (Asturian)
[ci skip]
* New translations devise.en.yml (Kannada)
[ci skip]
* New translations devise.en.yml (Malayalam)
[ci skip]
* New translations devise.en.yml (Esperanto)
[ci skip]
* New translations devise.en.yml (Welsh)
[ci skip]
* New translations devise.en.yml (Estonian)
[ci skip]
* New translations devise.en.yml (Kazakh)
[ci skip]
* New translations devise.en.yml (Norwegian Nynorsk)
[ci skip]
* New translations devise.en.yml (Croatian)
[ci skip]
* New translations devise.en.yml (Thai)
[ci skip]
* New translations devise.en.yml (Korean)
[ci skip]
* New translations activerecord.en.yml (Icelandic)
[ci skip]
* New translations activerecord.en.yml (Kazakh)
[ci skip]
* New translations activerecord.en.yml (Breton)
[ci skip]
* New translations activerecord.en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations activerecord.en.yml (Esperanto)
[ci skip]
* New translations activerecord.en.yml (Welsh)
[ci skip]
* New translations activerecord.en.yml (Estonian)
[ci skip]
* New translations activerecord.en.yml (Norwegian Nynorsk)
[ci skip]
* New translations activerecord.en.yml (Asturian)
[ci skip]
* New translations activerecord.en.yml (Thai)
[ci skip]
* New translations activerecord.en.yml (Marathi)
[ci skip]
* New translations activerecord.en.yml (Bengali)
[ci skip]
* New translations activerecord.en.yml (Spanish, Argentina)
[ci skip]
* New translations activerecord.en.yml (Tamil)
[ci skip]
* New translations activerecord.en.yml (Persian)
[ci skip]
* New translations activerecord.en.yml (Indonesian)
[ci skip]
* New translations activerecord.en.yml (Portuguese, Brazilian)
[ci skip]
* New translations activerecord.en.yml (Occitan)
[ci skip]
* New translations devise.en.yml (Georgian)
[ci skip]
* New translations devise.en.yml (Czech)
[ci skip]
* New translations devise.en.yml (Japanese)
[ci skip]
* New translations devise.en.yml (Italian)
[ci skip]
* New translations devise.en.yml (Armenian)
[ci skip]
* New translations devise.en.yml (Hungarian)
[ci skip]
* New translations devise.en.yml (Hebrew)
[ci skip]
* New translations devise.en.yml (Finnish)
[ci skip]
* New translations devise.en.yml (Basque)
[ci skip]
* New translations devise.en.yml (Greek)
[ci skip]
* New translations devise.en.yml (German)
[ci skip]
* New translations devise.en.yml (Danish)
[ci skip]
* New translations devise.en.yml (Catalan)
[ci skip]
* New translations activerecord.en.yml (Serbian (Latin))
[ci skip]
* New translations devise.en.yml (Bulgarian)
[ci skip]
* New translations devise.en.yml (Arabic)
[ci skip]
* New translations devise.en.yml (Spanish)
[ci skip]
* New translations devise.en.yml (French)
[ci skip]
* New translations devise.en.yml (Romanian)
[ci skip]
* New translations activerecord.en.yml (Sardinian)
[ci skip]
* New translations activerecord.en.yml (Corsican)
[ci skip]
* New translations en.json (Welsh)
[ci skip]
* New translations en.yml (Armenian)
[ci skip]
* New translations doorkeeper.en.yml (Georgian)
[ci skip]
* New translations simple_form.en.yml (Georgian)
[ci skip]
* New translations en.yml (Georgian)
[ci skip]
* New translations doorkeeper.en.yml (Japanese)
[ci skip]
* New translations simple_form.en.yml (Japanese)
[ci skip]
* New translations doorkeeper.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 simple_form.en.yml (Armenian)
[ci skip]
* New translations doorkeeper.en.yml (Hungarian)
[ci skip]
* New translations simple_form.en.yml (Korean)
[ci skip]
* New translations doorkeeper.en.yml (Hebrew)
[ci skip]
* New translations simple_form.en.yml (Hebrew)
[ci skip]
* New translations en.yml (Hebrew)
[ci skip]
* New translations doorkeeper.en.yml (Finnish)
[ci skip]
* New translations simple_form.en.yml (Finnish)
[ci skip]
* New translations en.yml (Finnish)
[ci skip]
* New translations doorkeeper.en.yml (Basque)
[ci skip]
* New translations simple_form.en.yml (Basque)
[ci skip]
* New translations en.yml (Basque)
[ci skip]
* New translations doorkeeper.en.yml (Greek)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations doorkeeper.en.yml (Korean)
[ci skip]
* New translations en.yml (Greek)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations doorkeeper.en.yml (Slovak)
[ci skip]
* New translations simple_form.en.yml (Slovak)
[ci skip]
* New translations doorkeeper.en.yml (Russian)
[ci skip]
* New translations doorkeeper.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 simple_form.en.yml (Polish)
[ci skip]
* New translations doorkeeper.en.yml (Norwegian)
[ci skip]
* New translations en.yml (Lithuanian)
[ci skip]
* New translations simple_form.en.yml (Norwegian)
[ci skip]
* New translations en.yml (Norwegian)
[ci skip]
* New translations doorkeeper.en.yml (Dutch)
[ci skip]
* New translations simple_form.en.yml (Dutch)
[ci skip]
* New translations en.yml (Dutch)
[ci skip]
* New translations en.yml (Macedonian)
[ci skip]
* New translations simple_form.en.yml (Greek)
[ci skip]
* New translations doorkeeper.en.yml (German)
[ci skip]
* New translations en.yml (Telugu)
[ci skip]
* New translations doorkeeper.en.yml (Romanian)
[ci skip]
* New translations simple_form.en.yml (Ukrainian)
[ci skip]
* New translations simple_form.en.yml (Russian)
[ci skip]
* New translations doorkeeper.en.yml (Czech)
[ci skip]
* New translations en.json (Slovak)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations simple_form.en.yml (Thai)
[ci skip]
* New translations simple_form.en.yml (Arabic)
[ci skip]
* New translations en.yml (Arabic)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Esperanto)
[ci skip]
* New translations simple_form.en.yml (Hungarian)
[ci skip]
* New translations en.yml (Thai)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations en.yml (Slovenian)
[ci skip]
* New translations en.json (Slovenian)
[ci skip]
* New translations simple_form.en.yml (Romanian)
[ci skip]
* New translations en.yml (Sardinian)
[ci skip]
* New translations en.json (Sardinian)
[ci skip]
* New translations en.yml (Romanian)
[ci skip]
* New translations en.json (Occitan)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations simple_form.en.yml (German)
[ci skip]
* New translations simple_form.en.yml (Bulgarian)
[ci skip]
* New translations en.yml (German)
[ci skip]
* New translations doorkeeper.en.yml (Danish)
[ci skip]
* New translations simple_form.en.yml (Danish)
[ci skip]
* New translations en.yml (Danish)
[ci skip]
* New translations simple_form.en.yml (Czech)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations doorkeeper.en.yml (Catalan)
[ci skip]
* New translations simple_form.en.yml (Catalan)
[ci skip]
* New translations en.yml (Catalan)
[ci skip]
* New translations doorkeeper.en.yml (Bulgarian)
[ci skip]
* New translations en.yml (Bulgarian)
[ci skip]
* New translations simple_form.en.yml (Chinese Simplified)
[ci skip]
* New translations doorkeeper.en.yml (Arabic)
[ci skip]
* New translations doorkeeper.en.yml (Spanish)
[ci skip]
* New translations simple_form.en.yml (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations doorkeeper.en.yml (French)
[ci skip]
* New translations simple_form.en.yml (French)
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations en.json (Ukrainian)
[ci skip]
* New translations en.yml (Persian)
[ci skip]
* New translations simple_form.en.yml (Slovenian)
[ci skip]
* New translations doorkeeper.en.yml (Slovenian)
[ci skip]
* New translations doorkeeper.en.yml (Croatian)
[ci skip]
* New translations simple_form.en.yml (Croatian)
[ci skip]
* New translations en.yml (Croatian)
[ci skip]
* New translations en.json (Croatian)
[ci skip]
* New translations doorkeeper.en.yml (Thai)
[ci skip]
* New translations doorkeeper.en.yml (Marathi)
[ci skip]
* New translations en.yml (Marathi)
[ci skip]
* New translations en.json (Marathi)
[ci skip]
* New translations simple_form.en.yml (Bengali)
[ci skip]
* New translations en.yml (Norwegian Nynorsk)
[ci skip]
* New translations en.yml (Bengali)
[ci skip]
* New translations en.json (Bengali)
[ci skip]
* New translations doorkeeper.en.yml (Spanish, Argentina)
[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 simple_form.en.yml (Tamil)
[ci skip]
* New translations en.yml (Albanian)
[ci skip]
* New translations en.json (Norwegian Nynorsk)
[ci skip]
* New translations simple_form.en.yml (Norwegian Nynorsk)
[ci skip]
* New translations en.json (Tamil)
[ci skip]
* New translations en.json (Telugu)
[ci skip]
* New translations en.yml (Malay)
[ci skip]
* New translations en.json (Malay)
[ci skip]
* New translations en.yml (Indonesian)
[ci skip]
* New translations en.yml (Hindi)
[ci skip]
* New translations en.json (Hindi)
[ci skip]
* New translations doorkeeper.en.yml (Norwegian Nynorsk)
[ci skip]
* New translations en.yml (Latvian)
[ci skip]
* New translations en.json (Latvian)
[ci skip]
* New translations doorkeeper.en.yml (Estonian)
[ci skip]
* New translations simple_form.en.yml (Estonian)
[ci skip]
* New translations en.yml (Estonian)
[ci skip]
* New translations en.json (Estonian)
[ci skip]
* New translations doorkeeper.en.yml (Kazakh)
[ci skip]
* New translations simple_form.en.yml (Kazakh)
[ci skip]
* New translations en.yml (Kazakh)
[ci skip]
* New translations en.json (Kazakh)
[ci skip]
* New translations en.yml (Tamil)
[ci skip]
* New translations doorkeeper.en.yml (Persian)
[ci skip]
* New translations simple_form.en.yml (Turkish)
[ci skip]
* New translations en.yml (Urdu (Pakistan))
[ci skip]
* New translations en.json (Urdu (Pakistan))
[ci skip]
* New translations doorkeeper.en.yml (Chinese Traditional)
[ci skip]
* New translations simple_form.en.yml (Chinese Traditional)
[ci skip]
* New translations en.yml (Chinese Traditional)
[ci skip]
* New translations en.json (Chinese Traditional)
[ci skip]
* New translations doorkeeper.en.yml (Chinese Simplified)
[ci skip]
* New translations doorkeeper.en.yml (Ukrainian)
[ci skip]
* New translations doorkeeper.en.yml (Turkish)
[ci skip]
* New translations en.yml (Turkish)
[ci skip]
* New translations en.json (Turkish)
[ci skip]
* New translations doorkeeper.en.yml (Swedish)
[ci skip]
* New translations simple_form.en.yml (Swedish)
[ci skip]
* New translations en.yml (Swedish)
[ci skip]
* New translations en.json (Swedish)
[ci skip]
* New translations doorkeeper.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 simple_form.en.yml (Albanian)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations doorkeeper.en.yml (Icelandic)
[ci skip]
* New translations doorkeeper.en.yml (Indonesian)
[ci skip]
* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Indonesian)
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations simple_form.en.yml (Vietnamese)
[ci skip]
* New translations simple_form.en.yml (Icelandic)
[ci skip]
* New translations simple_form.en.yml (Indonesian)
[ci skip]
* New translations en.yml (Icelandic)
[ci skip]
* New translations en.json (Icelandic)
[ci skip]
* New translations doorkeeper.en.yml (Galician)
[ci skip]
* New translations simple_form.en.yml (Galician)
[ci skip]
* New translations en.yml (Galician)
[ci skip]
* New translations simple_form.en.yml (Persian)
[ci skip]
* New translations doorkeeper.en.yml (Vietnamese)
[ci skip]
* New translations doorkeeper.en.yml (Portuguese, Brazilian)
[ci skip]
* New translations doorkeeper.en.yml (Ido)
[ci skip]
* New translations doorkeeper.en.yml (Kabyle)
[ci skip]
* New translations doorkeeper.en.yml (Corsican)
[ci skip]
* New translations doorkeeper.en.yml (Serbian (Latin))
[ci skip]
* New translations doorkeeper.en.yml (Occitan)
[ci skip]
* i18n-tasks normalize
* yarn manage:translations
* Fix
2020-07-16 00:49:14 +02:00
71e85a506d
New Crowdin updates ( #14311 )
...
* New translations en.json (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* i18n-tasks normalize
2020-07-15 21:11:21 +02:00
d658af7ff8
Fix removing allowed domains being done synchronously ( #14302 )
...
* Fix removing allowed domains being done synchronously
* Add tests
2020-07-15 21:08:19 +02:00
bfed7dd5f3
Fix error when closing a playing audio or video modal ( #14310 )
2020-07-15 21:07:53 +02:00
6f798eb574
Bump version to 3.2.0rc1 ( #14312 )
2020-07-15 21:07:27 +02:00
37c092e9fd
Merge pull request #1382 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2020-07-15 16:56:33 +02:00
470458da13
Fix style of visibility icon in boost modal
2020-07-15 16:04:56 +02:00
610f71db7a
[Glitch] Add a visibility icon to boost modal
...
Port 8b35ed96c0
2020-07-15 15:50:09 +02:00
dad3132046
[Glitch] Fix audio and video items in account gallery in web UI
...
Port 6cc5b822f5
2020-07-15 15:48:24 +02:00
3f60b096b5
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `config/routes.rb`:
Upstream disabled E2EE routes, which we did earlier, but slightly
differently. Took upstream's version.
2020-07-15 15:32:40 +02:00
ThibG