tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,911 Commits 10 Branches 0 Tags
18f2c390748a112ac72bf9203f1513d295b13b3d
Commit Graph

11911 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thibaut Girka
18f2c39074 Hide local-only pinned toots from public profiles 
Fixes #1336

This also fixes federating pinned toots when some of them are local-only.

Public profiles will not show public toots, whether you are logged in
or not (this is consistent with local-only toots that are not pinned).
 2020-05-31 17:20:15 +02:00
Thibaut Girka
ddcd9fe9f0 Fix backup archive including outgoing-only content warnings 2020-05-30 18:27:00 +02:00
Thibaut Girka
9e04b9d8df Add support for setting Content Warning for CW-less outgoing toots 2020-05-30 18:27:00 +02:00
Thibaut Girka
041c769182 Move glitch-specific ruby-side locales to their own files 2020-05-30 12:54:17 +02:00
ThibG
491588f6b4 Merge pull request #1341 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2020-05-29 22:13:06 +02:00
ThibG
9707dbee6f [Glitch] Fix timeline markers in Firefox 
Port cc650bc023 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-05-29 20:02:30 +02:00
ThibG
9bd30b8dd5 [Glitch] Fix timeline markers not working on Chrome 
Port 5aff2a6957 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-05-29 20:02:30 +02:00
Thibaut Girka
60b43050cb Merge branch 'master' into glitch-soc/merge-upstream 2020-05-29 19:27:21 +02:00
ThibG
cc650bc023 Fix timeline markers in Firefox (regression from #13887) (#13889) 
Unfortunately, Firefox does not support the `keepalive` parameter
I used in the previous PR. However it supports the `navigator.sendBeacon`
API that allows that kind of things, but does not allow setting headers.

Therefore, this PR replaces it with a `sendBeacon` call that passes the
bearer token in the POST data.

Doorkeeper will then handle the auth token out of the box, as long as
it is passed as form data. Passing the query as JSON does not work.
 2020-05-29 19:25:57 +02:00
ThibG
5aff2a6957 Fix timeline markers not working on Chrome (#13887) 
* Periodically save timeline markers

This saves timeline markers immediately upon message arrival, but not more
than once every 5 minutes.

This does not change how the markers are saved on closing the window,
except that it avoids submitting them if there is no need for it.

* Use the Fetch API when possible instead of XHR on window unload
 2020-05-29 16:14:16 +02:00
dependabot-preview[bot]
8bbc81c71e [Security] Bump kaminari from 1.2.0 to 1.2.1 (#13886) 
Bumps [kaminari](https://github.com/kaminari/kaminari) from 1.2.0 to 1.2.1. **This update includes a security fix.**
- [Release notes](https://github.com/kaminari/kaminari/releases)
- [Changelog](https://github.com/kaminari/kaminari/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kaminari/kaminari/compare/v1.2.0...v1.2.1)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-05-28 23:50:24 +02:00
dependabot-preview[bot]
82119a4f7c Bump is-promise from 2.1.0 to 2.2.2 (#13870) 
Bumps [is-promise](https://github.com/then/is-promise) from 2.1.0 to 2.2.2.
- [Release notes](https://github.com/then/is-promise/releases)
- [Commits](https://github.com/then/is-promise/compare/v2.1.0...2.2.2)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-05-28 23:44:53 +09:00
dependabot-preview[bot]
e4efe02d99 Bump react-transition-group from 2.5.2 to 2.9.0 (#13860) 
Bumps [react-transition-group](https://github.com/reactjs/react-transition-group) from 2.5.2 to 2.9.0.
- [Release notes](https://github.com/reactjs/react-transition-group/releases)
- [Changelog](https://github.com/reactjs/react-transition-group/blob/master/CHANGELOG.md)
- [Commits](https://github.com/reactjs/react-transition-group/compare/v2.5.2...v2.9.0)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-05-28 23:38:51 +09:00
dependabot-preview[bot]
f7be069124 Bump eslint-import-resolver-node from 0.3.2 to 0.3.3 (#13865) 
Bumps [eslint-import-resolver-node](https://github.com/benmosher/eslint-plugin-import) from 0.3.2 to 0.3.3.
- [Release notes](https://github.com/benmosher/eslint-plugin-import/releases)
- [Changelog](https://github.com/benmosher/eslint-plugin-import/blob/master/CHANGELOG.md)
- [Commits](https://github.com/benmosher/eslint-plugin-import/compare/v0.3.2...resolvers/node/v0.3.3)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-05-28 23:34:01 +09:00
dependabot-preview[bot]
9c3282539a Bump spdx-correct from 3.1.0 to 3.1.1 (#13868) 
Bumps [spdx-correct](https://github.com/jslicense/spdx-correct.js) from 3.1.0 to 3.1.1.
- [Release notes](https://github.com/jslicense/spdx-correct.js/releases)
- [Commits](https://github.com/jslicense/spdx-correct.js/compare/v3.1.0...v3.1.1)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-05-28 23:30:58 +09:00
dependabot-preview[bot]
c244b4c13e Bump yaml from 1.9.2 to 1.10.0 (#13866) 
Bumps [yaml](https://github.com/eemeli/yaml) from 1.9.2 to 1.10.0.
- [Release notes](https://github.com/eemeli/yaml/releases)
- [Commits](https://github.com/eemeli/yaml/compare/v1.9.2...v1.10.0)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-05-28 23:28:06 +09:00
dependabot-preview[bot]
d284e852fc Bump watchpack from 1.6.1 to 1.7.2 (#13869) 
Bumps [watchpack](https://github.com/webpack/watchpack) from 1.6.1 to 1.7.2.
- [Release notes](https://github.com/webpack/watchpack/releases)
- [Commits](https://github.com/webpack/watchpack/compare/v1.6.1...v1.7.2)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-05-28 23:21:59 +09:00
dependabot-preview[bot]
129cb2cf4b Bump node-releases from 1.1.55 to 1.1.56 (#13864) 
Bumps [node-releases](https://github.com/chicoxyzzy/node-releases) from 1.1.55 to 1.1.56.
- [Release notes](https://github.com/chicoxyzzy/node-releases/releases)
- [Commits](https://github.com/chicoxyzzy/node-releases/compare/v1.1.55...v1.1.56)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-05-28 23:20:46 +09:00
dependabot-preview[bot]
7dbcb43649 Bump compression-webpack-plugin from 3.1.0 to 4.0.0 (#13863) 
Bumps [compression-webpack-plugin](https://github.com/webpack-contrib/compression-webpack-plugin) from 3.1.0 to 4.0.0.
- [Release notes](https://github.com/webpack-contrib/compression-webpack-plugin/releases)
- [Changelog](https://github.com/webpack-contrib/compression-webpack-plugin/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/compression-webpack-plugin/compare/v3.1.0...v4.0.0)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-05-28 23:20:20 +09:00
dependabot-preview[bot]
2a05c6091d Bump tesseract.js from 2.0.0-alpha.16 to 2.1.1 (#13859) 
Bumps [tesseract.js](https://github.com/naptha/tesseract.js) from 2.0.0-alpha.16 to 2.1.1.
- [Release notes](https://github.com/naptha/tesseract.js/releases)
- [Commits](https://github.com/naptha/tesseract.js/compare/v2.0.0-alpha.16...v2.1.1)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-05-28 23:18:32 +09:00
dependabot-preview[bot]
67075b74d4 Bump jsx-ast-utils from 2.2.3 to 2.3.0 (#13858) 
Bumps [jsx-ast-utils](https://github.com/evcohen/jsx-ast-utils) from 2.2.3 to 2.3.0.
- [Release notes](https://github.com/evcohen/jsx-ast-utils/releases)
- [Changelog](https://github.com/jsx-eslint/jsx-ast-utils/blob/master/CHANGELOG.md)
- [Commits](https://github.com/evcohen/jsx-ast-utils/compare/2.2.3...2.3.0)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-05-28 23:15:44 +09:00
dependabot-preview[bot]
0eb4c2d1e3 Bump memoize-one from 5.0.4 to 5.1.1 (#13857) 
Bumps [memoize-one](https://github.com/alexreardon/memoize-one) from 5.0.4 to 5.1.1.
- [Release notes](https://github.com/alexreardon/memoize-one/releases)
- [Commits](https://github.com/alexreardon/memoize-one/compare/v5.0.4...v5.1.1)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-05-28 23:13:01 +09:00
dependabot-preview[bot]
ebe0135057 Bump jest-leak-detector from 25.4.0 to 25.5.0 (#13856) 
Bumps [jest-leak-detector](https://github.com/facebook/jest/tree/HEAD/packages/jest-leak-detector) from 25.4.0 to 25.5.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/v25.5.0/packages/jest-leak-detector)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-05-28 23:12:09 +09:00
dependabot-preview[bot]
86a46c9a52 Bump browserify-sign from 4.1.0 to 4.2.0 (#13854) 
Bumps [browserify-sign](https://github.com/crypto-browserify/browserify-sign) from 4.1.0 to 4.2.0.
- [Release notes](https://github.com/crypto-browserify/browserify-sign/releases)
- [Commits](https://github.com/crypto-browserify/browserify-sign/compare/v4.1.0...v4.2.0)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-05-28 23:11:35 +09:00
dependabot-preview[bot]
3f28b89ed1 Bump events from 3.0.0 to 3.1.0 (#13852) 
Bumps [events](https://github.com/Gozala/events) from 3.0.0 to 3.1.0.
- [Release notes](https://github.com/Gozala/events/releases)
- [Changelog](https://github.com/Gozala/events/blob/master/History.md)
- [Commits](https://github.com/Gozala/events/compare/v3.0.0...v3.1.0)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-05-28 23:03:16 +09:00
Thibaut Girka
e8714530a4 Fix local-only hashtag columns 2020-05-28 15:21:16 +02:00
Thibaut Girka
7a74e46b77 Fix one import being made on mastodon's codebase instead of glitch-soc's 2020-05-28 15:14:12 +02:00
ThibG
39aa6301eb Merge pull request #1337 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2020-05-28 14:53:36 +02:00
Mélanie Chauvel
0b01492276 [Glitch] Change wording from “Hide media” to “Hide image/images” in Web UI 
Port 40d81620b0 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-05-28 14:08:05 +02:00
Takeshi Umeda
44ea965557 [Glitch] Fix local streaming of hashtag timelines 
Port 3a1a21ad57 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-05-28 14:05:21 +02:00
Thibaut Girka
ef6bfaf12e Merge branch 'master' into glitch-soc/merge-upstream 2020-05-28 13:44:57 +02:00
dependabot-preview[bot]
57e5e65687 Bump yargs-parser from 13.1.1 to 13.1.2 (#13862) 
Bumps [yargs-parser](https://github.com/yargs/yargs-parser) from 13.1.1 to 13.1.2.
- [Release notes](https://github.com/yargs/yargs-parser/releases)
- [Changelog](https://github.com/yargs/yargs-parser/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yargs/yargs-parser/commits)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-05-28 13:03:03 +02:00
dependabot-preview[bot]
a38c1a9966 Bump sass from 1.26.3 to 1.26.5 (#13855) 
Bumps [sass](https://github.com/sass/dart-sass) from 1.26.3 to 1.26.5.
- [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.26.3...1.26.5)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-05-28 13:02:34 +02:00
dependabot-preview[bot]
b87b868141 Bump css-loader from 3.4.2 to 3.5.3 (#13853) 
Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 3.4.2 to 3.5.3.
- [Release notes](https://github.com/webpack-contrib/css-loader/releases)
- [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/css-loader/compare/v3.4.2...v3.5.3)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-05-28 13:01:41 +02:00
dependabot-preview[bot]
80277eb5a2 Bump external-editor from 3.0.3 to 3.1.0 (#13851) 
Bumps [external-editor](https://github.com/mrkmg/node-external-editor) from 3.0.3 to 3.1.0.
- [Release notes](https://github.com/mrkmg/node-external-editor/releases)
- [Changelog](https://github.com/mrkmg/node-external-editor/blob/master/.release.json)
- [Commits](https://github.com/mrkmg/node-external-editor/compare/3.0.3...3.1.0)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-05-28 13:01:17 +02:00
dependabot-preview[bot]
ca7e661000 Bump uuid from 8.0.0 to 8.1.0 (#13867) 
Bumps [uuid](https://github.com/uuidjs/uuid) from 8.0.0 to 8.1.0.
- [Release notes](https://github.com/uuidjs/uuid/releases)
- [Changelog](https://github.com/uuidjs/uuid/blob/master/CHANGELOG.md)
- [Commits](https://github.com/uuidjs/uuid/compare/v8.0.0...v8.1.0)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-05-28 12:58:58 +02:00
dependabot-preview[bot]
63eedd6f97 Bump rack-attack from 6.3.0 to 6.3.1 (#13849) 
Bumps [rack-attack](https://github.com/kickstarter/rack-attack) from 6.3.0 to 6.3.1.
- [Release notes](https://github.com/kickstarter/rack-attack/releases)
- [Changelog](https://github.com/kickstarter/rack-attack/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kickstarter/rack-attack/compare/v6.3.0...v6.3.1)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-05-28 12:58:23 +02:00
ThibG
bdc60d7c5d Bump wicg-inert to 3.0.3 (#13878) 
Not sure why dependabot hasn't made a PR for this yet, but there is a new
version of wicg-inert, which does not try to dynamically insert styles
anymore when those styles already exist. This will get rid of some of the
CSP violation warnings we get since getting rid of 'unsafe-inline'.
 2020-05-28 12:57:42 +02:00
Ben Lubar
ead09f5ddc Fix exception when trying to serialize posts with <a> tags in them without hrefs (#1334) 
* fix exception when trying to serialize posts with <a> tags in them without hrefs

* Add tests

Co-authored-by: Thibaut Girka <thib@sitedethib.com>
 2020-05-28 12:47:40 +02:00
Thibaut Girka
c8cee24cb3 Fix Cmd-Enter not working to send toot 
Fixes #1333
 2020-05-26 10:15:35 +02:00
dependabot-preview[bot]
9efc38c62e Bump rubocop from 0.83.0 to 0.84.0 (#13843) 
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.83.0 to 0.84.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.83.0...v0.84.0)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-05-25 21:57:53 +09:00
dependabot-preview[bot]
8d11d7e5a1 Bump sidekiq-unique-jobs from 6.0.21 to 6.0.22 (#13845) 
Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs) from 6.0.21 to 6.0.22.
- [Release notes](https://github.com/mhenrixon/sidekiq-unique-jobs/releases)
- [Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v6.0.21...v6.0.22)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-05-25 21:57:29 +09:00
dependabot-preview[bot]
406fc0ce2b Bump aws-sdk-s3 from 1.64.0 to 1.66.0 (#13847) 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.64.0 to 1.66.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/compare/v1.64.0...v1.66.0)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-05-25 21:56:51 +09:00
dependabot-preview[bot]
9dc05d7c61 Bump pghero from 2.4.2 to 2.5.0 (#13848) 
Bumps [pghero](https://github.com/ankane/pghero) from 2.4.2 to 2.5.0.
- [Release notes](https://github.com/ankane/pghero/releases)
- [Changelog](https://github.com/ankane/pghero/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ankane/pghero/compare/v2.4.2...v2.5.0)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-05-25 21:56:04 +09:00
dependabot-preview[bot]
10fc12a7b0 Bump rails from 5.2.4.2 to 5.2.4.3 (#13844) 
Bumps [rails](https://github.com/rails/rails) from 5.2.4.2 to 5.2.4.3.
- [Release notes](https://github.com/rails/rails/releases)
- [Commits](https://github.com/rails/rails/compare/v5.2.4.2...v5.2.4.3)

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-05-25 14:02:19 +02:00
Mélanie Chauvel
40d81620b0 Change wording from “Hide media” to “Hide image/images” in Web UI (#13834) 2020-05-25 12:30:34 +02:00
Takeshi Umeda
8e056bd82e Fix csv upload (#13835) 2020-05-24 09:15:23 +02:00
dependabot[bot]
51d8964b93 Bump puma from 4.3.3 to 4.3.5 (#13823) 
Bumps [puma](https://github.com/puma/puma) from 4.3.3 to 4.3.5.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/commits)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-05-23 09:44:29 +02:00
Takeshi Umeda
1c434615b3 Fix workaround for Elasticsearch 7.x (#13828) 2020-05-23 05:48:14 +02:00
Takeshi Umeda
e6706d171a Fix searchable status without explicitly mentioning it (#13829) 2020-05-23 05:47:25 +02:00