about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2019-11-13Merge branch 'glitch' into productionReverite
2019-11-07Merge pull request #1243 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-11-07Fix build with new sass-loaderThibaut Girka
2019-11-07[Glitch] Minor improvements to poll composing UIThibaut Girka
Port 7cdb8c10e97fe9e22411efef4986e6393247e0ee to glitch-soc
2019-11-07[Glitch] Fix WebUI allowing to upload more items than the limitThibG
Port 66684c489c3c0bde752d107b02fc3bd6cbcacf04 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-11-07Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - `app/javascript/mastodon/features/compose/components/poll_form.js` conflict because of the poll option limit being different than upstream's
2019-11-07Merge pull request #1242 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-11-07Change CircleCI config to build assets with NODE_ENV=testThibaut Girka
This should avoid minimization and other expensive webpack transformations which aren't useful for running tests.
2019-11-07Disable minimization in test environmentThibaut Girka
2019-11-07Fix relationship caches being broken as result of a follow request (#12299)ThibG
2019-11-07Fix WebUI allowing to upload more items than the limit (#12300)ThibG
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-07Minor improvements to poll composing UI (#12319)ThibG
- Disable the “add option” button instead of hiding it - Allow poll option inputs to scale to full width
2019-11-07Fix various issues with account migration (#12301)ThibG
* 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-06include jortage in cspReverite
2019-11-07Bump sass-loader from 7.1.0 to 8.0.0 (#12027)dependabot-preview[bot]
* 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-07Bump @babel/runtime from 7.6.0 to 7.7.1 (#12317)dependabot-preview[bot]
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-07Bump @babel/preset-env from 7.6.0 to 7.7.1 (#12318)dependabot-preview[bot]
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-07Bump tesseract.js from 2.0.0-alpha.16 to 2.0.0-beta.2 (#12311)dependabot-preview[bot]
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-07Bump glob from 7.1.4 to 7.1.5 (#12312)dependabot-preview[bot]
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-07Bump sass from 1.23.1 to 1.23.3 (#12314)dependabot-preview[bot]
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-07Bump @babel/preset-react from 7.0.0 to 7.6.3 (#12315)dependabot-preview[bot]
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-06[Glitch] Fix notification message for own pollThibaut Girka
Port a4301b52026827ad1cd90bfc77fabda92785a4c3 and be93318c0538ccfc41997301800dc347ad0f4271 to glitch-soc
2019-11-06[Glitch] fix: support KaiOS arrow navigation on public pagesNolan Lawson
Port 1e232e455cfa75621264a0b90b783b21ebd5ea87 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-11-06[Glitch] Fix filtered out items being counted as pending itemsThibG
Port 3db3c107629a96c60657a615d186e32bb8a5476a to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-11-06[Glitch] Use inert polyfillGabriel Rubens
Port 3cc9ff872f676d7ce56f7cf7875f85f804ea20a9 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-11-06[Glitch] Add support for submitting media description with ctrl+enterThibG
Port 7488a9e1547733a750160b202942c21f27ffeff2 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-11-06[Glitch] dont crash with null-refHinaloe
Port 8568018935adbf5f59d9bf9a64069d7fa9821b04 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-11-06[Glitch] Fix an issue where polls with 'expires_at' not set expiredTakeshi Umeda
Port 5b46467474dd88e1563561bf50643324b4f021e8 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-11-06Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - `package.json`
2019-11-05Bump webpack-cli from 3.3.9 to 3.3.10 (#12297)dependabot-preview[bot]
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-05Bump react-overlays from 0.8.3 to 0.9.1 (#12298)dependabot-preview[bot]
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-04Bump @babel/plugin-proposal-object-rest-spread from 7.5.5 to 7.6.2 (#12296)dependabot-preview[bot]
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-04Bump webpack-dev-server from 3.8.1 to 3.9.0 (#12293)dependabot-preview[bot]
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-04Bump react-test-renderer from 16.10.2 to 16.11.0 (#12295)dependabot-preview[bot]
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-04Bump wavesurfer.js from 3.0.0 to 3.2.0 (#12292)dependabot-preview[bot]
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-04Bump react-toggle from 4.0.2 to 4.1.1 (#12291)dependabot-preview[bot]
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-04Bump react-dom from 16.10.2 to 16.11.0 (#12289)dependabot-preview[bot]
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-04Use inert polyfill (#12209)Gabriel Rubens
* Inserting wicg-inert in project * Import wicg-inert in moda_root component * Update yarn.lock * Solving code style problems * Removing package-lock
2019-11-04Integrate own poll's translation into own_poll. (#12231)mayaeh
run `yarn manage:translations en`
2019-11-04fix: support KaiOS arrow navigation on public pages (#12251)Nolan Lawson
2019-11-04Fix code referencing wrong class (#12263)ThibG
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-04Fix filtered out items being counted as pending items (#12266)ThibG
2019-11-04Add abilityto add oneself to lists (#12271)ThibG
* 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-04Fix notification filters not applying to poll options (#12269)ThibG
2019-11-04Fix crowdin badge display in CONTRIBUTING.md (#12273)Scott Sweeny
* Fix crowdin badge display in CONTRIBUTING.md The Crowdin localization badge in `CONTRIBUTING.md` appeared to have the wrong markup around it. This manifested in some extra brackets and an unformatted `crowdin` string. * Make Crowdin badge a link to the Mastodon project
2019-11-04Fix remote media descriptions being cut off at 420 chars (#12262)ThibG
* Fix remote media descriptions being cut off at 420 chars Fixes #12258 * Fix tests
2019-11-04Add support for submitting media description with ctrl+enter (#12272)ThibG
2019-11-04dont crash with null-ref (#12274)Hinaloe
2019-11-04Dockerfile: put back EXPOSE directive (#12279)David Caldwell
[Rkt](https://coreos.com/rkt) doesn't allow ports to be exposed to containers unless they are declared in the container manifest. Re-adding EXPOSE back in (removed in 1dbf993bce5627e2c3fcab6e9c63b5279dff018a) allows the container to be used on rkt based systems.
2019-11-04Add `tootctl media lookup` command (#12283)Nathaniel Suchy
* Add a lookup tool to the media cli * Improved lookup logic * Clarified wording in the output * Code style changes * Code style changes * Code style changes * Code style changes * Add error handling code incase an attachment isn't found * Code style changes * Code style changes * Make requested changes * Fix styling issues * Handle other media types * Remove an inadvertently added log * Make requested changes * Make the code safe no matter what the path, S3 or not * Code style changes * Code style changes * Replace select method with Ruby Enumerable grep method
generated by cgit-pink (git 2.37.1) at 2024-07-03 11:50:53 +0000