c3f46d6b28
Merge branch 'master' of https://framagit.org/tykayn/mastodon into merged-master
2020-07-17 20:49:44 +02:00
73fdf3e637
Merge branch 'master' into merged-master
2020-07-17 16:22:27 +02:00
a70da3adcc
hop merge avec master
2020-07-17 16:15:58 +02:00
fbb0aaecad
Merge branch 'master' of https://github.com/tootsuite/mastodon
2020-07-09 15:36:29 +02:00
b88994b14a
hop merged with origin master
2020-07-09 15:28:40 +02:00
ThibG
6fda3cbbeb
Freeze scroll position when a dropdown menu is open in the TL ( #14271 )
...
* Freeze scroll position when a dropdown menu is open in the TL
* Apply this to direct TL as well
* Fix case when mouse leaves the menu
2020-07-09 15:09:19 +02:00
71599425c1
Merge branch 'master' of https://github.com/tootsuite/mastodon
2020-07-09 15:04:12 +02:00
Sasha Sorokin
61c07c3731
Replace repetitive blurhash code with component ( #14267 )
...
This commit replaces all unnecessarily repeated code for decoding and
embedding blurhash canvases with separate component - <Blurhash>.
Under the hood Blurhash component will use effect dependent on its
props. This gives a few benefits: it will only be re-rendered whenever
the hash or width/height/dummy props update, and will not render if
canvas won't get to the final DOM, because then effect won't fire,
which prevents weird bugs like #14257 .
2020-07-09 13:01:30 +02:00
Eugen Rochko
5b7a93b02c
Fix videos on public pages not using custom thumbnails ( #14273 )
2020-07-09 12:53:16 +02:00
ef0f131f1b
Merge branch 'master' of https://github.com/tootsuite/mastodon
2020-07-09 10:49:02 +02:00
33e540f00e
hop
2020-07-09 10:48:27 +02:00
mayaeh
fbbec3fc0b
remove unused word. ( #14250 )
...
ran `yarn manage:translations en`
2020-07-08 23:53:56 +02:00
ThibG
0d2135a461
Fix new accent color not refreshing when changing thumbnail for audio uploads ( #14264 )
2020-07-08 14:54:47 +02:00
ThibG
65e5efbdf4
Revert tesseract.js to tesseract.js@2.0.0-alpha.16 ( #14262 )
...
The OCR feature in master is broken, there are several reasons for this:
- https://github.com/naptha/tesseract.js/issues/369
- https://github.com/naptha/tesseract.js/issues/346
- and the fact that the worker JS file is served with an unversioned URL,
and, in the nginx config we provide, served with
"public, max-age=31536000, immutable", leading to version mismatches as
the old version gets cached
2020-07-08 13:57:06 +02:00
ThibG
d308a863fb
Fix WebUI crash on sensitive preview card with no preview thumbnail ( #14261 )
...
Follow-up on #14260 which only fixed half the call sites
2020-07-08 12:58:17 +02:00
Takeshi Umeda
606c975050
Fix RemoveDuplicatedIndexesPghero to check for the existence of the index ( #14259 )
2020-07-08 09:23:23 +02:00
ThibG
2581715491
Fix WebUI crash on sensitive preview card with no preview thumbnail ( #14260 )
...
Fixes #14257
2020-07-08 09:22:23 +02:00
Alex Dunn
961789d511
helm: bump chart and default image version to 3.1.5 ( #14256 )
2020-07-07 20:35:55 +02:00
ThibG
701e5b9a19
Fix ogg vorbis files with a cover art not being correctly processed ( #14255 )
2020-07-07 16:32:14 +02:00
Eugen Rochko
6e25574ce5
Fix media attachments enumeration ( #14254 )
...
* Fix media attachment enumeration
* Switch media_attachments id to snowflake ids
Co-authored-by: Thibaut Girka <thib@sitedethib.com>
2020-07-07 15:26:51 +02:00
Eugen Rochko
81a3db1564
Change rate limits for various paths ( #14253 )
...
- Rate limit login attempts by target account
- Rate limit password resets and e-mail re-confirmations by target account
- Rate limit sign-up/login attempts, password resets, and e-mail re-confirmations by IP like before
2020-07-07 15:26:39 +02:00
Eugen Rochko
844870273f
Fix other sessions not being logged out on password change ( #14252 )
...
While OAuth tokens were immediately revoked, accessing the home
controller immediately generated new OAuth tokens and "revived"
the session due to a combination of using remember_me tokens and
overwriting the `authenticate_user!` method
2020-07-07 15:26:31 +02:00
Eugen Rochko
661f3f26b0
Bump version to 3.1.5
2020-07-07 15:22:47 +02:00
Thibaut Girka
2d2e3651ee
Fix media attachment enumeration
...
Signed-off-by: Eugen Rochko <eugen@zeonfederated.com>
2020-07-07 15:13:23 +02:00
Eugen Rochko
951e997b26
Change rate limits for various paths
...
- Rate limit login attempts by target account
- Rate limit password resets and e-mail re-confirmations by target account
- Rate limit sign-up/login attempts, password resets, and e-mail re-confirmations by IP like before
2020-07-07 15:13:19 +02:00
Eugen Rochko
fa3f78e4bf
Fix other sessions not being logged out on password change
...
While OAuth tokens were immediately revoked, accessing the home
controller immediately generated new OAuth tokens and "revived"
the session due to a combination of using remember_me tokens and
overwriting the `authenticate_user!` method
2020-07-07 15:13:14 +02:00
Sasha Sorokin
1c903c7ad6
Fix account note border radius ( #14251 )
2020-07-07 13:46:21 +02:00
Eugen Rochko
06fc6a9cd4
Add ability to choose media thumbnail in web UI ( #14244 )
2020-07-07 12:14:19 +02:00
Eugen Rochko
ed04697510
Change User-Agent of link preview fetching service to include "Bot" ( #14248 )
...
This forces Twitter to render OpenGraph tags in the response
2020-07-07 10:55:18 +02:00
dependabot[bot]
c7c07abe44
Bump babel-jest from 25.2.4 to 26.1.0 ( #14216 )
...
Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest ) from 25.2.4 to 26.1.0.
- [Release notes](https://github.com/facebook/jest/releases )
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md )
- [Commits](https://github.com/facebook/jest/commits/v26.1.0/packages/babel-jest )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-07-07 09:23:29 +09:00
ThibG
e96e9cae62
Add test for removing endorsed accounts on account deletion/suspension ( #14241 )
2020-07-07 02:01:13 +02:00
ThibG
a783bdf4ad
Fix hashtag column options styling ( #14247 )
...
* Enable nonces for stylesheets
* Pass nonce to react-select
2020-07-07 01:33:38 +02:00
Eugen Rochko
c3187411c2
Change design of account notes in web UI ( #14208 )
...
* Change design of account notes in web UI
* Fix `for` -> `htmlFor`
2020-07-07 01:24:03 +02:00
Alex Dunn
83fd046107
helm: fix default storage values for PVCs ( #14245 )
2020-07-06 23:08:29 +02:00
dependabot[bot]
4e0357c7f5
Bump jest-cli from 26.0.1 to 26.1.0 ( #14240 )
...
Bumps [jest-cli](https://github.com/facebook/jest/tree/HEAD/packages/jest-cli ) from 26.0.1 to 26.1.0.
- [Release notes](https://github.com/facebook/jest/releases )
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md )
- [Commits](https://github.com/facebook/jest/commits/v26.1.0/packages/jest-cli )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-07-07 05:51:22 +09:00
dependabot[bot]
309578101c
Bump @babel/preset-react from 7.10.1 to 7.10.4 ( #14228 )
...
Bumps [@babel/preset-react](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-react ) from 7.10.1 to 7.10.4.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.10.4/packages/babel-preset-react )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-07-07 05:50:42 +09:00
dependabot[bot]
aa363c4377
Bump @babel/plugin-transform-runtime from 7.10.3 to 7.10.4 ( #14217 )
...
Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-runtime ) from 7.10.3 to 7.10.4.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.10.4/packages/babel-plugin-transform-runtime )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-07-07 05:49:58 +09:00
dependabot[bot]
e3ca2b0641
Bump jest-watcher from 26.0.1 to 26.1.0 ( #14231 )
...
Bumps [jest-watcher](https://github.com/facebook/jest/tree/HEAD/packages/jest-watcher ) from 26.0.1 to 26.1.0.
- [Release notes](https://github.com/facebook/jest/releases )
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md )
- [Commits](https://github.com/facebook/jest/commits/v26.1.0/packages/jest-watcher )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-07-06 23:57:56 +09:00
dependabot[bot]
0f16f2af8c
Bump @babel/plugin-transform-react-inline-elements from 7.10.1 to 7.10.4 ( #14236 )
...
Bumps [@babel/plugin-transform-react-inline-elements](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-react-inline-elements ) from 7.10.1 to 7.10.4.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.10.4/packages/babel-plugin-transform-react-inline-elements )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-07-06 23:56:59 +09:00
dependabot[bot]
37bb2d815e
Bump jest-leak-detector from 26.0.1 to 26.1.0 ( #14233 )
...
Bumps [jest-leak-detector](https://github.com/facebook/jest/tree/HEAD/packages/jest-leak-detector ) from 26.0.1 to 26.1.0.
- [Release notes](https://github.com/facebook/jest/releases )
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md )
- [Commits](https://github.com/facebook/jest/commits/v26.1.0/packages/jest-leak-detector )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-07-06 23:56:19 +09:00
dependabot[bot]
93eb192aa0
Bump expect from 26.0.1 to 26.1.0 ( #14235 )
...
Bumps [expect](https://github.com/facebook/jest/tree/HEAD/packages/expect ) from 26.0.1 to 26.1.0.
- [Release notes](https://github.com/facebook/jest/releases )
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md )
- [Commits](https://github.com/facebook/jest/commits/v26.1.0/packages/expect )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-07-06 23:56:04 +09:00
dependabot[bot]
d48a1289e4
Bump arrow-key-navigation from 1.1.0 to 1.2.0 ( #14222 )
...
Bumps [arrow-key-navigation](https://github.com/nolanlawson/arrow-key-navigation ) from 1.1.0 to 1.2.0.
- [Release notes](https://github.com/nolanlawson/arrow-key-navigation/releases )
- [Commits](https://github.com/nolanlawson/arrow-key-navigation/compare/v1.1.0...v1.2.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-07-06 23:24:00 +09:00
dependabot[bot]
9db1388a8e
Bump diff-lcs from 1.4.3 to 1.4.4 ( #14220 )
...
Bumps [diff-lcs](https://github.com/halostatue/diff-lcs ) from 1.4.3 to 1.4.4.
- [Release notes](https://github.com/halostatue/diff-lcs/releases )
- [Changelog](https://github.com/halostatue/diff-lcs/blob/master/History.md )
- [Commits](https://github.com/halostatue/diff-lcs/compare/v1.4.3...v1.4.4 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-07-06 23:19:04 +09:00
dependabot[bot]
8620f54884
Bump rdf from 3.1.3 to 3.1.4 ( #14225 )
...
Bumps [rdf](https://github.com/ruby-rdf/rdf ) from 3.1.3 to 3.1.4.
- [Release notes](https://github.com/ruby-rdf/rdf/releases )
- [Changelog](https://github.com/ruby-rdf/rdf/blob/develop/CHANGES.md )
- [Commits](https://github.com/ruby-rdf/rdf/compare/3.1.3...3.1.4 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-07-06 23:18:25 +09:00
dependabot[bot]
769f74034c
Bump omniauth-saml from 1.10.1 to 1.10.2 ( #14226 )
...
Bumps [omniauth-saml](https://github.com/omniauth/omniauth-saml ) from 1.10.1 to 1.10.2.
- [Release notes](https://github.com/omniauth/omniauth-saml/releases )
- [Changelog](https://github.com/omniauth/omniauth-saml/blob/master/CHANGELOG.md )
- [Commits](https://github.com/omniauth/omniauth-saml/compare/v1.10.1...v1.10.2 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-07-06 23:18:06 +09:00
dependabot[bot]
2c7c9707b3
Bump json from 2.3.0 to 2.3.1 ( #14227 )
...
Bumps [json](https://github.com/flori/json ) from 2.3.0 to 2.3.1.
- [Release notes](https://github.com/flori/json/releases )
- [Changelog](https://github.com/flori/json/blob/master/CHANGES.md )
- [Commits](https://github.com/flori/json/compare/v2.3.0...v2.3.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-07-06 23:17:51 +09:00
dependabot[bot]
927a452780
Bump yargs from 15.3.1 to 15.4.0 ( #14234 )
...
Bumps [yargs](https://github.com/yargs/yargs ) from 15.3.1 to 15.4.0.
- [Release notes](https://github.com/yargs/yargs/releases )
- [Changelog](https://github.com/yargs/yargs/blob/master/CHANGELOG.md )
- [Commits](https://github.com/yargs/yargs/compare/v15.3.1...v15.4.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-07-06 23:06:29 +09:00
dependabot[bot]
0f926969cd
Bump caniuse-lite from 1.0.30001084 to 1.0.30001094 ( #14229 )
...
Bumps [caniuse-lite](https://github.com/ben-eb/caniuse-lite ) from 1.0.30001084 to 1.0.30001094.
- [Release notes](https://github.com/ben-eb/caniuse-lite/releases )
- [Changelog](https://github.com/ben-eb/caniuse-lite/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ben-eb/caniuse-lite/compare/v1.0.30001084...v1.0.30001094 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-07-06 23:01:08 +09:00
dependabot[bot]
8eb384277b
Bump terser-webpack-plugin from 3.0.3 to 3.0.6 ( #14238 )
...
Bumps [terser-webpack-plugin](https://github.com/webpack-contrib/terser-webpack-plugin ) from 3.0.3 to 3.0.6.
- [Release notes](https://github.com/webpack-contrib/terser-webpack-plugin/releases )
- [Changelog](https://github.com/webpack-contrib/terser-webpack-plugin/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/terser-webpack-plugin/compare/v3.0.3...v3.0.6 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-07-06 23:00:02 +09:00
dependabot[bot]
a630f77278
Bump electron-to-chromium from 1.3.475 to 1.3.488 ( #14239 )
...
Bumps [electron-to-chromium](https://github.com/kilian/electron-to-chromium ) from 1.3.475 to 1.3.488.
- [Release notes](https://github.com/kilian/electron-to-chromium/releases )
- [Changelog](https://github.com/Kilian/electron-to-chromium/blob/master/CHANGELOG.md )
- [Commits](https://github.com/kilian/electron-to-chromium/compare/v1.3.475...v1.3.488 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-07-06 22:30:08 +09:00
