Commit graph

10926 commits

Author SHA1 Message Date
dependabot-preview[bot]
f3435eceeb Bump @babel/plugin-proposal-class-properties from 7.5.5 to 7.7.0 (#12346)
Bumps [@babel/plugin-proposal-class-properties](https://github.com/babel/babel) from 7.5.5 to 7.7.0.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.5.5...v7.7.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-11 22:17:22 +09:00
dependabot-preview[bot]
0dcf22119e Bump @clusterws/cws from 0.15.2 to 0.16.0 (#12345)
Bumps @clusterws/cws from 0.15.2 to 0.16.0.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-11 22:15:31 +09:00
dependabot-preview[bot]
5f4a2b0d32 Bump fuubar from 2.4.1 to 2.5.0 (#12356)
Bumps [fuubar](https://github.com/thekompanee/fuubar) from 2.4.1 to 2.5.0.
- [Release notes](https://github.com/thekompanee/fuubar/releases)
- [Changelog](https://github.com/thekompanee/fuubar/blob/master/CHANGELOG.md)
- [Commits](https://github.com/thekompanee/fuubar/compare/releases/v2.4.1...releases/v2.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-11 22:05:16 +09:00
ThibG
f73c977caa Fix broken admin audit log in whitelist mode (#12303) 2019-11-11 00:05:15 +02:00
ThibG
6364adba64 Fix unread toot indicator not honoring onlyMedia in public and community timelines (#12330)
* Fix unread toot indicator not honoring onlyMedia in public and community timelines

* Fixup: `unread` already accounts for new content in pending items
2019-11-11 00:05:02 +02:00
ThibG
78e251fc77 Fix already-known remote private toots not being searchable by URL (#12336)
* Fix already-known remote private toots not being searchable by URL

Whenever an URL search fails, and an account is provided, try getting a
private status matching that URL from database.

* Fix searching by `id` field instead of `uri`
2019-11-11 00:04:48 +02:00
koyu
8349105f03 Updated Twemoji to 12.1.3 (#12342) 2019-11-11 00:04:24 +02:00
dependabot-preview[bot]
5af865b2ab [Security] Bump brakeman from 4.6.1 to 4.7.1 (#12329)
Bumps [brakeman](https://github.com/presidentbeef/brakeman) from 4.6.1 to 4.7.1. **This update includes a security fix.**
- [Release notes](https://github.com/presidentbeef/brakeman/releases)
- [Changelog](https://github.com/presidentbeef/brakeman/blob/master/CHANGES.md)
- [Commits](https://github.com/presidentbeef/brakeman/compare/v4.6.1...v4.7.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-08 14:45:42 +09:00
ThibG
048db4e071 Merge pull request #1243 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2019-11-07 21:15:22 +01:00
Darius Kazemi
b36c3b704b Fix type mismatch (#12324)
This was [causing an issue with feed regeneartion in tootctl](https://github.com/hometown-fork/hometown/issues/24), and @davefp fixed the issue.
2019-11-07 21:51:48 +02:00
Thibaut Girka
79b802f10c Fix build with new sass-loader 2019-11-07 14:56:09 +01:00
Thibaut Girka
1fa2d96434 [Glitch] Minor improvements to poll composing UI
Port aa21aeb838 to glitch-soc
2019-11-07 14:43:07 +01:00
ThibG
c98e2faa41 [Glitch] Fix WebUI allowing to upload more items than the limit
Port 83a88426ca to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-11-07 14:31:53 +01:00
Thibaut Girka
0fc784f8d0 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.js`
  conflict because of the poll option limit being different than upstream's
2019-11-07 13:43:56 +01:00
ThibG
8510457002 Merge pull request #1242 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2019-11-07 13:41:56 +01:00
Thibaut Girka
d99c53a3c9 Change CircleCI config to build assets with NODE_ENV=test
This should avoid minimization and other expensive webpack
transformations which aren't useful for running tests.
2019-11-07 13:27:36 +01:00
Thibaut Girka
09430e7028 Disable minimization in test environment 2019-11-07 13:16:10 +01:00
ThibG
e7c4a8681d Fix relationship caches being broken as result of a follow request (#12299) 2019-11-07 09:08:00 +02:00
ThibG
83a88426ca Fix WebUI allowing to upload more items than the limit (#12300)
Until this patch, drag'n'drop and copy-paste allowed to start uploading as
long as the number of *finished* uploads was below the limit.
2019-11-07 09:07:03 +02:00
ThibG
aa21aeb838 Minor improvements to poll composing UI (#12319)
- Disable the “add option” button instead of hiding it
- Allow poll option inputs to scale to full width
2019-11-07 09:06:06 +02:00
ThibG
28b68ec875 Fix various issues with account migration (#12301)
* Fix being able to follow oneself by moving to an account that was following the old one

* Add specs

* Add spec to catch MoveWorker issue with local followers following both accounts

* Fix move worker breaking when a local account follows both source and target accounts

* Fix migration from remote to local account not sending Undo Follow

* Fix show_reblogs not being preserved for moved account's followers
2019-11-07 09:05:07 +02:00
dependabot-preview[bot]
e79ce4b7b8 Bump sass-loader from 7.1.0 to 8.0.0 (#12027)
* Bump sass-loader from 7.1.0 to 8.0.0

Bumps [sass-loader](https://github.com/webpack-contrib/sass-loader) from 7.1.0 to 8.0.0.
- [Release notes](https://github.com/webpack-contrib/sass-loader/releases)
- [Changelog](https://github.com/webpack-contrib/sass-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/sass-loader/compare/v7.1.0...v8.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* bump webpack
2019-11-07 01:15:20 +09:00
dependabot-preview[bot]
a36a752322 Bump @babel/runtime from 7.6.0 to 7.7.1 (#12317)
Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime) from 7.6.0 to 7.7.1.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.7.1/packages/babel-runtime)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-07 00:55:46 +09:00
dependabot-preview[bot]
b3ed827697 Bump @babel/preset-env from 7.6.0 to 7.7.1 (#12318)
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.6.0 to 7.7.1.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.6.0...v7.7.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-07 00:55:22 +09:00
dependabot-preview[bot]
dd1e0c1c31 Bump tesseract.js from 2.0.0-alpha.16 to 2.0.0-beta.2 (#12311)
Bumps [tesseract.js](https://github.com/naptha/tesseract.js) from 2.0.0-alpha.16 to 2.0.0-beta.2.
- [Release notes](https://github.com/naptha/tesseract.js/releases)
- [Commits](https://github.com/naptha/tesseract.js/compare/v2.0.0-alpha.16...v2.0.0-beta.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-07 00:14:46 +09:00
dependabot-preview[bot]
c4510801b3 Bump glob from 7.1.4 to 7.1.5 (#12312)
Bumps [glob](https://github.com/isaacs/node-glob) from 7.1.4 to 7.1.5.
- [Release notes](https://github.com/isaacs/node-glob/releases)
- [Changelog](https://github.com/isaacs/node-glob/blob/master/changelog.md)
- [Commits](https://github.com/isaacs/node-glob/compare/v7.1.4...v7.1.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-07 00:14:26 +09:00
dependabot-preview[bot]
6463ad5d3c Bump sass from 1.23.1 to 1.23.3 (#12314)
Bumps [sass](https://github.com/sass/dart-sass) from 1.23.1 to 1.23.3.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.23.1...1.23.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-07 00:12:48 +09:00
dependabot-preview[bot]
82f2b5dd92 Bump @babel/preset-react from 7.0.0 to 7.6.3 (#12315)
Bumps [@babel/preset-react](https://github.com/babel/babel) from 7.0.0 to 7.6.3.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.0.0...v7.6.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-07 00:11:08 +09:00
Thibaut Girka
00af41825f [Glitch] Fix notification message for own poll
Port d99acc9587 and 3df536ec92 to glitch-soc
2019-11-06 15:06:53 +01:00
Nolan Lawson
2030c85cfa [Glitch] fix: support KaiOS arrow navigation on public pages
Port 425da2dbaa to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-11-06 14:59:57 +01:00
ThibG
24bbe94224 [Glitch] Fix filtered out items being counted as pending items
Port 572d9863ab to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-11-06 14:55:12 +01:00
Gabriel Rubens
be32d811d1 [Glitch] Use inert polyfill
Port 84e3b5a358 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-11-06 14:52:22 +01:00
ThibG
b9cf415165 [Glitch] Add support for submitting media description with ctrl+enter
Port 0e5be902e9 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-11-06 14:50:54 +01:00
Hinaloe
4825d33aef [Glitch] dont crash with null-ref
Port f28877756e to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-11-06 14:50:27 +01:00
Takeshi Umeda
0a29988edf [Glitch] Fix an issue where polls with 'expires_at' not set expired
Port 6665362f10 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-11-06 14:49:43 +01:00
Thibaut Girka
e7655951d7 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `package.json`
2019-11-06 14:38:28 +01:00
dependabot-preview[bot]
4cbbf16a57 Bump webpack-cli from 3.3.9 to 3.3.10 (#12297)
Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 3.3.9 to 3.3.10.
- [Release notes](https://github.com/webpack/webpack-cli/releases)
- [Changelog](https://github.com/webpack/webpack-cli/blob/v3.3.10/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-cli/compare/v3.3.9...v3.3.10)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-05 00:28:47 +09:00
dependabot-preview[bot]
29246e4fe0 Bump react-overlays from 0.8.3 to 0.9.1 (#12298)
Bumps [react-overlays](https://github.com/react-bootstrap/react-overlays) from 0.8.3 to 0.9.1.
- [Release notes](https://github.com/react-bootstrap/react-overlays/releases)
- [Changelog](https://github.com/react-bootstrap/react-overlays/blob/master/CHANGELOG.md)
- [Commits](https://github.com/react-bootstrap/react-overlays/compare/v0.8.3...v0.9.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-05 00:23:26 +09:00
dependabot-preview[bot]
23e6a36d7c Bump @babel/plugin-proposal-object-rest-spread from 7.5.5 to 7.6.2 (#12296)
Bumps [@babel/plugin-proposal-object-rest-spread](https://github.com/babel/babel) from 7.5.5 to 7.6.2.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.5.5...v7.6.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-04 23:33:05 +09:00
dependabot-preview[bot]
2a875748e2 Bump webpack-dev-server from 3.8.1 to 3.9.0 (#12293)
Bumps [webpack-dev-server](https://github.com/webpack/webpack-dev-server) from 3.8.1 to 3.9.0.
- [Release notes](https://github.com/webpack/webpack-dev-server/releases)
- [Changelog](https://github.com/webpack/webpack-dev-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-dev-server/compare/v3.8.1...v3.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-04 23:27:50 +09:00
dependabot-preview[bot]
0093aa37b0 Bump react-test-renderer from 16.10.2 to 16.11.0 (#12295)
Bumps [react-test-renderer](https://github.com/facebook/react/tree/HEAD/packages/react-test-renderer) from 16.10.2 to 16.11.0.
- [Release notes](https://github.com/facebook/react/releases)
- [Changelog](https://github.com/facebook/react/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/react/commits/v16.11.0/packages/react-test-renderer)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-04 23:27:07 +09:00
dependabot-preview[bot]
9788f8bca5 Bump wavesurfer.js from 3.0.0 to 3.2.0 (#12292)
Bumps [wavesurfer.js](https://github.com/katspaugh/wavesurfer.js) from 3.0.0 to 3.2.0.
- [Release notes](https://github.com/katspaugh/wavesurfer.js/releases)
- [Changelog](https://github.com/katspaugh/wavesurfer.js/blob/master/CHANGES.md)
- [Commits](https://github.com/katspaugh/wavesurfer.js/compare/3.0.0...3.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-04 23:21:40 +09:00
dependabot-preview[bot]
0c982e73d3 Bump react-toggle from 4.0.2 to 4.1.1 (#12291)
Bumps [react-toggle](https://github.com/aaronshaf/react-toggle) from 4.0.2 to 4.1.1.
- [Release notes](https://github.com/aaronshaf/react-toggle/releases)
- [Changelog](https://github.com/aaronshaf/react-toggle/blob/master/CHANGELOG.md)
- [Commits](https://github.com/aaronshaf/react-toggle/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-04 23:15:23 +09:00
dependabot-preview[bot]
a5c92c63d2 Bump react-dom from 16.10.2 to 16.11.0 (#12289)
Bumps [react-dom](https://github.com/facebook/react/tree/HEAD/packages/react-dom) from 16.10.2 to 16.11.0.
- [Release notes](https://github.com/facebook/react/releases)
- [Changelog](https://github.com/facebook/react/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/react/commits/v16.11.0/packages/react-dom)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-04 22:55:46 +09:00
Gabriel Rubens
84e3b5a358 Use inert polyfill (#12209)
* Inserting wicg-inert in project

* Import wicg-inert in moda_root component

* Update yarn.lock

* Solving code style problems

* Removing package-lock
2019-11-04 13:03:44 +01:00
mayaeh
3df536ec92 Integrate own poll's translation into own_poll. (#12231)
run `yarn manage:translations en`
2019-11-04 13:03:29 +01:00
Nolan Lawson
425da2dbaa fix: support KaiOS arrow navigation on public pages (#12251) 2019-11-04 13:03:09 +01:00
ThibG
e1cc25c4d4 Fix code referencing wrong class (#12263)
For some reason, I have seen this only triggered here:
https://circleci.com/gh/tootsuite/mastodon/98324?utm_campaign=vcs-integration-link&utm_medium=referral&utm_source=github-checks-link

But Follow.find_by referenced the ActivityPub::Activity::Follow class
instead of the model class.
2019-11-04 13:02:27 +01:00
ThibG
572d9863ab Fix filtered out items being counted as pending items (#12266) 2019-11-04 13:02:16 +01:00
ThibG
6b5aebf0ca Add abilityto add oneself to lists (#12271)
* Add ability to add oneself to lists

* Change search results to include oneself when searching through followers

* Mark follow relation as optional in ListAccount
2019-11-04 13:02:01 +01:00