glitchier-soc

Commit Graph

Author	SHA1	Message	Date
Claire	2f521bc84a	Merge commit 'a2f02a07758c32f0dcc6388b4f30ca5a84e762f3' into glitch-soc/merge-upstream	10 months ago
Claire	a3b6a85521	Merge commit 'cd37048439f9b324f48e6af1f426a7894c54b4da' into glitch-soc/merge-upstream Conflicts: - `.prettierignore`: Conflict due to glitch-soc-only files. Kept those at the end of the file.	10 months ago
Claire	6bbcd9348e	Switch from 48px weight 600 material symbol icons to 24px weight 400 icons (#28064 )	10 months ago
Renaud Chaput	923fc83190	Improve `lint-staged` config (#28704 )	10 months ago
Claire	51d2d98174	Merge commit 'a0e237a96fca2774d3c9ed43063a45e395bb7f40' into glitch-soc/merge-upstream	10 months ago
Claire	0b2c7cdb02	Merge commit 'fe2667bb0d3487a32b9da5250402a90482a85fe2' into glitch-soc/merge-upstream Conflicts: - `app/lib/content_security_policy.rb`: Conflict caused by glitch-soc's support for the extra `EXTRA_DATA_HOSTS` environment variable. Ported upstream's changes while keeping support for `EXTRA_DATA_HOSTS`.	10 months ago
Renaud Chaput	a0e237a96f	Upgrade Redux packages (#28585 )	10 months ago
renovate[bot]	da7290839a	Update dependency stylelint-config-standard-scss to v13 (#28589 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	10 months ago
Claire	9d9008666b	Merge commit '092bb8a27af9ee87ff9ebabaf354477470ea3a94' into glitch-soc/merge-upstream	10 months ago
renovate[bot]	2b330ede22	Update dependency eslint-plugin-jsdoc to v48 (#28564 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	10 months ago
Claire	f685c953e5	Merge commit '3944b12b5eec8c6ae4666ec922411b32b3442dd6' into glitch-soc/merge-upstream	10 months ago
Matt Jankowski	3944b12b5e	Update `@typescript-eslint/parser` to version 6.17.0 (#28218 )	10 months ago
Claire	b3542ac57b	Merge commit '1184887b012e863fbf44f65ef5c65e0049123c27' into glitch-soc/merge-upstream Conflicts: - `README.md`: Upstream updated its README, we have a completely different one. Kept our README.	10 months ago
renovate[bot]	cd09be054f	Update dependency eslint-plugin-jsdoc to v47 (#28541 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	10 months ago
renovate[bot]	629152a80d	Update DefinitelyTyped types (non-major) (#28542 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	10 months ago
Claire	35b6583371	Merge commit '6374358357ee81b5f137f471f028a56974109155' into glitch-soc/merge-upstream	11 months ago
Renaud Chaput	fb5eb1f655	Replace our custom `compression-webpack-plugin` patch with the fixed upstream version (#28510 )	11 months ago
Claire	f5b7307890	Merge commit 'f99e05710ea06cf10bbd3fb64ae8c00b095cb455' into glitch-soc/merge-upstream Conflicts: - `.rubocop_todo.yml`: Took upstream's version of the conflicting lines.	11 months ago
Claire	6e56f95285	Merge commit '4a7395d989e40c3bd4ef18173aa5ea850c8ddcdd' into glitch-soc/merge-upstream Conflicts: - `README.md`: Upstream modified its README, we have a completely different one. Kept our README file.	11 months ago
Claire	077e0c6812	Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream Conflicts: - `Gemfile.lock`: Conflict caused by the `json` gem thing once again. Updated as upstream did, but keeping the most recent `json` version. - `spec/helpers/application_helper_spec.rb`: Upstream refactored a bunch of specs, including one place that differs because of glitch-soc's theming system. Refactored as upstream did, adapting it for glitch-soc's theming system.	11 months ago
Claire	b8209c3b96	Merge commit '85662a5a57531af5402a6777d0b1089e78c56815' into glitch-soc/merge-upstream Conflicts: - `config/initializers/content_security_policy.rb`: Upstream reworked the CSP, we kept our version for now. - `spec/requests/content_security_policy_spec.rb`: Upstream reworked the CSP, we kept our version for now.	11 months ago
Claire	b135b6ba8f	Merge commit '8ebc94dd22a18c28c4c9763b909e92e6ba64e242' into glitch-soc/merge-upstream Conflicts: - `app/views/admin/custom_emojis/new.html.haml`: Conflict caused by glitch-soc having a different file size limit constant name. Updated like upstream did while keeping glitch-soc's constant name.	11 months ago
Claire	8afd313807	Merge commit '15b2d7eec59c745b418debf63907d8bd08c4a730' into glitch-soc/merge-upstream Conflicts: - `package.json`: Upstream split some dependencies, including `express`, to `streaming/package.json`. However, glitch-soc had extra dependencies textually close to `express`. Kept the extra dependencies and moved `express` to streaming. - `yarn.lock`: Upstream split some dependencies, including `express`, to `streaming/package.json`. However, glitch-soc had extra dependencies textually close to `express`. Kept the extra dependencies and moved `express` to streaming.	11 months ago
Claire	a111fd7a0b	Merge commit 'b2c5b20ef27edd948eca8d6bd2014b7a5efaec11' into glitch-soc/merge-upstream	11 months ago
Claire	d6ad9d351e	Merge commit 'a36b59be8ad7656b7ceab9751c9ec5b3563e3a30' into glitch-soc/merge-upstream	11 months ago
Claire	46ddaffd40	Merge commit 'b87bfb8c96c8491f1228e0258d05119f3420db05' into glitch-soc/merge-upstream	11 months ago
Claire	cd2ee0ec5f	Merge commit '757d7c73c0ca3750ac9e74a7e962f71c535a7bd0' into glitch-soc/merge-upstream Conflicts: - `README.md`: Upstream updated its README, we have a completely different one. Kept ours. - `yarn.lock`: Upstream changed from yarn 1 to yarn 4, but we had some different dependencies. Updated to yarn 4 and re-added our dependencies.	11 months ago
Claire	ddf3ad9541	Merge commit '3bf896c973404261f4f7b25c25ea22adb1a85e7d' into glitch-soc/main Conflicts: - `package.json`: Upstream removed a dependency textually close to a glitch-only dependency. Updated as upstream while keeping our dependency.	11 months ago
Matt Jankowski	cd9ebf5f0f	Update stylelint to version 16.0.2 (#28354 )	11 months ago
renovate[bot]	ca51e41239	Update dependency stylelint-config-standard-scss to v12 (#28333 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	11 months ago
Matt Jankowski	ee83d5c760	Enable the eslint `react/no-unknown-property` rule (#28217 )	11 months ago
Josh Goldberg ✨	1142f4c79e	Converted app/javascript/mastodon/utils/ folder to TypeScript (#27895 )	12 months ago
Emelia Smith	4949b6da58	Fix streaming eslint configuration (#28055 )	12 months ago
renovate[bot]	228b668446	Update DefinitelyTyped types (non-major) (#28077 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	12 months ago
Emelia Smith	15b2d7eec5	Split streaming server from web server (#24702 )	1 year ago
renovate[bot]	4eb4e8b22c	Update Yarn to v4.0.2 (#27851 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	da59407520	Update eslint (non-major) (#27831 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	a1b48460e4	Update DefinitelyTyped types (non-major) (#27830 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	fba838d61a	Update dependency @material-symbols/svg-600 to ^0.14.0 (#27803 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	dec2796a4a	Update dependency lint-staged to v15 (#27407 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
Renaud Chaput	757d7c73c0	Upgrade to Yarn 4, remove support for Node 16 (#27073 )	1 year ago
Renaud Chaput	0e3401bc1c	Improve Babel configuration and automatically load polyfills (#27333 )	1 year ago
Claire	ba527c071f	Merge commit '134de736dcbc6aa613fd5aec21d983d92d8b0be8' into glitch-soc/merge-upstream Conflicts: - `app/javascript/mastodon/features/compose/components/poll_form.jsx`: Upstream changed how icons are handled, including on a line modified by glitch-soc to bump the number of poll options. Applied upstream's change, while keeping the increased number of poll options.	1 year ago
Claire	4b0fb764c3	Merge commit 'e93a75f1a11d6dfdcbd39dbdc22526c5508ad881' into glitch-soc/merge-upstream Conflicts and ported changes: - updated `@rails/ujs` imports	1 year ago
Eugen Rochko	134de736dc	Change icons in web UI (#27385 ) Co-authored-by: Renaud Chaput <renchap@gmail.com>	1 year ago
Claire	79c154f602	Merge commit 'fc7734df8d8d53639bf244a2f2f3c39bc2fd12a7' into glitch-soc/merge-upstream	1 year ago
Claire	787d5ad386	Merge commit 'bcae7442757845191c0e82b61cd1d0cd3ca860d1' into glitch-soc/merge-upstream Conflicts: - `yarn.lock`: Caused by a glitch-soc-only dependency (`exif-js`). Kept it.	1 year ago
Matt Jankowski	e93a75f1a1	Rails 7.1 update (#25963 )	1 year ago
renovate[bot]	d5408dbb54	Update dependency prom-client to v15 (#27330 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	25751c653e	Update DefinitelyTyped types (non-major) (#27414 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago

1 2 3 4 5 ...

1886 Commits (486e4bc7d3d3dd0c61de2eb316db841a222e36bf)