glitchier-soc

Commit Graph

Author	SHA1	Message	Date
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.	8 months ago
renovate[bot]	22d866ee1b	Update dependency @material-symbols/svg-600 to v0.14.4 (#28603 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	8 months ago
Claire	47d213e701	Merge commit '5dc634796aba951f6a085e1ed0e1b807e25d7d41' into glitch-soc/merge-upstream	8 months ago
Claire	51d2d98174	Merge commit 'a0e237a96fca2774d3c9ed43063a45e395bb7f40' into glitch-soc/merge-upstream	8 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`.	8 months ago
renovate[bot]	f7b61959cf	Update babel monorepo to v7.23.8 (#28656 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	8 months ago
renovate[bot]	2ae53e655c	Update dependency jsdom to v23.2.0 (#28612 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	9 months ago
renovate[bot]	8a44b182e8	Update dependency axios to v1.6.5 (#28620 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	9 months ago
renovate[bot]	4ed663a94f	Update DefinitelyTyped types (non-major) (#28638 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	9 months ago
Renaud Chaput	a0e237a96f	Upgrade Redux packages (#28585 )	9 months ago
renovate[bot]	9699ea22d6	Update dependency postcss to v8.4.33 (#28602 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	9 months ago
renovate[bot]	d537b3926f	Update dependency sass-loader to v10.5.2 (#28594 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	9 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>	9 months ago
renovate[bot]	06374d07c3	Update dependency cssnano to v6.0.3 (#28581 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	9 months ago
Emelia Smith	9826b7780a	Streaming: use standard cors package instead of custom implementation (#28523 )	9 months ago
renovate[bot]	9c268c9413	Update dependency axios to v1.6.4 (#28586 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	9 months ago
renovate[bot]	0f3f98c01f	Update dependency react-redux-loading-bar to v5.0.8 (#28587 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	9 months ago
Claire	9d9008666b	Merge commit '092bb8a27af9ee87ff9ebabaf354477470ea3a94' into glitch-soc/merge-upstream	9 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>	9 months ago
renovate[bot]	c2b4588f1c	Update dependency sass to v1.69.7 (#28570 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	9 months ago
Claire	f685c953e5	Merge commit '3944b12b5eec8c6ae4666ec922411b32b3442dd6' into glitch-soc/merge-upstream	9 months ago
Matt Jankowski	3944b12b5e	Update `@typescript-eslint/parser` to version 6.17.0 (#28218 )	9 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.	9 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>	9 months ago
renovate[bot]	1982137590	Update dependency classnames to v2.5.1 (#28524 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	9 months ago
renovate[bot]	c2340682aa	Update babel monorepo to v7.23.7 (#28528 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	9 months ago
renovate[bot]	629152a80d	Update DefinitelyTyped types (non-major) (#28542 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	9 months ago
renovate[bot]	663a7b6ba9	Update devDependencies (non-major) (#28543 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	9 months ago
Claire	35b6583371	Merge commit '6374358357ee81b5f137f471f028a56974109155' into glitch-soc/merge-upstream	9 months ago
renovate[bot]	54ed01538e	Update dependency core-js to v3.35.0 (#28518 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	9 months ago
renovate[bot]	f7f7236fa2	Update dependency ws to v8.16.0 (#28504 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	9 months ago
renovate[bot]	87bf85ffdd	Update dependency classnames to v2.5.0 (#28498 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	9 months ago
renovate[bot]	87e9e87a14	Update eslint (non-major) (#28494 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	9 months ago
renovate[bot]	851a9b80c8	Update dependency react-redux-loading-bar to v5.0.7 (#28511 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	9 months ago
renovate[bot]	fb58397a33	Update dependency axios to v1.6.3 (#28509 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	9 months ago
renovate[bot]	f923eeb9b8	Update dependency sass to v1.69.6 (#28517 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	9 months ago
Renaud Chaput	fb5eb1f655	Replace our custom `compression-webpack-plugin` patch with the fixed upstream version (#28510 )	9 months ago
Claire	c5b0e6d5a0	Merge branch 'main' into glitch-soc/merge-upstream	9 months ago
Claire	92aa6e2ec9	Merge commit 'b7bdcd4f395aaa1e85930940975439d10b570f40' into glitch-soc/merge-upstream	9 months ago
Claire	30ee7339d3	Merge commit '7d9b209fe84b00eff348ea9d54905cbfffa79788' into glitch-soc/merge-upstream Conflicts: - `app/models/form/admin_settings.rb`: Upstream changed code style change, including on a line modified by glitch-soc. Kept glitch-soc's line but with the code style change applied.	9 months ago
Claire	f5b7307890	Merge commit 'f99e05710ea06cf10bbd3fb64ae8c00b095cb455' into glitch-soc/merge-upstream Conflicts: - `.rubocop_todo.yml`: Took upstream's version of the conflicting lines.	9 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.	9 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.	9 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.	9 months ago
renovate[bot]	9a24b12416	Update dependency sass-loader to v10.5.1 (#28432 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	9 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.	9 months ago
Claire	2e786e13cb	Merge commit '973597c6f1e25b16c592e5573304319aeaa375e1' into glitch-soc/merge-upstream Conflicts: - `app/validators/status_pin_validator.rb`: Upstream refactored that file, while glitch-soc had configurable limits for pinned statuses. Updated the code with upstream's refactor, while keeping glitch-soc's configurability.	9 months ago
Claire	d288a6162a	Merge commit '12c22ee5e71ae0220ea10199e4d10deb4140ec44' into glitch-soc/merge-upstream	9 months ago
Claire	b24f676cf1	Merge commit '1526e54ac6f08431c8c833f20b4be8882355967c' into glitch-soc/merge-upstream	9 months ago
Claire	3ad92e8d0d	Merge commit 'bd575a1dd69d87ca0f69873f7badf28d38e8b9ed' into glitch-soc/merge-upstream	9 months ago

1 2 3 4 5 ...

2317 Commits (695dcc6ca84ee86090b2b68d1d47ff1cc49cb304)