glitchier-soc

Commit Graph

Author	SHA1	Message	Date
Claire	630b245bb4	Merge commit '9a73a7dcaf2e383b2ec105d71bfcea2c48cbea10' into glitch-soc/merge-upstream Conflicts: - `app/lib/settings/scoped_settings.rb`: Removed upstream, while glitch-soc had a change related to its theming system. Removed as well, as it's unused.	10 months ago
Claire	47d213e701	Merge commit '5dc634796aba951f6a085e1ed0e1b807e25d7d41' into glitch-soc/merge-upstream	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
Matt Jankowski	4e02838832	Enable "low risk" Rails 7.1 setting defaults (#28626 )	10 months ago
github-actions[bot]	01ca84e541	New Crowdin Translations (automated) (#28660 ) Co-authored-by: GitHub Actions <noreply@github.com>	10 months ago
gunchleoc	173953c23e	Fix ISO code for Canadian French (#26015 ) Co-authored-by: Claire <claire.github-309c@sitedethib.com>	10 months ago
github-actions[bot]	8e7d5fe2ac	New Crowdin Translations (automated) (#28658 ) Co-authored-by: GitHub Actions <noreply@github.com>	10 months ago
github-actions[bot]	cc67943df2	New Crowdin Translations (automated) (#28627 ) Co-authored-by: GitHub Actions <noreply@github.com>	10 months ago
Renaud Chaput	a0e237a96f	Upgrade Redux packages (#28585 )	10 months ago
Matt Jankowski	e09419f22a	Move old framework defaults file to regular config value (#28623 )	10 months ago
Matt Jankowski	a27a82939d	Remove the 7.1 marshalling format "todo" from new_framework_defaults (#28625 )	10 months ago
Jean Boussier	5a6d533c53	Enable Rails 7.1 Marshalling format (#28609 )	10 months ago
github-actions[bot]	43d800ada6	New Crowdin Translations (automated) (#28604 ) Co-authored-by: GitHub Actions <noreply@github.com>	10 months ago
github-actions[bot]	bdf4750633	New Crowdin Translations (automated) (#28590 ) Co-authored-by: GitHub Actions <noreply@github.com>	10 months ago
Claire	dfdadb92e8	Add ability to require approval when users sign up using specific email domains (#28468 )	10 months ago
Claire	9d9008666b	Merge commit '092bb8a27af9ee87ff9ebabaf354477470ea3a94' into glitch-soc/merge-upstream	10 months ago
Claire	bd415af9a1	Change streaming API host to not be overridden to localhost in development mode (#28557 )	10 months ago
github-actions[bot]	7cce2a41f2	New Crowdin Translations (automated) (#28573 ) Co-authored-by: GitHub Actions <noreply@github.com>	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
github-actions[bot]	0374e11091	New Crowdin Translations (automated) (#28529 ) Co-authored-by: GitHub Actions <noreply@github.com>	10 months ago
Claire	35b6583371	Merge commit '6374358357ee81b5f137f471f028a56974109155' into glitch-soc/merge-upstream	11 months ago
github-actions[bot]	7df9c4f6f3	New Crowdin Translations (automated) (#28481 ) Co-authored-by: GitHub Actions <noreply@github.com>	11 months ago
Claire	c5b0e6d5a0	Merge branch 'main' into glitch-soc/merge-upstream	11 months ago
Claire	19e14654cc	Reduce CSP configuration changes with upstream (#2536 )	11 months ago
github-actions[bot]	e70a65761a	New Crowdin Translations (automated) (#28467 ) Co-authored-by: GitHub Actions <noreply@github.com>	11 months ago
Claire	92aa6e2ec9	Merge commit 'b7bdcd4f395aaa1e85930940975439d10b570f40' into glitch-soc/merge-upstream	11 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.	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	a60b9acf3c	Merge commit 'b2f915b31ae884e3893e93a99da4e2b8d7e9ef7b' into glitch-soc/merge-upstream	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
github-actions[bot]	9e5ddc1745	New Crowdin Translations (automated) (#28451 ) Co-authored-by: GitHub Actions <noreply@github.com>	11 months ago
Claire	b2961dad2b	Fix lint issue in glitch-soc-only 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	8a5f2442cc	Merge commit '0530ce5e9575c09464847412f43852f438b0494e' into glitch-soc/merge-upstream	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	ac04e62a0e	Remove unused route definitions (#28430 )	11 months ago
github-actions[bot]	fecc07856c	New Crowdin Translations (automated) (#28439 ) Co-authored-by: GitHub Actions <noreply@github.com>	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	6c00d5b0c4	Fix test failure caused by glitch-soc changes	11 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.	11 months ago
Claire	d288a6162a	Merge commit '12c22ee5e71ae0220ea10199e4d10deb4140ec44' into glitch-soc/merge-upstream	11 months ago
Claire	b24f676cf1	Merge commit '1526e54ac6f08431c8c833f20b4be8882355967c' into glitch-soc/merge-upstream	11 months ago
Claire	3ad92e8d0d	Merge commit 'bd575a1dd69d87ca0f69873f7badf28d38e8b9ed' into glitch-soc/merge-upstream	11 months ago
github-actions[bot]	fa987db738	New Crowdin Translations (automated) (#28423 ) Co-authored-by: GitHub Actions <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	b474cbbd28	Merge commit '7840c6b75b61e64d89d7fd9f291277fb177e513f' into glitch-soc/merge-upstream Conflicts: - `app/controllers/api/v1/accounts/relationships_controller.rb`: We differed by listing suspended users when requesting relationships. Updated to upstream's code.	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
Matt Jankowski	89d468ada7	Fix `Style/StderrPuts` cop (#28389 )	11 months ago
Matt Jankowski	e56fb9e489	Fix `Style/SymbolProc` cop (#28386 )	11 months ago
github-actions[bot]	f99e05710e	New Crowdin Translations (automated) (#28373 ) Co-authored-by: GitHub Actions <noreply@github.com>	11 months ago
Claire	33dd5d8179	Fix Ruby lint issues	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	e5717c9bc6	Fix `Style/Lambda` cop (#28378 )	11 months ago
Matt Jankowski	1ee8d1e50e	Assign a proc to `Rack::Request.ip_filter` instead of patching method (#28380 )	11 months ago
github-actions[bot]	b2f915b31a	New Crowdin Translations (automated) (#28344 ) Co-authored-by: GitHub Actions <noreply@github.com>	11 months ago
Claire	f37c93f3d7	Change cookie rotator to use SHA1 digest for new cookies (#27392 )	11 months ago
Claire	393e851649	Change Rails' cache format to 7.0 (#27393 )	11 months ago
github-actions[bot]	14e64bc880	New Crowdin Translations (automated) (#28334 ) Co-authored-by: GitHub Actions <noreply@github.com>	11 months ago
github-actions[bot]	79a81da69c	New Crowdin Translations (automated) (#28291 ) Co-authored-by: GitHub Actions <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
github-actions[bot]	ca1b7efb06	New Crowdin Translations (automated) (#28275 ) Co-authored-by: GitHub Actions <noreply@github.com>	11 months ago
github-actions[bot]	e0dacf6b4c	New Crowdin Translations (automated) (#28264 ) Co-authored-by: GitHub Actions <noreply@github.com>	11 months ago
Matt Jankowski	42afd30324	Replace Sprockets with Propshaft (#28239 )	11 months ago
github-actions[bot]	954169966b	New Crowdin Translations (automated) (#28245 ) Co-authored-by: GitHub Actions <noreply@github.com>	11 months ago
github-actions[bot]	4238ec844d	New Crowdin Translations (automated) (#28120 ) Co-authored-by: GitHub Actions <noreply@github.com> Co-authored-by: Claire <claire.github-309c@sitedethib.com>	11 months ago
Claire	046141d2a4	Fix i18n unused check being tripped by `no` in YAML files (#2496 )	11 months ago
Matt Jankowski	5631f139c1	Fix `Lint/SymbolConversion` cop (#28175 )	11 months ago
Matt Jankowski	a8473f582d	Add zeitwerk inflector for cli->CLI (#27635 )	11 months ago
Claire	85662a5a57	Change `img-src` and `media-src` CSP directives to not include `https:` (#28025 )	11 months ago
Matt Jankowski	a1636fce7f	Move lib/devise/* to lib/devise/strategies/* (#27638 )	12 months ago
Matt Jankowski	31bef99b9e	Move lib/mastodon/premailer_webpack_strategy to lib/ (#27636 )	12 months ago
github-actions[bot]	af02484714	New Crowdin Translations (automated) (#28096 ) Co-authored-by: GitHub Actions <noreply@github.com>	12 months ago
Kouhai	bcc0a24acd	Merge remote-tracking branch 'glitch/main' (`660372d130`)	12 months ago
Kouhai	78a9906dfe	Merge remote-tracking branch 'glitch/main' (`a21fe8687e`)	12 months ago
github-actions[bot]	fad9343bab	New Crowdin Translations (automated) (#28069 ) Co-authored-by: GitHub Actions <noreply@github.com>	12 months ago
Claire	660372d130	Revert recent CSP changes (#2485 ) * Revert "Fix image and media loading when using external storage server" This reverts commit `6cfa0245ca`. * Revert "Change glitch-soc's CSP config to match upstream's closer (#2474)" This reverts commit `d59196e170`.	12 months ago
github-actions[bot]	8521238677	New Crowdin Translations (automated) (#28060 ) Co-authored-by: GitHub Actions <noreply@github.com>	12 months ago
github-actions[bot]	c810b197ad	New Crowdin Translations (automated) (#28050 ) Co-authored-by: GitHub Actions <noreply@github.com>	12 months ago
github-actions[bot]	d3ed03fd6b	New Crowdin Translations (automated) (#28036 ) Co-authored-by: GitHub Actions <noreply@github.com>	12 months ago
Claire	6cfa0245ca	Fix image and media loading when using external storage server Fixes #2479	12 months ago
Matt Jankowski	6d51ac246b	Update partials for the `AdminMailer.new_trends` mailer (#28011 )	12 months ago
github-actions[bot]	3c3e0c25ef	New Crowdin Translations (automated) (#28015 ) Co-authored-by: GitHub Actions <noreply@github.com>	12 months ago
Claire	d59196e170	Change glitch-soc's CSP config to match upstream's closer (#2474 )	12 months ago
github-actions[bot]	8ceae2bce6	New Crowdin Translations (automated) (#27966 ) Co-authored-by: GitHub Actions <noreply@github.com>	12 months ago
github-actions[bot]	9c68741f46	New Crowdin Translations (automated) (#27914 ) Co-authored-by: GitHub Actions <noreply@github.com>	12 months ago
github-actions[bot]	7232d4750d	New Crowdin Translations (automated) (#27884 ) Co-authored-by: GitHub Actions <noreply@github.com>	12 months ago
Claire	bd575a1dd6	Add banner for forwarded reports made by remote users about remote content (#27549 )	12 months ago
Eugen Rochko	d67bd44ca1	Add profile setup to onboarding in web UI (#27829 )	12 months ago
github-actions[bot]	d8074128f9	New Crowdin Translations (automated) (#27866 ) Co-authored-by: GitHub Actions <noreply@github.com>	12 months ago
github-actions[bot]	c1e071f634	New Crowdin Translations (automated) (#27848 ) Co-authored-by: GitHub Actions <noreply@github.com>	1 year ago
Eugen Rochko	7e3c10dec6	Add icons for private and disabled boost in web UI (#27817 ) Co-authored-by: Claire <claire.github-309c@sitedethib.com>	1 year ago
Claire	07a4059901	Add support for invite codes in the registration API (#27805 )	1 year ago
github-actions[bot]	e5a7b73ef4	New Crowdin Translations (automated) (#27815 ) Co-authored-by: GitHub Actions <noreply@github.com>	1 year ago
GitHub Actions	46a28fc41f	New Crowdin translations	1 year ago

1 2 3 4 5 ...

6702 Commits (th-downstream)