ThibG
dfea7368c9
Add bookmarks ( #7107 )
* Add backend support for bookmarks
Bookmarks behave like favourites, except they aren't shared with other
users and do not have an associated counter.
* Add spec for bookmark endpoints
* Add front-end support for bookmarks
* Introduce OAuth scopes for bookmarks
* Add bookmarks to archive takeout
* Fix migration
* Coding style fixes
* Fix rebase issue
* Update bookmarked_statuses to latest UI changes
* Update bookmark actions to properly reflect status changes in state
* Add bookmarks item to single-column layout
* Make active bookmarks red
5 years ago
Yamagishi Kazutoshi
afb398b583
Change to always returns html document in error pages ( #12214 )
5 years ago
Yamagishi Kazutoshi
6c60ccee8a
Add config for issue template ( #12306 )
5 years ago
sclaire-1
1e96f7d067
Edit introduction of README.md ( #12372 )
The introductory paragraph has been edited to be more cohesive.
5 years ago
dependabot-preview[bot]
c31bc41a02
Bump @babel/core from 7.4.5 to 7.7.2 ( #12350 )
Bumps [@babel/core](https://github.com/babel/babel ) from 7.4.5 to 7.7.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.4.5...v7.7.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
dependabot-preview[bot]
ee820caf97
Bump @babel/plugin-proposal-decorators from 7.6.0 to 7.7.0 ( #12348 )
Bumps [@babel/plugin-proposal-decorators](https://github.com/babel/babel ) from 7.6.0 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.6.0...v7.7.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
dependabot-preview[bot]
acf132b477
Bump @babel/runtime from 7.7.1 to 7.7.2 ( #12351 )
Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime ) from 7.7.1 to 7.7.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/commits/v7.7.2/packages/babel-runtime )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
dependabot-preview[bot]
4cade42b02
Bump enzyme-adapter-react-16 from 1.14.0 to 1.15.1 ( #12353 )
Bumps [enzyme-adapter-react-16](https://github.com/airbnb/enzyme/tree/HEAD/packages/enzyme-adapter-react-16 ) from 1.14.0 to 1.15.1.
- [Release notes](https://github.com/airbnb/enzyme/releases )
- [Changelog](https://github.com/airbnb/enzyme/blob/master/CHANGELOG.md )
- [Commits](https://github.com/airbnb/enzyme/commits/enzyme-adapter-react-16@1.15.1/packages/enzyme-adapter-react-16 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
dependabot-preview[bot]
58faefe0a5
Bump babel-plugin-react-intl from 3.1.3 to 3.4.1 ( #12352 )
Bumps [babel-plugin-react-intl](https://github.com/formatjs/formatjs ) from 3.1.3 to 3.4.1.
- [Release notes](https://github.com/formatjs/formatjs/releases )
- [Commits](https://github.com/formatjs/formatjs/compare/babel-plugin-react-intl@3.1.3...babel-plugin-react-intl@3.4.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
dependabot-preview[bot]
a3a109d12c
Bump parallel from 1.17.0 to 1.18.0 ( #12358 )
Bumps [parallel](https://github.com/grosser/parallel ) from 1.17.0 to 1.18.0.
- [Release notes](https://github.com/grosser/parallel/releases )
- [Commits](https://github.com/grosser/parallel/compare/v1.17.0...v1.18.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
dependabot-preview[bot]
b0c4eb28e0
Bump rubocop from 0.75.1 to 0.76.0 ( #12355 )
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.75.1 to 0.76.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.75.1...v0.76.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
dependabot-preview[bot]
6fa2f3eba3
Bump faker from 2.6.0 to 2.7.0 ( #12354 )
Bumps [faker](https://github.com/faker-ruby/faker ) from 2.6.0 to 2.7.0.
- [Release notes](https://github.com/faker-ruby/faker/releases )
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/faker-ruby/faker/compare/v2.6.0...v2.7.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
dependabot-preview[bot]
169ce493a7
Bump annotate from 3.0.2 to 3.0.3 ( #12359 )
Bumps [annotate](https://github.com/ctran/annotate_models ) from 3.0.2 to 3.0.3.
- [Release notes](https://github.com/ctran/annotate_models/releases )
- [Changelog](https://github.com/ctran/annotate_models/blob/develop/CHANGELOG.rdoc )
- [Commits](https://github.com/ctran/annotate_models/compare/v3.0.2...v3.0.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
dependabot-preview[bot]
e311131176
Bump stoplight from 2.1.3 to 2.2.0 ( #12360 )
Bumps [stoplight](https://github.com/orgsync/stoplight ) from 2.1.3 to 2.2.0.
- [Release notes](https://github.com/orgsync/stoplight/releases )
- [Changelog](https://github.com/orgsync/stoplight/blob/master/CHANGELOG.md )
- [Commits](https://github.com/orgsync/stoplight/compare/v2.1.3...v2.2.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
dependabot-preview[bot]
bc1af899b1
Bump react-notification from 6.8.4 to 6.8.5 ( #12349 )
Bumps [react-notification](https://github.com/pburtchaell/react-notification ) from 6.8.4 to 6.8.5.
- [Release notes](https://github.com/pburtchaell/react-notification/releases )
- [Commits](https://github.com/pburtchaell/react-notification/compare/6.8.4...6.8.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
dependabot-preview[bot]
6cbaaac270
Bump uuid from 3.3.2 to 3.3.3 ( #12347 )
Bumps [uuid](https://github.com/kelektiv/node-uuid ) from 3.3.2 to 3.3.3.
- [Release notes](https://github.com/kelektiv/node-uuid/releases )
- [Changelog](https://github.com/kelektiv/node-uuid/blob/master/CHANGELOG.md )
- [Commits](https://github.com/kelektiv/node-uuid/compare/v3.3.2...v3.3.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
5 years ago
dependabot-preview[bot]
11cb5e6521
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>
5 years ago
dependabot-preview[bot]
ac1709c3e1
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>
5 years ago
dependabot-preview[bot]
c6960938dd
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>
5 years ago
ThibG
a2014830c2
Fix broken admin audit log in whitelist mode ( #12303 )
5 years ago
ThibG
0d6da8892a
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
5 years ago
ThibG
0d5f3ae331
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`
5 years ago
koyu
823dcc4dc6
Updated Twemoji to 12.1.3 ( #12342 )
5 years ago
dependabot-preview[bot]
05ae908d3f
[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>
5 years ago
ThibG
707c4918b2
Merge pull request #1243 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
5 years ago
Darius Kazemi
0092096328
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.
5 years ago
Thibaut Girka
04125c9c0d
Fix build with new sass-loader
5 years ago
Thibaut Girka
2c6d8ebf02
[Glitch] Minor improvements to poll composing UI
Port 7cdb8c10e9
to glitch-soc
5 years ago
ThibG
44acac0dcd
[Glitch] Fix WebUI allowing to upload more items than the limit
Port 66684c489c
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years ago
Thibaut Girka
83774367d2
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
5 years ago
ThibG
dd2ec970db
Merge pull request #1242 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
5 years ago
Thibaut Girka
f63dad5294
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.
5 years ago
Thibaut Girka
42dff261d6
Disable minimization in test environment
5 years ago
ThibG
514e427bd2
Fix relationship caches being broken as result of a follow request ( #12299 )
5 years ago
ThibG
66684c489c
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.
5 years ago
ThibG
7cdb8c10e9
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
5 years ago
ThibG
66c1fe0495
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
5 years ago
dependabot-preview[bot]
699427777a
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
5 years ago
dependabot-preview[bot]
0e4e536036
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>
5 years ago
dependabot-preview[bot]
2a08acac4a
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>
5 years ago
dependabot-preview[bot]
0c20442605
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>
5 years ago
dependabot-preview[bot]
4c86b1181d
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>
5 years ago
dependabot-preview[bot]
c4cf93f787
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>
5 years ago
dependabot-preview[bot]
80b1a72742
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>
5 years ago
Thibaut Girka
84a27a08df
[Glitch] Fix notification message for own poll
Port a4301b5202
and be93318c05
to glitch-soc
5 years ago
Nolan Lawson
ec567337dc
[Glitch] fix: support KaiOS arrow navigation on public pages
Port 1e232e455c
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years ago
ThibG
734181c3bf
[Glitch] Fix filtered out items being counted as pending items
Port 3db3c10762
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years ago
Gabriel Rubens
d76ab55608
[Glitch] Use inert polyfill
Port 3cc9ff872f
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years ago
ThibG
ea55f70f97
[Glitch] Add support for submitting media description with ctrl+enter
Port 7488a9e154
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years ago
Hinaloe
f940c5a1fb
[Glitch] dont crash with null-ref
Port 8568018935
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years ago