microblog

Author	SHA1	Message	Date
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
Takeshi Umeda	f2fc7246e1	[Glitch] Fix an issue where polls with 'expires_at' not set expired Port `5b46467474` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	5 years ago
Thibaut Girka	0ae7d84273	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `package.json`	5 years ago
dependabot-preview[bot]	42d9ca21de	Bump webpack-cli from 3.3.9 to 3.3.10 (#12297 ) 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>	5 years ago
dependabot-preview[bot]	d84aca66ea	Bump react-overlays from 0.8.3 to 0.9.1 (#12298 ) 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>	5 years ago
dependabot-preview[bot]	674a630bf1	Bump @babel/plugin-proposal-object-rest-spread from 7.5.5 to 7.6.2 (#12296 ) 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>	5 years ago
dependabot-preview[bot]	0a9c2db59b	Bump webpack-dev-server from 3.8.1 to 3.9.0 (#12293 ) 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>	5 years ago
dependabot-preview[bot]	5c537401d8	Bump react-test-renderer from 16.10.2 to 16.11.0 (#12295 ) 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>	5 years ago
dependabot-preview[bot]	c21c7a2b9b	Bump wavesurfer.js from 3.0.0 to 3.2.0 (#12292 ) 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>	5 years ago
dependabot-preview[bot]	086a9211f3	Bump react-toggle from 4.0.2 to 4.1.1 (#12291 ) 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>	5 years ago
dependabot-preview[bot]	a537d083dd	Bump react-dom from 16.10.2 to 16.11.0 (#12289 ) 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>	5 years ago
Gabriel Rubens	3cc9ff872f	Use inert polyfill (#12209 ) * Inserting wicg-inert in project * Import wicg-inert in moda_root component * Update yarn.lock * Solving code style problems * Removing package-lock	5 years ago
mayaeh	be93318c05	Integrate own poll's translation into own_poll. (#12231 ) run `yarn manage:translations en`	5 years ago
Nolan Lawson	1e232e455c	fix: support KaiOS arrow navigation on public pages (#12251 )	5 years ago
ThibG	e37358b3bc	Fix code referencing wrong class (#12263 ) 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.	5 years ago
ThibG	3db3c10762	Fix filtered out items being counted as pending items (#12266 )	5 years ago
ThibG	65e13cfacf	Add abilityto add oneself to lists (#12271 ) * Add ability to add oneself to lists * Change search results to include oneself when searching through followers * Mark follow relation as optional in ListAccount	5 years ago
ThibG	1a12943924	Fix notification filters not applying to poll options (#12269 )	5 years ago
Scott Sweeny	1018097c40	Fix crowdin badge display in CONTRIBUTING.md (#12273 ) * 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	5 years ago
ThibG	650820d62d	Fix remote media descriptions being cut off at 420 chars (#12262 ) * Fix remote media descriptions being cut off at 420 chars Fixes #12258 * Fix tests	5 years ago
ThibG	7488a9e154	Add support for submitting media description with ctrl+enter (#12272 )	5 years ago
Hinaloe	8568018935	dont crash with null-ref (#12274 )	5 years ago
David Caldwell	3b609da9bd	Dockerfile: put back EXPOSE directive (#12279 ) [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 `1dbf993bce`) allows the container to be used on rkt based systems.	5 years ago
Nathaniel Suchy	23ed9303b8	Add `tootctl media lookup` command (#12283 ) * 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	5 years ago
Nathaniel Suchy	71cd41aebf	Update .gitignore (#12287 )	5 years ago
dependabot-preview[bot]	685b0db882	Bump aws-sdk-s3 from 1.48.0 to 1.52.0 (#12250 ) Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.48.0 to 1.52.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.48.0...v1.52.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
dependabot-preview[bot]	741a85c064	Bump annotate from 2.7.5 to 3.0.2 (#12100 ) Bumps [annotate](https://github.com/ctran/annotate_models) from 2.7.5 to 3.0.2. - [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/v2.7.5...v3.0.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
dependabot-preview[bot]	0745fa8449	[Security] Bump simple_form from 4.1.0 to 5.0.1 (#12099 ) Bumps [simple_form](https://github.com/plataformatec/simple_form) from 4.1.0 to 5.0.1. This update includes a security fix. - [Release notes](https://github.com/plataformatec/simple_form/releases) - [Changelog](https://github.com/plataformatec/simple_form/blob/master/CHANGELOG.md) - [Commits](https://github.com/plataformatec/simple_form/compare/v4.1.0...v5.0.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
dependabot-preview[bot]	291106e11c	Bump rspec-rails from 3.8.2 to 3.9.0 (#12241 ) Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 3.8.2 to 3.9.0. - [Release notes](https://github.com/rspec/rspec-rails/releases) - [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md) - [Commits](https://github.com/rspec/rspec-rails/compare/v3.8.2...v3.9.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
dependabot-preview[bot]	52c9044ea9	Bump dotenv from 8.0.0 to 8.2.0 (#12235 ) Bumps [dotenv](https://github.com/motdotla/dotenv) from 8.0.0 to 8.2.0. - [Release notes](https://github.com/motdotla/dotenv/releases) - [Changelog](https://github.com/motdotla/dotenv/blob/master/CHANGELOG.md) - [Commits](https://github.com/motdotla/dotenv/compare/v8.0.0...v8.2.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago

1 2 3 4 5 ...

10763 Commits (83774367d25fd5ad3f9a7b103bea30c13c9e03d8) All Branches Search

10763 Commits (83774367d25fd5ad3f9a7b103bea30c13c9e03d8)

All Branches