glitchier-soc

Commit Graph

Author	SHA1	Message	Date
renovate[bot]	3e6a6439b5	Update dependency stylelint-config-standard-scss to v11 (#26780 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	1f92436745	Update DefinitelyTyped types (non-major) (#26785 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	173041f02c	Update dependency typescript to v5.2.2 (#26786 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
Claire	4ed629cd7e	Merge commit 'be991f1d18006a4820c1e9ca6625bf2bd2bfedac' into glitch-soc/merge-upstream Conflicts: - `app/models/form/admin_settings.rb`: Upstream added the notion of overriden settings, while we had extra code for pseudo-settings (only used to combine flavour and skin in a single select field). Ported upstream changes. - `config/i18n-tasks.yml`: Upstream added `simple_form.overridden` to `ignore_unused`, we had `simple_form.glitch_only`. Added `simple_form.glitch_only` as well.	1 year ago
Claire	ffb486648c	Merge commit 'cb9f96036cf78835e22aafb30b80717b5a8b7394' into glitch-soc/merge-upstream	1 year ago
Claire	afc3b12217	Merge commit '4ad1c5aa7174e5cef4ba9608a44429916a119bee' into glitch-soc/merge-upstream Conflicts: - `README.md`: Upstream has updated their README, we have a completely different one. Kept ours. - `config/initializers/content_security_policy.rb`: Upstream has updated their development CSPs, while we disable CSPs in the development environment. Kept our version.	1 year ago
Claire	c8aa3d6d06	Merge commit 'dd72a8d28b4479afdc19ac73cac83609d85b5f9e' into glitch-soc/merge-upstream	1 year ago
Claire	6b7c47311d	Merge commit '072112867b9a3ec090ad2c92d6363b47b2265d74' into glitch-soc/merge-upstream	1 year ago
Gabriel Simmer	be991f1d18	Move to ioredis for streaming (#26581 ) Co-authored-by: Emelia Smith <ThisIsMissEm@users.noreply.github.com>	1 year ago
renovate[bot]	430eac3eb1	Update dependency @babel/preset-env to v7.22.14 (#26732 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	ef9a85a2d8	Update dependency webpack-bundle-analyzer to v4.9.1 (#26733 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	15949e42c2	Update dependency glob to v10.3.4 (#26734 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	24deaf2e4a	Update dependency postcss to v8.4.29 (#26720 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	a67cf439ee	Update dependency axios to v1.5.0 (#26680 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	9d9de8d219	Update dependency @testing-library/jest-dom to v6 (#26479 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Renaud Chaput <renchap@gmail.com>	1 year ago
renovate[bot]	4ea5db90da	Update DefinitelyTyped types (non-major) (#26693 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	fc14d1f3b0	Update eslint (non-major) (#26694 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	e4c0ce18a3	Update dependency immutable to v4.3.4 (#26655 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	c66f756522	Update babel monorepo to v7.22.11 (#26640 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
Claire	941a9df28a	Merge commit '96bcee66fba582666259d1d7785c3a7f2a72b8aa' into glitch-soc/merge-upstream Conflicts: - `.github/workflows/build-nightly.yml`: Upstream changed how the nightly builds are versioned, the conflict is because glitch-soc modified adjacent lines relative to the docker repositories the images are pushed to. Applied upstream's changes. - `app/views/settings/preferences/notifications/show.html.haml`: Upstream moved some settings around. Glitch-soc had more settings. Applied upstream's changes, moving glitch-soc's extra settings accordingly.	1 year ago
Claire	b6b68b44a1	Merge commit 'b91724fb9d0839365391310e20c2589ff6062d4f' into glitch-soc/merge-upstream Conflicts: - `Vagrantfile`: Upstream bumped a bunch of values, including one that was already bumped by glitch-soc. Took upstream's version. - `lib/paperclip/transcoder.rb`: glitch-soc already had a partial fix for this. Took upstream's version.	1 year ago
Claire	296b3d1560	Merge commit 'dc09c10fa8cc9230bf14e48d790c8f0c26043f8f' into glitch-soc/merge-upstream Conflicts: - `.rubocop_todo.yml`: Upstream re-generated the file, while glitch-soc has a specific ignore for some file. Updated the file as upstream did and kept our extra ignore. - `config/webpack/shared.js`: Upstream added a plugin, but our files are pretty different. Added the plugin as well. - `spec/helpers/application_helper_spec.rb`: Upstream refactored tests, but part of them were different because of glitch-soc's theming system. Applied the refactoring to glitch-soc's change.	1 year ago
Claire	fbfc4145fd	Merge commit '1cdcd9dc08c91321f80ffe4822f6a3da15abeb2c' into glitch-soc/merge-upstream Conflicts: - `app/javascript/packs/public.jsx`: Upstream updated code that we actually moved to `app/javascript/core/settings.js`. Applied the changes there.	1 year ago
renovate[bot]	24ea6f851f	Update dependency redis to v4.6.8 (#26630 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	34f5b90dc7	Update dependency sass to v1.66.1 (#26534 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	de8c2427a5	Update dependency immutable to v4.3.3 (#26622 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	ea1a221e2d	Update dependency react-textarea-autosize to v8.5.3 (#26607 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
Claire	10404aece8	Merge commit '1cb978bcc3d291a045f367e072ca0af1a1c4dbbc' into glitch-soc/merge-upstream	1 year ago
Renaud Chaput	bb2db2aec0	Add `circular-dependency-plugin` to detect any circular deps issues (#26600 )	1 year ago
Claire	7e25e311d5	Merge commit '3a8370e1f459f5cf9695a610102ae6e53df36714' into glitch-soc/merge-upstream	1 year ago
renovate[bot]	1cdcd9dc08	Update eslint (non-major) (#26567 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	d3b4422b94	Update dependency core-js to v3.32.1 (#26548 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	1cb978bcc3	Update dependency @material-design-icons/svg to v0.14.11 (#26536 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	b5acf13886	Update dependency pg to v8.11.3 (#26519 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	26eaf058e2	Update dependency postcss to v8.4.28 (#26502 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	c65032fb11	Update dependency autoprefixer to v10.4.15 (#26473 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
Renaud Chaput	1eac3a60de	Upgrade `@types/react` (#26457 )	1 year ago
Claire	6530f9709c	Merge commit '121443c0fca383268b8022c048dd137994785aff' into glitch-soc/main Conflicts: - `.rubocop_todo.yml`: Upstream regenerated this file, glitch-soc had a specific ignore.	1 year ago
Claire	44a5f1b64a	Merge commit '425d77f8124a50fc033e8fb3bdf7b89a6a25f4fa' into glitch-soc/merge-upstream Conflicts: - `.rubocop_todo.yml`: Upstream regenerated this file, glitch-soc had a specific ignore. - `README.md`: Upstream updated its README, but glitch-soc has a completely different one. Kept glitch-soc's README	1 year ago
Renaud Chaput	121443c0fc	Upgrade JS dev dependencies (#26442 )	1 year ago
renovate[bot]	3dd3c50811	Update dependency pg-connection-string to v2.6.2 (#26427 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	27d8e9be4a	Update dependency eslint-import-resolver-typescript to v3.6.0 (#26429 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	7572fa21a3	Update babel monorepo to v7.22.10 (#26421 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	05022c9218	Update dependency pg to v8.11.2 (#26426 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	700f948fc9	Update dependency @rails/ujs to v7.0.7 (#26422 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	54dfacafcb	Update dependency regenerator-runtime to ^0.14.0 (#26432 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	ba318a42fe	Update dependency sass to v1.65.1 (#26433 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	c645308c6e	Update dependency eslint-config-prettier to v9 (#26434 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	74c422ad0a	Update dependency immutable to v4.3.2 (#26425 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	26fa4a6e82	Update eslint (non-major) (#26323 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	59678c6d5d	Update dependency sass to v1.64.2 (#26315 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
Emelia Smith	65096c1ccd	Change streaming `/metrics` to include additional metrics (#26299 )	1 year ago
renovate[bot]	f6e4137d7c	Update dependency core-js to v3.32.0 (#26317 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	670dae371a	Update dependency react-redux to v8.1.2 (#26314 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
Eugen Rochko	2cbdff97ce	Change design of role badges in web UI (#26281 ) Co-authored-by: Claire <claire.github-309c@sitedethib.com>	1 year ago
Claire	bd349cb850	Merge commit 'ce1f35d7e213327549b960bb64f63c67a141ea40' into glitch-soc/merge-upstream Conflicts: - `db/schema.rb`: Upstream regenerated the schema file using Rails 7, the conflicts are caused by our extra columns. Applied upstream's changes, but keeping our extra columns.	1 year ago
renovate[bot]	edc104c9ef	Update dependency sass to v1.64.1 (#26146 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	3cbc69f13d	Update dependency postcss to v8.4.27 (#26144 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
Claire	c04f2d0cf7	Merge branch 'main' into glitch-soc/merge-upstream Conflicts: - `app/views/admin/settings/appearance/show.html.haml`: Upstream enforced an uniform code style around lambdas, and glitch-soc had a different lambda due to its theming system. Applied the same code style changes. - `app/views/settings/preferences/appearance/show.html.haml`: Upstream enforced an uniform code style around lambdas, and glitch-soc removed some code just after the lambda. Applied the same code style changes.	1 year ago
renovate[bot]	2a9063e36a	Update dependency react-select to v5.7.4 (#26033 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
Claire	c943f17b1b	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
renovate[bot]	7b7a26c895	Update dependency postcss to v8.4.26 (#26030 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	f17acbca33	Update dependency immutable to v4.3.1 (#26029 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	cdaca7a08b	Update babel monorepo to v7.22.9 (#26017 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
Claire	25571b18ed	Merge commit '5a3f174d561cbdc79a597cd2b9502ed058d372da' into glitch-soc/merge-upstream	1 year ago
Claire	95a1fde6b6	Merge commit '73b64b89170cb72854a1709186c62ce31f476889' into glitch-soc/merge-upstream Conflicts: - `app/javascript/styles/fonts/roboto-mono.scss`: Upstream updated the linter, which changed a few linter rules. Some of those changed lines are different in glitch-soc because we use different paths for the assets. Applied the same style rules on our version of the file. - `app/javascript/styles/fonts/roboto.scss`: Upstream updated the linter, which changed a few linter rules. Some of those changed lines are different in glitch-soc because we use different paths for the assets. Applied the same style rules on our version of the file.	1 year ago
Claire	2d09653d50	Merge commit '0d7340380cf3094335d8bc67f7c465e2b154566a' into glitch-soc/merge-upstream Conflicts: - app/controllers/application_controller.rb: Upstream added an `include` where we had an extra `include` due to glitch-soc's theming system. Added upstream's new `include`.	1 year ago
renovate[bot]	ba0649f042	Update dependency postcss to v8.4.25 (#25961 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	a4e6ff0d53	Update dependency react-textarea-autosize to v8.5.2 (#25962 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
Renaud Chaput	a7253075d1	Upgrade to `typescript-eslint` v6 (#25904 )	1 year ago
Renaud Chaput	73b64b8917	Upgrade to Prettier 3 (#25902 )	1 year ago
renovate[bot]	0d7340380c	Update dependency glob to v10.3.3 (#25959 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	6be9f95a22	Update dependency core-js to v3.31.1 (#25958 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
Matt Jankowski	ce43ed144c	Rails 7.0 update (#25668 )	1 year ago
Claire	9ae60f8738	Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream Conflicts: - `db/migrate/20180831171112_create_bookmarks.rb`: Upstream ran a lint fix on this file, but this file is different in glitch-soc because the feature was added much earlier. Ran the lint fix on our own version of the file.	1 year ago
Claire	2aadebc769	Merge commit '8e0fd2d619dac93c193da6a762564244e5622498' into glitch-soc/merge-upstream Conflicts: - `.github/workflows/build-image.yml`: Upstream changed how releases are tagged, we don't have releases. Ignored the changes	1 year ago
Renaud Chaput	ecd8e0d612	Update Stylelint (#25819 )	1 year ago
renovate[bot]	8e0fd2d619	Update babel monorepo (#25930 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
Eugen Rochko	ba06a2f104	Revert "Rails 7 update" (#25667 )	1 year ago
Matt Jankowski	50c2a03695	Rails 7 update (#24241 )	1 year ago
Claire	80a5c16ae1	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
renovate[bot]	ceca93d0d1	Update dependency glob to v10.3.0 (#25608 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	dbd37f129d	Update dependency pg to v8.11.1 (#25604 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	b7f6280ef4	Update dependency pg-connection-string to v2.6.1 (#25605 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	a90190f813	Update dependency react-textarea-autosize to v8.5.0 (#25610 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	ccaa676452	Update dependency sass to v1.63.6 (#25607 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	9caa0475f8	Update dependency react-redux to v8.1.1 (#25432 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
Claire	178e151019	Merge commit '55e7c08a83547424024bac311d5459cb82cf6dae' into glitch-soc/merge-upstream Conflicts: - `app/models/user_settings.rb`: Upstream added a constraint on a setting textually close to glitch-soc-only settings. Applied upstream's change. - `lib/sanitize_ext/sanitize_config.rb`: Upstream added support for the `translate` attribute on a few elements, where glitch-soc had a different set of allowed elements and attributes. Extended glitch-soc's allowed attributes with `translate` as upstream did. - `spec/validators/status_length_validator_spec.rb`: Upstream refactored to use RSpec's `instance_double` instead of `double`, but glitch-soc had changes to tests due to configurable max toot chars. Applied upstream's changes while keeping tests against configurable max toot chars.	1 year ago
renovate[bot]	cec4f1d506	Update dependency dotenv to v16.2.0 (#25506 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
Claire	6c99479ef4	Merge commit '9e245d147bcb2c72cc552ff8c276a1c34e2f686d' into glitch-soc/merge-upstream Conflicts: - `app/views/settings/profiles/show.html.haml`: Upstream redesigned the settings page, where glitch-soc had changes because of the ability to set some custom limits. Went with upstream's design while keeping our custom limits. - `yarn.lock`: Upstream updated dependencies textually close to a glitch-soc-only dependency. Updated the dependnencies as well.	1 year ago
renovate[bot]	8b2048d0c8	Lock file maintenance (#25434 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	a6d7abb29d	Update dependency intl-messageformat to v10.5.0 (#25431 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	36566e9245	Update dependency core-js to v3.31.0 (#25430 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	841e35e291	Update devDependencies (non-major) (#25427 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	b9e8d2b352	Update dependency sass to v1.63.3 (#25422 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	360759df7b	Update formatjs monorepo (#25418 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	f10f4f2359	Update dependency glob to v10.2.7 (#25417 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	ae2790d84f	Update babel monorepo to v7.22.5 (#25405 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Renaud Chaput <renchap@gmail.com>	1 year ago
Claire	c48ec9cb8c	Merge commit 'b85c387c5c0527b0ad31c27031a09d361826c5fc' into glitch-soc/merge-upstream Conflicts: - `config/initializers/content_security_policy.rb`: Kept our version, it was not affected by upstream's bug.	1 year ago
Claire	734e186717	Merge commit 'b0780cfeeda641645ea65da257a72ec507e71647' into glitch-soc/merge-upstream Conflicts: - `app/javascript/mastodon/load_locale.js`: The file moved to `app/javascript/mastodon/locales/load_locale.ts`. Ported the changes there and deleted `app/javascript/mastodon/load_locale.js`. - `app/javascript/mastodon/locales/index.js`: The file moved to `app/javascript/mastodon/locales/index.ts`. Did not port the changes as I want to try something a bit different.	1 year ago
Claire	aa57f7e3e2	Merge commit '5fae2de454806730742b7be7435ae1c4fb97cf3c' into glitch-soc/merge-upstream	1 year ago
Claire	85722a918d	Merge commit '44cd88adc4e2f4028dcc2b08b98368f0dc90cee4' into glitch-soc/merge-upstream Conflicts: - `.github/dependabot.yml`: Updated upstream, but we've deleted it. Keep it deleted. - `app/javascript/mastodon/locales/index.js`: Reworked upstream, but the code was mostly in `app/javascript/locales/index.js` in glitch-soc. Updated that file accordingly. - `app/javascript/packs/public.jsx`: Not a real conflict, but different imports in glitch-soc and upstream. - `app/views/layouts/application.html.haml`: Conflict due to locales loading and theme system discrepancies. Updated in our own way. - `app/views/layouts/embedded.html.haml`: Conflict due to locales loading and theme system discrepancies. Updated in our own way. - `config/webpack/generateLocalePacks.js`: Deleted upstream, as upstream now directly loads the JSON at runtime. Deleted as well, will switch to runtime loading in an upcoming commit. - `config/webpack/shared.js`: Not a real conflict, but different imports in glitch-soc and upstream. - `config/webpack/translationRunner.js`: Mostly deleted upstream, to be replaced with `formatjs-formatter.js` instead. Moved the glitch-soc logic there and deleted the file.	1 year ago
renovate[bot]	db047e323b	Update dependency webpack-bundle-analyzer to v4.9.0 (#25327 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	5265655549	Update dependency dotenv to v16.1.3 (#25302 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	7e22287caa	Update dependency sass-loader to v10.4.1 (#25315 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	9a653899e9	Update dependency redis to v4.6.7 (#25300 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	50a8f5b8a7	Update dependency react-redux to v8.0.7 (#25298 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
Claire	c22fc2fa80	Merge commit '00c222377db0e305ac3f4a15bf1c18eb89c1f45f' into glitch-soc/merge-upstream Conflicts: - `.rubocop_todo.yml`: Took upstream's changes.	1 year ago
Renaud Chaput	b0780cfeed	Fix `/share` and cleanup and reorganize frontend locale loading (#25240 )	1 year ago
Nick Schonning	b489c200a6	Update yarn.lock for audit issues (#25152 )	1 year ago
Claire	dac460f43f	Bump workbox from 6.6.1 to 7.0.0 (#25232 )	1 year ago
dependabot[bot]	5a50983654	Bump eslint-plugin-jsdoc from 45.0.0 to 46.1.0 (#25222 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	1 year ago
dependabot[bot]	b05bbd91d0	Bump @types/jest from 29.5.1 to 29.5.2 (#25220 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	1 year ago
Renaud Chaput	44cd88adc4	Upgrade react-intl (#24906 )	1 year ago
dependabot[bot]	82f6d4c418	Bump @babel/core and @types/babel__core (#25183 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	1 year ago
dependabot[bot]	b86f3596ba	Bump @babel/plugin-transform-runtime from 7.21.4 to 7.22.4 (#25173 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	1 year ago
dependabot[bot]	e24adacea1	Bump @babel/preset-react from 7.18.6 to 7.22.3 (#25171 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	1 year ago
dependabot[bot]	e1d0343354	Bump @babel/runtime from 7.21.5 to 7.22.3 (#25170 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	1 year ago
dependabot[bot]	0ed8164777	Bump @babel/preset-env from 7.21.5 to 7.22.4 (#25167 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Claire <claire.github-309c@sitedethib.com>	1 year ago
Renaud Chaput	98e5e011aa	Upgrade Workbox to 6.6.0 (#25197 )	1 year ago
dependabot[bot]	89d6341c80	Bump eslint-plugin-jsdoc from 44.2.5 to 45.0.0 (#25172 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Renaud Chaput <renchap@gmail.com>	1 year ago
dependabot[bot]	44eaa979d4	Bump @types/react from 18.2.6 to 18.2.7 (#25166 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	1 year ago
dependabot[bot]	4869384fa0	Bump jsdom from 22.0.0 to 22.1.0 (#25178 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	1 year ago
dependabot[bot]	66c1ad8be9	Bump @types/react-motion from 0.0.33 to 0.0.34 (#25185 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	1 year ago
dependabot[bot]	5f1a03fdba	Bump @typescript-eslint/parser from 5.59.7 to 5.59.8 (#25175 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	1 year ago
dependabot[bot]	6d41cdcc6a	Bump @typescript-eslint/eslint-plugin from 5.59.7 to 5.59.8 (#25182 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	1 year ago
dependabot[bot]	8ff2d61add	Bump @types/lodash from 4.14.194 to 4.14.195 (#25184 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	1 year ago
dependabot[bot]	37dc48c3a1	Bump postcss from 8.4.23 to 8.4.24 (#25169 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	1 year ago
Claire	0e7466717f	Merge commit '391c089d0db58d731765dba730a5e1f2fe8570a6' into glitch-soc/merge-upstream Conflicts: - `.github/dependabot.yml`: We removed it from glitch-soc. Keep it deleted.	1 year ago
Claire	e2ab9d4dad	Merge commit 'e387175fc9a3ebfd72ab45ebfe43ecfabef7b0c3' into glitch-soc/merge-upstream	1 year ago
Claire	45d7358100	Merge commit '8d6aea33260dedeacb3d22ac1a6d2f9cc3856a5e' into glitch-soc/merge-upstream	1 year ago
Claire	2e02d03524	Merge commit '4a22e72b9b1b8f14792efcc649b0db8bc27f0df2' into glitch-soc/merge-upstream	1 year ago
Claire	b735954971	Merge commit '2ce0b666a139726dc406e6c1887728553b947e59' into glitch-soc/merge-upstream Conflicts: - `config/webpack/generateLocalePacks.js`: A dependency update changed how functions are imported. Also, some linting fixes not applicable to glitch-soc.	1 year ago
dependabot[bot]	391c089d0d	Bump eslint from 8.40.0 to 8.41.0 (#25081 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	1 year ago
dependabot[bot]	2e3b1ef13e	Bump eslint-plugin-jsdoc from 44.2.4 to 44.2.5 (#25112 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	1 year ago
Renaud Chaput	342daeb389	Update `react-redux` (#25110 )	1 year ago
dependabot[bot]	5b332112fc	Bump stylelint from 15.6.1 to 15.6.2 (#25078 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	1 year ago
dependabot[bot]	c2cbe90a89	Bump rimraf from 5.0.0 to 5.0.1 (#25082 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	1 year ago
dependabot[bot]	9e59186f78	Bump glob from 10.2.2 to 10.2.6 (#25083 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	1 year ago
dependabot[bot]	c7cbded282	Bump webpack-merge from 5.8.0 to 5.9.0 (#25084 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	1 year ago
dependabot[bot]	7cfa6424f1	Bump @typescript-eslint/eslint-plugin from 5.59.6 to 5.59.7 (#25085 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	1 year ago
dependabot[bot]	16d3e76a71	Bump @typescript-eslint/parser from 5.59.6 to 5.59.7 (#25080 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	1 year ago
Renaud Chaput	8d6aea3326	Upgrade to React 18 (#24916 )	1 year ago
Nick Schonning	7d805cfa90	Remove requestAnimationFrame test polyfill (#25056 )	1 year ago
dependabot[bot]	27ec8f297d	Bump jsdom from 21.1.2 to 22.0.0 (#24828 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	2ce0b666a1	Bump pg-connection-string from 2.5.0 to 2.6.0 (#24999 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	520462799f	Bump @typescript-eslint/eslint-plugin from 5.59.5 to 5.59.6 (#24998 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	bbe4800b04	Bump @typescript-eslint/parser from 5.59.5 to 5.59.6 (#25000 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	4d6a8ee34a	Bump eslint-plugin-jsdoc from 43.1.1 to 44.2.4 (#24994 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
Renaud Chaput	2e1c6e93ad	Bump `mkdirp` major version (#24978 )	2 years ago
dependabot[bot]	713d217384	Bump eslint from 8.39.0 to 8.40.0 (#24919 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
Renaud Chaput	5eeb40bdbe	Add stricter ESLint rules for Typescript files (#24926 )	2 years ago
Claire	facc7ab03c	Merge commit '51b83ed19536b06ce3f57b260400ecec2d1dd187' into glitch-soc/merge-upstream	2 years ago
Claire	1a664560cc	Merge commit '6aeb162927e6f9bbfd597632a10d82d9656c2385' into glitch-soc/merge-upstream Conflicts: - `.github/dependabot.yml`: We deleted it. Kept it removed. - `app/javascript/packs/public.jsx`: Upstream changed an import, we have slightly different ones. Ported upstream changes.	2 years ago
Claire	c81d1b0d38	Merge commit 'c8181eb0a41c4f5c1655d4e400cab071aee4182a' into glitch-soc/merge-upstream Conflicts: - `app/javascript/packs/admin.jsx`: Upstream reworked imports, but we had many changes. Reworked imports as upstream did. - `app/javascript/packs/public.jsx`: Upstream reworked imports, but we had many changes. Reworked imports as upstream did.	2 years ago
Nick Schonning	51b83ed195	Use Prettier for ESLint formatting TypeScript (#23631 )	2 years ago
dependabot[bot]	72dcb2ef58	Bump @typescript-eslint/eslint-plugin from 5.59.2 to 5.59.5 (#24922 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	a5ba98d2df	Bump @typescript-eslint/parser from 5.59.2 to 5.59.5 (#24921 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
Renaud Chaput	a3a2414f0e	Rework polyfills loading (#24907 )	2 years ago
Renaud Chaput	aec486b4ec	Upgrade `uuid` to 9.0.0 (#24917 )	2 years ago
Renaud Chaput	d9b93bd15e	Enforce React Rules of Hooks with eslint (#24911 )	2 years ago
Claire	d77fbbed73	Merge commit 'f877aa9d70d0d600961989b8e97c0e0ce3ac1db6' into glitch-soc/merge-upstream Conflicts: - `.github/dependabot.yml`: Upstream made changes, but we had removed it. Discarded upstream changes. - `.rubocop_todo.yml`: Upstream regenerated the file, we had some glitch-soc-specific ignores. - `app/models/account_statuses_filter.rb`: Minor upstream code style change where glitch-soc had slightly different code due to handling of local-only posts. Updated to match upstream's code style. - `app/models/status.rb`: Upstream moved ActiveRecord callback definitions, glitch-soc had an extra one. Moved the definitions as upstream did. - `app/services/backup_service.rb`: Upstream rewrote a lot of the backup service, glitch-soc had changes because of exporting local-only posts. Took upstream changes and added back code to deal with local-only posts. - `config/routes.rb`: Upstream split the file into different files, while glitch-soc had a few extra routes. Extra routes added to `config/routes/settings.rb`, `config/routes/api.rb` and `config/routes/admin.rb` - `db/schema.rb`: Upstream has new migrations, while glitch-soc had an extra migration. Updated the expected serial number to match upstream's. - `lib/mastodon/version.rb`: Upstream added support to set version tags from environment variables, while glitch-soc has an extra `+glitch` tag. Changed the code to support upstream's feature but prepending a `+glitch`. - `spec/lib/activitypub/activity/create_spec.rb`: Minor code style change upstream, while glitch-soc has extra tests due to `directMessage` handling. Applied upstream's changes while keeping glitch-soc's extra tests. - `spec/models/concerns/account_interactions_spec.rb`: Minor code style change upstream, while glitch-soc has extra tests. Applied upstream's changes while keeping glitch-soc's extra tests.	2 years ago
Claire	2d029dedd9	Merge commit '0ad2413b35287958f59073a5b63aecc659a64d98' into glitch-soc/merge-upstream Conflicts: - `app/javascript/styles/mastodon/forms.scss`: Conflict because we ran eslint autofix on upstream files. - `config/initializers/content_security_policy.rb`: Code style changes but we have a different version. Kept our version. - `streaming/index.js`: Upstream fixed a typo close to glitch-soc-only code. Applied upstream's changes.	2 years ago
dependabot[bot]	64fae0efb5	Bump @babel/core from 7.21.5 to 7.21.8 (#24831 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	880e661d53	Bump stylelint from 15.6.0 to 15.6.1 (#24829 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	ff974395c2	Bump react-select from 5.7.2 to 5.7.3 (#24830 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	8d61d2b0da	Bump axios from 1.3.6 to 1.4.0 (#24775 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	8f7c172eb8	Bump @babel/preset-typescript from 7.21.4 to 7.21.5 (#24776 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	b0ebaeb691	Bump @babel/preset-env from 7.21.4 to 7.21.5 (#24773 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	1d49718a84	Bump @babel/runtime from 7.21.0 to 7.21.5 (#24771 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	14a7e414fc	Bump @babel/core from 7.21.4 to 7.21.5 (#24778 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
fusagiko / takayamaki	8227af8dcc	use configureStore of redux-toolkit instead of createStore of redux (#24790 )	2 years ago
dependabot[bot]	2839fbc733	Bump eslint-plugin-formatjs from 4.10.0 to 4.10.1 (#24770 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	4acf5f8971	Bump @typescript-eslint/eslint-plugin from 5.59.1 to 5.59.2 (#24768 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	4b87e2a8db	Bump @typescript-eslint/parser from 5.59.1 to 5.59.2 (#24774 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	b75c353962	Bump yargs from 17.7.1 to 17.7.2 (#24769 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	18f58f4284	Bump jsdom from 21.1.1 to 21.1.2 (#24767 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	389f0443c8	Bump cssnano from 6.0.0 to 6.0.1 (#24777 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
Nick Schonning	fc56eda94b	Bump stylelint-config-standard-scss from 7.0.1 to 9.0.0 (#24755 ) Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2 years ago
dependabot[bot]	0669822ae8	Bump eslint from 8.38.0 to 8.39.0 (#24636 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	242d7864f1	Bump @types/jest from 29.4.2 to 29.5.1 (#24630 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	56cf092058	Bump @types/yargs from 17.0.22 to 17.0.24 (#24388 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	819daeb651	Bump @types/lodash from 4.14.191 to 4.14.194 (#24576 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	921bef6799	Bump stylelint from 15.3.0 to 15.6.0 (#24635 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
Nick Schonning	f22b4e556c	Add eslint-plugin-jsdoc (#24719 )	2 years ago
Claire	12b935fadf	Merge branch 'main' into glitch-soc/merge-upstream Conflicts: - `.github/dependabot.yml`: Updated upstream, removed in glitch-soc to disable noise. Kept removed. - `CODE_OF_CONDUCT.md`: Upstream updated to a new version of the covenant, but I have not read it yet, so kept unchanged. - `Gemfile.lock`: Not a real conflict, one upstream dependency updated textually too close to the glitch-soc only `hcaptcha` dependency. Applied upstream changes. - `app/controllers/admin/base_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/application_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/disputes/base_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/relationships_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/statuses_cleanup_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/helpers/application_helper.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/javascript/mastodon/features/compose/components/compose_form.jsx`: Upstream added a highlight animation for onboarding, while we changed the max character limit. Applied our local changes on top of upstream's new version. - `app/views/layouts/application.html.haml`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `stylelint.config.js`: Upstream added ignore paths, glitch-soc had extra ignore paths. Added the same paths as upstream.	2 years ago
dependabot[bot]	d9e9579832	Bump tesseract.js from 2.1.1 to 2.1.5 (#19084 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	b839babb39	Bump sass from 1.62.0 to 1.62.1 (#24668 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	785b0349eb	Bump lint-staged from 13.2.1 to 13.2.2 (#24669 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	872c4e1ef2	Bump glob from 10.0.0 to 10.2.2 (#24632 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	2f5608e9e5	Bump sass from 1.61.0 to 1.62.0 (#24574 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	5f624954be	Bump @typescript-eslint/eslint-plugin from 5.59.0 to 5.59.1 (#24633 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	9650a5738a	Bump @typescript-eslint/parser from 5.59.0 to 5.59.1 (#24638 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
Nick Schonning	dcdc614bd2	Remove postcss-scss devDep (#24223 ) Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	2 years ago
dependabot[bot]	1820b55a11	Bump postcss from 8.4.22 to 8.4.23 (#24629 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	0c66358601	Bump prettier from 2.8.7 to 2.8.8 (#24631 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	fba60094a2	Bump axios from 1.3.5 to 1.3.6 (#24640 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
Emelia Smith	301e03eb8c	Remove clustering from streaming API (#24655 )	2 years ago
Nick Schonning	2daa5a1549	Enable formatjs/prefer-pound-in-plural (#24622 )	2 years ago
dependabot[bot]	0c81eec239	Bump @typescript-eslint/eslint-plugin from 5.58.0 to 5.59.0 (#24573 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	03ea084f0d	Bump @typescript-eslint/parser from 5.58.0 to 5.59.0 (#24568 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
Nick Schonning	0c7ce98ff6	Add eslint-plugin-formatjs (#23976 )	2 years ago
Claire	abfdafef1e	Merge branch 'main' into glitch-soc/merge-upstream Conflicts: - `app/controllers/auth/setup_controller.rb`: Upstream removed a method close to a glitch-soc theming-related method. Removed the method like upstream did.	2 years ago
dependabot[bot]	426e3cc3bc	Bump reselect from 4.1.7 to 4.1.8 (#24565 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	fe1ac6b0b0	Bump postcss from 8.4.21 to 8.4.22 (#24570 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	a5e9128b74	Bump http-link-header from 1.1.0 to 1.1.1 (#24575 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
Claire	f9a9f9344b	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
dependabot[bot]	ce50f04f0a	Bump glob from 9.3.4 to 10.0.0 (#24490 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	458e49c40c	Bump @typescript-eslint/eslint-plugin from 5.55.0 to 5.58.0 (#24488 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	8ffa11740f	Bump @typescript-eslint/parser from 5.55.0 to 5.58.0 (#24494 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	0765aeba38	Bump eslint from 8.36.0 to 8.38.0 (#24493 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	fe841b6bb6	Bump sass from 1.60.0 to 1.61.0 (#24487 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	b6e353fde1	Bump rimraf from 4.4.1 to 5.0.0 (#24492 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	ccd74ecd10	Bump @babel/plugin-transform-runtime from 7.21.0 to 7.21.4 (#24394 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	b178fd3f92	Bump @babel/preset-env from 7.20.2 to 7.21.4 (#24382 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	7d7cfeaa06	Bump @babel/preset-typescript from 7.21.0 to 7.21.4 (#24396 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	999d992c10	Bump @babel/core from 7.21.3 to 7.21.4 (#24386 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	3c7053a2db	Bump axios from 1.3.4 to 1.3.5 (#24485 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	881326ff61	Bump typescript from 5.0.3 to 5.0.4 (#24489 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	08d318909c	Bump lint-staged from 13.2.0 to 13.2.1 (#24491 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
Claire	ce12934f5b	Merge branch 'main' into glitch-soc/merge-upstream Conflicts: - `package.json`: Upstream removed a dependency that was textually close to a glitch-soc-only dependency. Removed the dependency as upstream did, while keeping the glitch-soc-only dependency.	2 years ago
dependabot[bot]	0358abe73a	Bump typescript from 4.9.5 to 5.0.3 (#24398 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
Claire	d13ef49b15	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
dependabot[bot]	a8cd1b1238	Bump glob from 9.3.2 to 9.3.4 (#24383 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
Nick Schonning	8e19c44b2c	Align typings with installed versions (#24410 )	2 years ago
Claire	4d5b4dacd6	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
Claire	5d67fc09c3	Clean up JS dependencies (#24377 )	2 years ago
Renaud Chaput	be230be734	Fix build issues caused by #16210 (#24374 )	2 years ago
fusagiko / takayamaki	4520e6473a	[Proposal] Make able to write React in Typescript (#16210 ) Co-authored-by: berlysia <berlysia@gmail.com> Co-authored-by: fusagiko / takayamaki <takayamaki@users.noreply.github.com>	2 years ago
Claire	4aaa1772b6	Restore exif-js dependency	2 years ago
Claire	01d6f7529f	Merge branch 'main' into glitch-soc/merge-upstream Conflicts: - `README.md`: Upstream added a link to the roadmap, but we have a completely different README. Kept ours. - `app/models/media_attachment.rb`: Upstream upped media attachment limits. Updated the default according to upstream's. - `db/migrate/20180831171112_create_bookmarks.rb`: Upstream changed the migration compatibility level. Did so too. - `config/initializers/content_security_policy.rb`: Upstream refactored this file but we have a different version. Kept our version. - `app/controllers/settings/preferences_controller.rb`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. The file does not directly references individual settings anymore. Applied upstream changes. - `app/lib/user_settings_decorator.rb`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. The file got removed entirely. Removed it as well. - `app/models/user.rb`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. References to individual settings have been removed from the file. Removed them as well. - `app/views/settings/preferences/appearance/show.html.haml`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. Applied upstream's changes and ported ours back. - `app/views/settings/preferences/notifications/show.html.haml`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. Applied upstream's changes and ported ours back. - `app/views/settings/preferences/other/show.html.haml`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. Applied upstream's changes and ported ours back. - `config/settings.yml`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. In particular, upstream removed user-specific and unused settings. Did the same in glitch-soc. - `spec/controllers/application_controller_spec.rb`: Conflicts due to glitch-soc's theming system. Mostly kept our version, as upstream messed up the tests.	2 years ago
dependabot[bot]	67450cf002	Bump cssnano from 5.1.15 to 6.0.0 (#24296 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	c855e1ecbc	Bump sass from 1.59.3 to 1.60.0 (#24292 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	550d40a361	Bump rimraf from 4.4.0 to 4.4.1 (#24291 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	ef52da6dc7	Bump react-textarea-autosize from 8.4.0 to 8.4.1 (#24293 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	c384795731	Bump react-select from 5.7.1 to 5.7.2 (#24294 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	674f9b5966	Bump prettier from 2.8.5 to 2.8.7 (#24295 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	657236546f	Bump mkdirp from 2.1.5 to 2.1.6 (#24297 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	4f16e4dbde	Bump glob from 9.3.0 to 9.3.2 (#24298 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
Nick Schonning	34225d7199	Setup Husky and lint-stage for commit fixing (#23308 )	2 years ago
Claire	14b0311029	Merge branch 'main' into glitch-soc/main	2 years ago
Eugen Rochko	9bda933740	Change media upload limits and remove client-side resizing (#23726 )	2 years ago
Yamagishi Kazutoshi	d1b057a0ac	Remove legacy decorators syntax (#18357 )	2 years ago
Nick Schonning	b46125224c	Remove isNaN polyfill (#24224 )	2 years ago
Claire	5ac380c122	Merge branch 'main' into glitch-soc/merge-upstream Conflicts: - `app/models/status.rb`: Upstream added lines close to a glitch-soc only line, not a real conflict. Applied upstream's changes (added hooks) while keeping glitch-soc's changes (`local_only` scope). - `config/environments/production.rb`: Upstream removed a header, while we have glitch-soc specific ones. Removed the header removed upstream.	2 years ago
dependabot[bot]	a4d285f2f9	Bump prettier from 2.8.4 to 2.8.5 (#24188 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	de6d504023	Bump stylelint from 15.2.0 to 15.3.0 (#24185 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	f20843e60d	Bump react-select from 5.7.0 to 5.7.1 (#24187 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
Claire	3091a184ca	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
Nick Schonning	34096bc6ea	Upgrade redis-node to latest (#24154 )	2 years ago

... 3 4 5 6 7 ...

2317 Commits (695dcc6ca84ee86090b2b68d1d47ff1cc49cb304)