glitchier-soc

Commit Graph

Author	SHA1	Message	Date
Thibaut Girka	e76f4056e5	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - README.md - app/helpers/statuses_helper.rb Upstream moved account helpers to their own file, we had extra helpers there, moved too. - app/lib/sanitize_config.rb - app/models/user.rb - app/serializers/initial_state_serializer.rb - config/locales/simple_form.en.yml - spec/lib/sanitize_config_spec.rb	5 years ago
dependabot-preview[bot]	3dbd4384d8	Bump react-dom from 16.8.6 to 16.10.2 (#12107 ) * Bump react-dom from 16.8.6 to 16.10.2 Bumps [react-dom](https://github.com/facebook/react/tree/HEAD/packages/react-dom) from 16.8.6 to 16.10.2. - [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.10.2/packages/react-dom) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> * update react and react-test-renderer	5 years ago
dependabot-preview[bot]	9483a56c04	Bump react-select from 2.4.4 to 3.0.5 (#11930 ) * Bump react-select from 2.4.4 to 3.0.5 Bumps [react-select](https://github.com/JedWatson/react-select) from 2.4.4 to 3.0.5. - [Release notes](https://github.com/JedWatson/react-select/releases) - [Changelog](https://github.com/JedWatson/react-select/blob/master/.sweet-changelogs.js) - [Commits](https://github.com/JedWatson/react-select/commits) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> * Change import path for react-select	5 years ago
dependabot-preview[bot]	491eb6e37b	Bump sass from 1.22.12 to 1.23.0 (#12108 ) Bumps [sass](https://github.com/sass/dart-sass) from 1.22.12 to 1.23.0. - [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.22.12...1.23.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
dependabot-preview[bot]	a4ecd5dd6a	Bump @clusterws/cws from 0.15.0 to 0.15.2 (#12109 ) Bumps @clusterws/cws from 0.15.0 to 0.15.2. Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
dependabot-preview[bot]	fbac5542ec	Bump eslint from 6.5.0 to 6.5.1 (#12110 ) Bumps [eslint](https://github.com/eslint/eslint) from 6.5.0 to 6.5.1. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v6.5.0...v6.5.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
dependabot-preview[bot]	8f49d709d5	Bump cross-env from 5.2.0 to 6.0.3 (#12112 ) Bumps [cross-env](https://github.com/kentcdodds/cross-env) from 5.2.0 to 6.0.3. - [Release notes](https://github.com/kentcdodds/cross-env/releases) - [Changelog](https://github.com/kentcdodds/cross-env/blob/master/CHANGELOG.md) - [Commits](https://github.com/kentcdodds/cross-env/compare/v5.2.0...v6.0.3) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
Thibaut Girka	9506d9cafc	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - README.md - app/javascript/styles/mastodon/components.scss conflicts caused by image URLs being different - app/models/status.rb as_home_timeline removed, kept glitch-soc-only as_direct_timeline - app/views/statuses/_simple_status.html.haml - config/locales/en.yml some strings were changed upstream - spec/models/status_spec.rb as_home_timeline removed, kept glitch-soc-only as_direct_timeline	5 years ago
dependabot-preview[bot]	4873962e4a	Bump tesseract.js from 2.0.0-alpha.15 to 2.0.0-alpha.16 (#12013 ) Bumps [tesseract.js](https://github.com/naptha/tesseract.js) from 2.0.0-alpha.15 to 2.0.0-alpha.16. - [Release notes](https://github.com/naptha/tesseract.js/releases) - [Commits](https://github.com/naptha/tesseract.js/compare/v2.0.0-alpha.15...v2.0.0-alpha.16) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
dependabot-preview[bot]	dae599ef6b	Bump eslint from 6.4.0 to 6.5.0 (#12017 ) Bumps [eslint](https://github.com/eslint/eslint) from 6.4.0 to 6.5.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v6.4.0...v6.5.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
Thibaut Girka	c2d6ef1b64	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/models/media_attachment.rb Upstream raised max image size from 8MB to 10MB while our limit is configurable. Raised the default to 10MB.	5 years ago
Eugen Rochko	ae4b90354d	Bump webpack from 4.35.3 to 4.41.0 (#12026 ) Fix #12023	5 years ago
Thibaut Girka	cc94c90bf1	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - Gemfile - Gemfile.lock - app/controllers/about_controller.rb - app/controllers/auth/sessions_controller.rb	5 years ago
Eugen Rochko	009f0e0202	Bump set-value from 2.0.0 to 2.0.1 (#11997 )	5 years ago
dependabot-preview[bot]	af62677c9f	Bump eslint from 6.1.0 to 6.4.0 (#11929 ) Bumps [eslint](https://github.com/eslint/eslint) from 6.1.0 to 6.4.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v6.1.0...v6.4.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
dependabot-preview[bot]	65d666e9ae	Bump sass from 1.22.9 to 1.22.12 (#11928 ) Bumps [sass](https://github.com/sass/dart-sass) from 1.22.9 to 1.22.12. - [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.22.9...1.22.12) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
dependabot-preview[bot]	27b2338f65	Bump mini-css-extract-plugin from 0.7.0 to 0.8.0 (#11927 ) Bumps [mini-css-extract-plugin](https://github.com/webpack-contrib/mini-css-extract-plugin) from 0.7.0 to 0.8.0. - [Release notes](https://github.com/webpack-contrib/mini-css-extract-plugin/releases) - [Changelog](https://github.com/webpack-contrib/mini-css-extract-plugin/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/mini-css-extract-plugin/compare/v0.7.0...v0.8.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
dependabot-preview[bot]	28fe02aba3	Bump babel-jest from 24.8.0 to 24.9.0 (#11926 ) Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest) from 24.8.0 to 24.9.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/v24.9.0/packages/babel-jest) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
Thibaut Girka	4837d6275a	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/controllers/auth/sessions_controller.rb Minor conflict due to glitch-soc's theming code	5 years ago
nzws✨	7bfef64877	Fix eslint error of import/no-extraneous-dependencies (#11884 ) * Fix eslint error of import/no-extraneous-dependencies - Add history dependency * refactoring code	5 years ago
dependabot-preview[bot]	dc35bb1ed2	Bump es6-symbol from 3.1.1 to 3.1.2 (#11851 ) Bumps [es6-symbol](https://github.com/medikoo/es6-symbol) from 3.1.1 to 3.1.2. - [Release notes](https://github.com/medikoo/es6-symbol/releases) - [Changelog](https://github.com/medikoo/es6-symbol/blob/master/CHANGELOG.md) - [Commits](https://github.com/medikoo/es6-symbol/compare/v3.1.1...v3.1.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
dependabot-preview[bot]	09785659bf	Bump eslint-plugin-import from 2.18.0 to 2.18.2 (#11849 ) Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import) from 2.18.0 to 2.18.2. - [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/v2.18.0...v2.18.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
Thibaut Girka	2e38d889a3	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - Gemfile - app/controllers/api/v1/search_controller.rb Conflict because we changed the number of default results to be configurable - app/lib/settings/scoped_settings.rb Addition of a new “noindex” site-wide setting, conflict due to our change of the two other site-wide settings (default flavour and skin instead of theme) - spec/controllers/application_controller_spec.rb Addition of a new “noindex” site-wide setting, conflict due to our change of the two other site-wide settings (default flavour and skin instead of theme)	5 years ago
dependabot-preview[bot]	091c47c8c3	Bump jest from 24.8.0 to 24.9.0 (#11781 ) Bumps [jest](https://github.com/facebook/jest) from 24.8.0 to 24.9.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/compare/v24.8.0...v24.9.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
dependabot-preview[bot]	ff95d8fdf5	Bump @babel/preset-env from 7.5.5 to 7.6.0 (#11780 ) Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.5.5 to 7.6.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.6.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
dependabot-preview[bot]	e55dc2bb81	Bump tesseract.js from 2.0.0-alpha.13 to 2.0.0-alpha.15 (#11779 ) Bumps [tesseract.js](https://github.com/naptha/tesseract.js) from 2.0.0-alpha.13 to 2.0.0-alpha.15. - [Release notes](https://github.com/naptha/tesseract.js/releases) - [Commits](https://github.com/naptha/tesseract.js/compare/v2.0.0-alpha.13...v2.0.0-alpha.15) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
Thibaut Girka	eac7c66d2a	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
dependabot-preview[bot]	eab0addad7	Bump babel-eslint from 10.0.2 to 10.0.3 (#11723 ) Bumps [babel-eslint](https://github.com/babel/babel-eslint) from 10.0.2 to 10.0.3. - [Release notes](https://github.com/babel/babel-eslint/releases) - [Commits](https://github.com/babel/babel-eslint/compare/v10.0.2...v10.0.3) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
dependabot-preview[bot]	a651859fd3	Bump @babel/plugin-transform-runtime from 7.4.4 to 7.5.5 (#11725 ) Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel) from 7.4.4 to 7.5.5. - [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.4...v7.5.5) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
Thibaut Girka	449a0727a7	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/models/status.rb - app/services/remove_status_service.rb - db/schema.rb All conflicts were due to the addition of a `deleted_at` attribute to Statuses and reworked database indexes.	5 years ago
dependabot-preview[bot]	a7659b08f8	[Security] Bump mixin-deep from 1.3.1 to 1.3.2 (#11683 ) Bumps [mixin-deep](https://github.com/jonschlinkert/mixin-deep) from 1.3.1 to 1.3.2. This update includes a security fix. - [Release notes](https://github.com/jonschlinkert/mixin-deep/releases) - [Commits](https://github.com/jonschlinkert/mixin-deep/compare/1.3.1...1.3.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
dependabot-preview[bot]	b88c0483d7	[Security] Bump eslint-utils from 1.3.1 to 1.4.2 (#11675 ) Bumps [eslint-utils](https://github.com/mysticatea/eslint-utils) from 1.3.1 to 1.4.2. This update includes a security fix. - [Release notes](https://github.com/mysticatea/eslint-utils/releases) - [Commits](https://github.com/mysticatea/eslint-utils/compare/v1.3.1...v1.4.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
dependabot-preview[bot]	e705d20ee5	Bump webpack-cli from 3.3.6 to 3.3.7 (#11663 ) Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 3.3.6 to 3.3.7. - [Release notes](https://github.com/webpack/webpack-cli/releases) - [Changelog](https://github.com/webpack/webpack-cli/blob/v3.3.7/CHANGELOG.md) - [Commits](https://github.com/webpack/webpack-cli/compare/v3.3.6...v3.3.7) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
dependabot-preview[bot]	006d3d5828	Bump @babel/plugin-proposal-class-properties from 7.5.0 to 7.5.5 (#11661 ) Bumps [@babel/plugin-proposal-class-properties](https://github.com/babel/babel) from 7.5.0 to 7.5.5. - [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.0...v7.5.5) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
dependabot-preview[bot]	6a2ae52fdf	Bump react-redux from 7.1.0 to 7.1.1 (#11664 ) Bumps [react-redux](https://github.com/reduxjs/react-redux) from 7.1.0 to 7.1.1. - [Release notes](https://github.com/reduxjs/react-redux/releases) - [Changelog](https://github.com/reduxjs/react-redux/blob/master/CHANGELOG.md) - [Commits](https://github.com/reduxjs/react-redux/compare/v7.1.0...v7.1.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
Eugen Rochko	f13761d84b	Add audio player (#11644 )	5 years ago
Thibaut Girka	f065048070	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - config/initializers/content_security_policy.rb (took our version)	5 years ago
ThibG	101b2695c6	Revert "Bump react-redux-loading-bar from 4.0.8 to 4.4.0 (#11609 )" (#11625 ) This reverts commit `5c310a43ef`.	5 years ago
Thibaut Girka	c060523dc2	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/controllers/home_controller.rb - app/controllers/shares_controller.rb - app/javascript/packs/public.js - app/models/status.rb - app/serializers/initial_state_serializer.rb - app/views/home/index.html.haml - app/views/layouts/public.html.haml - app/views/public_timelines/show.html.haml - app/views/shares/show.html.haml - app/views/tags/show.html.haml - config/initializers/content_security_policy.rb - config/locales/en.yml - config/webpack/shared.js - package.json	5 years ago
dependabot-preview[bot]	5c310a43ef	Bump react-redux-loading-bar from 4.0.8 to 4.4.0 (#11609 ) Bumps [react-redux-loading-bar](https://github.com/mironov/react-redux-loading-bar) from 4.0.8 to 4.4.0. - [Release notes](https://github.com/mironov/react-redux-loading-bar/releases) - [Changelog](https://github.com/mironov/react-redux-loading-bar/blob/master/CHANGELOG.md) - [Commits](https://github.com/mironov/react-redux-loading-bar/commits) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
dependabot-preview[bot]	1bb0b185fb	Bump redux from 4.0.1 to 4.0.4 (#11608 ) Bumps [redux](https://github.com/reduxjs/redux) from 4.0.1 to 4.0.4. - [Release notes](https://github.com/reduxjs/redux/releases) - [Changelog](https://github.com/reduxjs/redux/blob/master/CHANGELOG.md) - [Commits](https://github.com/reduxjs/redux/compare/v4.0.1...v4.0.4) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
dependabot-preview[bot]	3522b7eb07	Bump file-loader from 4.1.0 to 4.2.0 (#11607 ) Bumps [file-loader](https://github.com/webpack-contrib/file-loader) from 4.1.0 to 4.2.0. - [Release notes](https://github.com/webpack-contrib/file-loader/releases) - [Changelog](https://github.com/webpack-contrib/file-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/file-loader/compare/v4.1.0...v4.2.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
dependabot-preview[bot]	c209ee8be7	Bump rimraf from 2.6.3 to 3.0.0 (#11610 ) Bumps [rimraf](https://github.com/isaacs/rimraf) from 2.6.3 to 3.0.0. - [Release notes](https://github.com/isaacs/rimraf/releases) - [Commits](https://github.com/isaacs/rimraf/compare/v2.6.3...v3.0.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
Eugen Rochko	41b188dce6	Add OCR tool to media editing modal (#11566 )	5 years ago
Thibaut Girka	f0362fa0ee	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
dependabot-preview[bot]	02dc03f843	Bump sass from 1.22.7 to 1.22.9 (#11545 ) Bumps [sass](https://github.com/sass/dart-sass) from 1.22.7 to 1.22.9. - [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.22.7...1.22.9) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
dependabot-preview[bot]	d43305fa67	Bump webpack-dev-server from 3.7.2 to 3.8.0 (#11546 ) Bumps [webpack-dev-server](https://github.com/webpack/webpack-dev-server) from 3.7.2 to 3.8.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.7.2...v3.8.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
dependabot-preview[bot]	2e95fe660a	Bump css-loader from 3.1.0 to 3.2.0 (#11544 ) Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 3.1.0 to 3.2.0. - [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.1.0...v3.2.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
dependabot-preview[bot]	0b6540dda3	Bump terser-webpack-plugin from 1.3.0 to 1.4.1 (#11542 ) Bumps [terser-webpack-plugin](https://github.com/webpack-contrib/terser-webpack-plugin) from 1.3.0 to 1.4.1. - [Release notes](https://github.com/webpack-contrib/terser-webpack-plugin/releases) - [Changelog](https://github.com/webpack-contrib/terser-webpack-plugin/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/terser-webpack-plugin/compare/v1.3.0...v1.4.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
Thibaut Girka	77416866a7	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago

1 2 3 4 5 ...

348 Commits (e02b77a1f473c6808a6dec294268951fc5e91010)