f328f2faa3
Merge pull request #1347 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
5 years ago
c225ac8b9e
[Glitch] Adjust flash alert contrast for better readability
...
Port b4a8400afd
5 years ago
a8559458c3
[Glitch] Allow Ctrl-click to keep EmojiPicker window open
...
Port 64154c5161
5 years ago
89de02f7aa
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
1f94f4009e
Improve appearance of notification cleaning UI
...
- Use smaller font-size for consistency with the rest of the UI
- Make better use of the horizontal space when available
5 years ago
51ff679b9d
Fix admin page crashing when trying to block an invalid domain name ( #13884 )
...
* Fix admin page crashing when trying to block an invalid domain name
Fixes #13880
* Fix trailing and leading spaces not being properly stripped for domain blocks
5 years ago
eeddb1a624
Fix unsent toot confirmation dialog not popping up in single column ( #13888 )
5 years ago
b4a8400afd
Adjust flash alert contrast for better readability ( #13892 )
5 years ago
64154c5161
Allow Ctrl-click to keep EmojiPicker window open ( #13896 )
5 years ago
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).
5 years ago
ddcd9fe9f0
Fix backup archive including outgoing-only content warnings
5 years ago
9e04b9d8df
Add support for setting Content Warning for CW-less outgoing toots
5 years ago
041c769182
Move glitch-specific ruby-side locales to their own files
5 years ago
491588f6b4
Merge pull request #1341 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
5 years ago
9707dbee6f
[Glitch] Fix timeline markers in Firefox
...
Port cc650bc023
5 years ago
9bd30b8dd5
[Glitch] Fix timeline markers not working on Chrome
...
Port 5aff2a6957
5 years ago
60b43050cb
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
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.
5 years ago
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
5 years ago
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>
5 years ago
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>
5 years ago
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>
5 years ago
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>
5 years ago
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>
5 years ago
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>
5 years ago
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>
5 years ago
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>
5 years ago
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>
5 years ago
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>
5 years ago
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>
5 years ago
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>
5 years ago
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>
5 years ago
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>
5 years ago
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>
5 years ago
e8714530a4
Fix local-only hashtag columns
5 years ago
7a74e46b77
Fix one import being made on mastodon's codebase instead of glitch-soc's
5 years ago
39aa6301eb
Merge pull request #1337 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
5 years ago
0b01492276
[Glitch] Change wording from “Hide media” to “Hide image/images” in Web UI
...
Port 40d81620b0
5 years ago
44ea965557
[Glitch] Fix local streaming of hashtag timelines
...
Port 3a1a21ad57
5 years ago
ef6bfaf12e
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
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>
5 years ago
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>
5 years ago
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>
5 years ago
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>
5 years ago
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>
5 years ago
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>
5 years ago
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'.
5 years ago
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>
5 years ago
c8cee24cb3
Fix Cmd-Enter not working to send toot
...
Fixes #1333
5 years ago
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>
5 years ago
ThibG