about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2020-05-30Move glitch-specific ruby-side locales to their own filesThibaut Girka
2020-05-29Merge pull request #1341 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2020-05-29[Glitch] Fix timeline markers in FirefoxThibG
Port cc650bc023e00d07c5796b7602d86597bb437f45 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-05-29[Glitch] Fix timeline markers not working on ChromeThibG
Port 5aff2a6957e861162d67c4610277e9bb2a6f8186 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-05-29Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2020-05-29Fix timeline markers in Firefox (regression from #13887) (#13889)ThibG
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-29Fix timeline markers not working on Chrome (#13887)ThibG
* 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-28[Security] Bump kaminari from 1.2.0 to 1.2.1 (#13886)dependabot-preview[bot]
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-28Bump is-promise from 2.1.0 to 2.2.2 (#13870)dependabot-preview[bot]
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-28Bump react-transition-group from 2.5.2 to 2.9.0 (#13860)dependabot-preview[bot]
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-28Bump eslint-import-resolver-node from 0.3.2 to 0.3.3 (#13865)dependabot-preview[bot]
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-28Bump spdx-correct from 3.1.0 to 3.1.1 (#13868)dependabot-preview[bot]
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-28Bump yaml from 1.9.2 to 1.10.0 (#13866)dependabot-preview[bot]
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-28Bump watchpack from 1.6.1 to 1.7.2 (#13869)dependabot-preview[bot]
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-28Bump node-releases from 1.1.55 to 1.1.56 (#13864)dependabot-preview[bot]
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-28Bump compression-webpack-plugin from 3.1.0 to 4.0.0 (#13863)dependabot-preview[bot]
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-28Bump tesseract.js from 2.0.0-alpha.16 to 2.1.1 (#13859)dependabot-preview[bot]
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-28Bump jsx-ast-utils from 2.2.3 to 2.3.0 (#13858)dependabot-preview[bot]
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-28Bump memoize-one from 5.0.4 to 5.1.1 (#13857)dependabot-preview[bot]
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-28Bump jest-leak-detector from 25.4.0 to 25.5.0 (#13856)dependabot-preview[bot]
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-28Bump browserify-sign from 4.1.0 to 4.2.0 (#13854)dependabot-preview[bot]
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-28Bump events from 3.0.0 to 3.1.0 (#13852)dependabot-preview[bot]
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-28Fix local-only hashtag columnsThibaut Girka
2020-05-28Fix one import being made on mastodon's codebase instead of glitch-soc'sThibaut Girka
2020-05-28Merge pull request #1337 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2020-05-28[Glitch] Change wording from “Hide media” to “Hide image/images” in ↵Mélanie Chauvel
Web UI Port 40d81620b00f6c4ed30b78f95b443a08e62ae8fa to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-05-28[Glitch] Fix local streaming of hashtag timelinesTakeshi Umeda
Port 3a1a21ad5725bed7f82b516b4174272c1e931223 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2020-05-28Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2020-05-28Bump yargs-parser from 13.1.1 to 13.1.2 (#13862)dependabot-preview[bot]
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-28Bump sass from 1.26.3 to 1.26.5 (#13855)dependabot-preview[bot]
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-28Bump css-loader from 3.4.2 to 3.5.3 (#13853)dependabot-preview[bot]
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-28Bump external-editor from 3.0.3 to 3.1.0 (#13851)dependabot-preview[bot]
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-28Bump uuid from 8.0.0 to 8.1.0 (#13867)dependabot-preview[bot]
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-28Bump rack-attack from 6.3.0 to 6.3.1 (#13849)dependabot-preview[bot]
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-28Bump wicg-inert to 3.0.3 (#13878)ThibG
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-28Fix exception when trying to serialize posts with <a> tags in them without ↵Ben Lubar
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-26Fix Cmd-Enter not working to send tootThibaut Girka
Fixes #1333
2020-05-25Bump rubocop from 0.83.0 to 0.84.0 (#13843)dependabot-preview[bot]
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-25Bump sidekiq-unique-jobs from 6.0.21 to 6.0.22 (#13845)dependabot-preview[bot]
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-25Bump aws-sdk-s3 from 1.64.0 to 1.66.0 (#13847)dependabot-preview[bot]
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-25Bump pghero from 2.4.2 to 2.5.0 (#13848)dependabot-preview[bot]
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-25Bump rails from 5.2.4.2 to 5.2.4.3 (#13844)dependabot-preview[bot]
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-25Change wording from “Hide media” to “Hide image/images” in Web UI ↵Mélanie Chauvel
(#13834)
2020-05-24Fix csv upload (#13835)Takeshi Umeda
2020-05-23Bump puma from 4.3.3 to 4.3.5 (#13823)dependabot[bot]
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-23Fix workaround for Elasticsearch 7.x (#13828)Takeshi Umeda
2020-05-23Fix searchable status without explicitly mentioning it (#13829)Takeshi Umeda
2020-05-23Fix local streaming of hashtag timelines (#13827)Takeshi Umeda
2020-05-22Bump capybara from 3.32.1 to 3.32.2 (#13789)dependabot-preview[bot]
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.32.1 to 3.32.2. - [Release notes](https://github.com/teamcapybara/capybara/releases) - [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md) - [Commits](https://github.com/teamcapybara/capybara/compare/3.32.1...3.32.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-22Bump electron-to-chromium from 1.3.432 to 1.3.448 (#13819)dependabot-preview[bot]
Bumps [electron-to-chromium](https://github.com/kilian/electron-to-chromium) from 1.3.432 to 1.3.448. - [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.432...v1.3.448) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>