glitchier-soc

Commit Graph

Author	SHA1	Message	Date
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
renovate[bot]	b7bdcd4f39	Update dependency @material-symbols/svg-600 to v0.14.3 (#28276 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	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	bc33be0342	Merge commit '23e32a4b3031d1da8b911e0145d61b4dd47c4f96' into glitch-soc/merge-upstream Conflicts: - `Gemfile.lock`: Conflict because we had updated the `json-ld` gem to fix a yanked dependency. Kept our version of `json-ld` while updating other dependencies.	11 months ago
renovate[bot]	ab1201c9d9	Update dependency regenerator-runtime to v0.14.1 (#28393 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	11 months ago
renovate[bot]	fc4eaa779a	Update dependency cssnano to v6.0.2 (#28382 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	11 months ago
renovate[bot]	fad7dca0e4	Update dependency prom-client to v15.1.0 (#28394 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	11 months ago
renovate[bot]	287384b3bb	Update DefinitelyTyped types (non-major) (#28407 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	11 months ago
renovate[bot]	d099cf67c0	Update eslint (non-major) (#28408 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	11 months ago
Claire	4113fbf6e8	Merge commit 'f476d9dab2f5cca6ae44b95961df6b6557d66dab' into glitch-soc/merge-upstream Conflicts: - `lib/sanitize_ext/sanitize_config.rb`: Upstream enforced new code style rules, where we had different code. Applied the new code style rules.	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
Claire	1474318691	Merge commit 'a916251d8a8fffcaeb6be80eacf50138a53650dc' into glitch-soc/main Conflicts: - `app/models/trends/statuses.rb`: Upstream fixed a bug in the trending post condition. Glitch-soc's condition is different because we potentially allow CWed content to trend. Ported upstream's fix while keeping glitch-soc's change. - `config/initializers/content_security_policy.rb`: Kept our version for now, we will switch to upstream later down the road.	11 months ago
Matt Jankowski	cd9ebf5f0f	Update stylelint to version 16.0.2 (#28354 )	11 months ago
renovate[bot]	49150e2f1d	Update dependency ws to v8.15.1 (#28343 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	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
renovate[bot]	9dfa940636	Update babel monorepo to v7.23.6 (#28319 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	11 months ago
renovate[bot]	b82fc8a2ca	Update dependency ws to v8.15.0 (#28308 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	11 months ago
renovate[bot]	a117155728	Update DefinitelyTyped types (non-major) (#28310 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	11 months ago
renovate[bot]	7ddd937330	Update dependency prettier to v3.1.1 (#28311 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	11 months ago
renovate[bot]	d0e7999a90	Update dependency typescript to v5.3.3 (#28312 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	11 months ago
renovate[bot]	bd88883b6e	Update eslint (non-major) (#28313 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	11 months ago
Claire	9f92b05bd2	Merge commit '2e6bf60f1549e5c1f1cfea2d614f978bea17b8a2' into glitch-soc/merge-upstream Conflicts: - `README.md`: Upstream has updated their README but we have a completely different one. Kept our version of `README.md`	11 months ago
renovate[bot]	54db2006a9	Update dependency sass-loader to v10.5.0 (#28254 ) 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
renovate[bot]	996c13a24d	Update dependency core-js to v3.34.0 (#28241 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	11 months ago
renovate[bot]	154fb95e44	Update dependency postcss to v8.4.32 (#28185 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	11 months ago
renovate[bot]	b4fef6c26f	Update DefinitelyTyped types (non-major) (#28199 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	11 months ago
renovate[bot]	0ca7a50e96	Update devDependencies (non-major) (#28200 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	11 months ago
renovate[bot]	02a98210e8	fix(deps): update dependency jsdom to v23.0.1 (#28135 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	12 months ago
renovate[bot]	0212e0cfbf	fix(deps): update dependency @babel/runtime to v7.23.5 (#28136 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	12 months ago
renovate[bot]	c761cc4738	fix(deps): update babel monorepo to v7.23.5 (#28122 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	12 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]	7b56085f11	Update dependency typescript to v5.3.2 (#28078 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	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
renovate[bot]	73ab080608	Update dependency jsdom to v23 (#28075 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	12 months ago
renovate[bot]	1ee3314f58	Update dependency @types/npmlog to v7 (#28048 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	12 months ago
renovate[bot]	e1bb79718b	Update babel monorepo to v7.23.4 (#28004 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	12 months ago
renovate[bot]	12c22ee5e7	Update eslint (non-major) (#27995 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	12 months ago
renovate[bot]	d75c7ac5a8	Update dependency core-js to v3.33.3 (#27980 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	12 months ago
renovate[bot]	6d60b936ad	Update devDependencies (non-major) (#27992 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	12 months ago
renovate[bot]	6c2e78f1b1	Update dependency @material-symbols/svg-600 to v0.14.1 (#27907 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	94178e2f68	Update dependency react-redux-loading-bar to v5.0.5 (#27916 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	669a7157cb	Update dependency webpack-bundle-analyzer to v4.10.1 (#27885 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	5d75799afa	Update dependency axios to v1.6.2 (#27861 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
Emelia Smith	15b2d7eec5	Split streaming server from web server (#24702 )	1 year ago
renovate[bot]	35b9749b95	Update dependency webpack-bundle-analyzer to v4.10.0 (#27852 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	373aa95ddd	Update formatjs monorepo (#27849 ) 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]	0c98a9d9be	Update devDependencies (non-major) (#25612 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	5bca5c4c5b	Update formatjs monorepo (#27823 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	a7117bbef6	Update dependency @rails/ujs to v7.1.2 (#27811 ) 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
renovate[bot]	4812832620	Update dependency axios to v1.6.1 (#27773 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	23d88aa943	Update babel monorepo to v7.23.3 (#27789 ) 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
Matt Jankowski	790f6356be	Deduplicate yarn lock file (#27670 )	1 year ago
renovate[bot]	14e49e5e36	Update dependency react-select to v5.8.0 (#27722 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	ac9f92bd73	Update formatjs monorepo (#27746 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	0ca27b2d81	Update DefinitelyTyped types (non-major) (#27713 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	22b4713d2e	Update eslint (non-major) (#27715 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
Renaud Chaput	0e3401bc1c	Improve Babel configuration and automatically load polyfills (#27333 )	1 year ago
renovate[bot]	b8adb08f92	Update dependency axios to v1.6.0 (#27580 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	372494e553	Update dependency punycode to v2.3.1 (#27625 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	547d3c1b9b	Update dependency core-js to v3.33.2 (#27624 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	c2cc1df5ef	Update dependency @types/react to v18.2.33 (#27615 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	400f5c9174	Update dependency @material-symbols/svg-600 to v0.13.2 (#27565 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	6e018f7228	Update dependency sass to v1.69.5 (#27566 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	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]	53fd28b889	Update dependency react-select to v5.7.7 (#27003 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	f7b34707a8	Update babel monorepo to v7.23.2 (#27118 ) 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
renovate[bot]	132204031f	Update dependency core-js to v3.33.1 (#27481 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	bb5bae186f	Update dependency webpack-merge to v5.10.0 (#27420 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	69d3318055	Update dependency rimraf to v5.0.5 (#27140 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	cd08b436ab	Update dependency sass to v1.69.4 (#27004 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	6f1eb89d21	Update dependency ws to v8.14.2 (#26980 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	6f429d3f1b	Update formatjs monorepo (#27416 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	773133befa	Update eslint (non-major) (#27415 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
Claire	245513d630	Merge commit '1b70d7ed7c0fd3a9fcf028bf76b8c62ac8b3897f' into glitch-soc/merge-upstream	1 year ago
Renaud Chaput	1b70d7ed7c	Upgrade to react-router v5 (#25047 ) Co-authored-by: Claire <claire.github-309c@sitedethib.com>	1 year ago
Claire	b867d4581e	Merge commit 'c91c0175db1cc8b954a977d29472886234ce9586' into glitch-soc/merge-upstream Conflicts: - `spec/controllers/api/v1/timelines/tag_controller_spec.rb`: Glitch-soc had a few extra lines in this file to account for a different default setting. This file got replaced by `spec/requests/api/v1/timelines/tag_spec.rb`, into which the glitch-soc additions were moved too. Additional changes: - `spec/requests/api/v1/statuses/sources_spec.rb`: Add glitch-soc-only attribute `content_type`.	1 year ago
renovate[bot]	a00fc83701	Update dependency bufferutil to v4.0.8 (#27412 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
Claire	3da7afdeed	Merge commit 'c310374a2f83a890520ace50e41c1e3d046e15e1' into glitch-soc/merge-upstream	1 year ago
renovate[bot]	5fc5a548b4	Update DefinitelyTyped types (non-major) (#27327 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
renovate[bot]	eabe839744	Update eslint (non-major) (#27328 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	1 year ago
Claire	53f5b27bd1	Merge commit '640421f661ee4d7e76a2aab607e7b15687940b6f' into glitch-soc/merge-upstream	1 year ago
Claire	e9a181c52c	Merge commit 'e95d25e1013b6328457b81bd98e8d6a841d45ec2' into glitch-soc/merge-upstream	1 year ago
Claire	702d162998	Merge commit '5393be7a21331c8615ffb79c2271db92f6959458' into glitch-soc/merge-upstream Conflicts: - `app/controllers/auth/registrations_controller.rb`: Not a real conflict. Upstream removed the `set_instance_presenter` private method from this class, and glitch-soc has an extra private method right besides it for the theming system. Removed `set_instance_presenter` as upstream did. - `app/controllers/auth/sessions_controller.rb`: Not a real conflict. Upstream removed the `set_instance_presenter` private method from this class, and glitch-soc has an extra private method right besides it for the theming system. Removed `set_instance_presenter` as upstream did.	1 year ago

1 2 3 4 5 ...

2317 Commits (cc363629bea40d738b41608152b9d88b1a509621)