glitchier-soc

Commit Graph

Author	SHA1	Message	Date
Skye	fa3b5195fd	Merge remote-tracking branch 'TheEssem/feature/emoji-reactions' into th-downstream	9 months ago
Ariadne Conill	cc97d5b0be	CSP: allow unsafe-inline for CSS	9 months ago
Kouhai	e9dbe31776	th: Merge remote-tracking branch 'glitch/main'	10 months ago
Kouhai	27f74617cc	th: Merge remote-tracking branch 'glitch/main' (`915cd36ac1`)	10 months ago
Claire	5fa2821853	Merge commit '3205a654caf903002c2db872f802a3332201678b' into glitch-soc/merge-upstream	10 months ago
github-actions[bot]	ae9c675930	New Crowdin Translations (automated) (#2564 ) * New Crowdin translations * Fix bogus translation files --------- Co-authored-by: GitHub Actions <noreply@github.com> Co-authored-by: Claire <claire.github-309c@sitedethib.com>	10 months ago
Claire	70de52c297	Merge commit '7a1f087659204e9d0cbba2de37e45b1921cefe20' into glitch-soc/merge-upstream	10 months ago
Matt Jankowski	c8f59d2ca4	Fix `Style/TernaryParentheses` cop (#28387 )	10 months ago
github-actions[bot]	59d2ea0d82	New Crowdin Translations (automated) (#28899 ) Co-authored-by: GitHub Actions <noreply@github.com>	10 months ago
Claire	22cfab0ebf	Merge commit '01ce9df88008cee705b7e02a4581802afa07c3df' into glitch-soc/merge-upstream Conflicts: - `tsconfig.json`: Upstream made style fixes, while glitch-soc had extra options. Ported upstream's style fixes.	10 months ago
Eugen Rochko	b19ae521b7	Add confirmation when redirecting logged-out requests to permalink (#27792 ) Co-authored-by: Claire <claire.github-309c@sitedethib.com>	10 months ago
github-actions[bot]	a34d27c18f	New Crowdin Translations (automated) (#28875 ) Co-authored-by: GitHub Actions <noreply@github.com>	10 months ago
Eugen Rochko	5b1eb09d54	Add annual reports for accounts (#28693 )	10 months ago
github-actions[bot]	78ee1453f9	New Crowdin Translations (automated) (#28857 ) Co-authored-by: GitHub Actions <noreply@github.com>	10 months ago
Claire	102eff7c05	Merge commit 'e2d9635074ad33cc8144adc434bcd90faae9c424' into glitch-soc/merge-upstream	10 months ago
Claire	e2d9635074	Add notification email on invalid second authenticator (#28822 )	10 months ago
github-actions[bot]	76e383ea1e	New Crowdin Translations (automated) (#28827 ) Co-authored-by: GitHub Actions <noreply@github.com>	10 months ago
Claire	3593ee2e36	Add rate-limit of TOTP authentication attempts at controller level (#28801 )	10 months ago
Matt Jankowski	5fc4ae7c5f	Move privacy policy into markdown file (#28699 )	10 months ago
github-actions[bot]	9cd17020bc	New Crowdin Translations (automated) (#28798 ) Co-authored-by: GitHub Actions <noreply@github.com>	10 months ago
Claire	c59fb65ddc	Merge commit '127503eb2cdd67126974bee304dde0f183300b84' into glitch-soc/merge-upstream Conflicts: - `app/helpers/accounts_helper.rb`: Conflict due to glitch-soc's option to hide followers count. Ported upstream changes. Additional changes: - `app/views/application/mailer/_account.html.haml`: Ported glitch-soc's option to hide followers count. - `app/views/settings/flavours/show.html.haml`: Ported the `frontend_asset_url` helper change to glitch-soc.	10 months ago
github-actions[bot]	1ab42ad12b	New Crowdin Translations (automated) (#28749 ) Co-authored-by: GitHub Actions <noreply@github.com>	10 months ago
Matt Jankowski	c523a9601b	Rename local webpack* var in development env CSP config (#28766 )	10 months ago
Matt Jankowski	0ce081fe49	Remove monkey patch in favor of supported Devise config value (#28760 )	10 months ago
Essem	cd36daecfe	Add notification emails for reactions	10 months ago
Essem	f578317f53	Add support for emoji reactions Squashed, modified, and rebased from glitch-soc/mastodon#2221. Co-authored-by: fef <owo@fef.moe> Co-authored-by: Jeremy Kescher <jeremy@kescher.at> Co-authored-by: neatchee <neatchee@gmail.com> Co-authored-by: Ivan Rodriguez <104603218+IRod22@users.noreply.github.com> Co-authored-by: Plastikmensch <plastikmensch@users.noreply.github.com>	10 months ago
Claire	e4d07c7bcc	Merge commit '01b6c83c369061c2175d50dfb3ae1db502862664' into glitch-soc/merge-upstream	10 months ago
Renaud Chaput	01b6c83c36	Add a new `@/` alias for the root frontend directory and use it where possible (#28753 )	10 months ago
Claire	01df34b9db	Remove bypass and use use glitch-soc's theming system for inert.css	10 months ago
Claire	34c9f77b3e	Merge commit '7f471e70c0e1cc106747634d20f173a68a9272d7' into glitch-soc/merge-upstream Conflicts: - `app/views/layouts/mailer.html.haml`: Conflict caused by glitch-soc's theming system. Used glitch-soc's path for the mailer pack.	10 months ago
Claire	2f521bc84a	Merge commit 'a2f02a07758c32f0dcc6388b4f30ca5a84e762f3' into glitch-soc/merge-upstream	10 months ago
Claire	464051c2d2	Merge commit '1070804a1a6121170f7bba923789d73b978e6fe7' into glitch-soc/merge-upstream	10 months ago
Claire	60298af3c4	Merge commit 'c6684aa1e392f2dd86af4362b4259809549abaad' into glitch-soc/merge-upstream Conflicts: - `app/views/layouts/application.html.haml`: Upstream changed how the `inert.css` file is included. The conflict is caused by glitch-soc's theming system. Ported the upstream change. Additional changes: - `config/webpack/shared.js`: bypass glitch-soc's theming system for `inert` pack.	10 months ago
Claire	1323dfac80	Merge commit 'a90696011e563e62100cba56e2d52f6babbaff00' into glitch-soc/merge-upstream	10 months ago
HTeuMeuLeu	7f471e70c0	Update new email templates (#28416 ) Co-authored-by: Matt Jankowski <matt@jankowski.online>	10 months ago
github-actions[bot]	1012ffac9e	New Crowdin Translations (automated) (#28721 ) Co-authored-by: GitHub Actions <noreply@github.com>	10 months ago
Kouhai	c97bffb054	th: ENV['TH_DEACTIVATE_DANGEROUS_THROTTLES'] (pls don't use)	10 months ago
Kouhai	566b41cc3b	th: ENV['TH_DEACTIVATE_THROTTLES']	10 months ago
Kouhai	569931db6f	th: revert throttles	10 months ago
Kouhai	d1559d4dee	th: renamed to TH_DEACTIVATE_AUTHED_THROTTLES + TH_DEACTIVATE_UNAUTHED_API_THROTTLES	10 months ago
Kouhai	f50dc0b28f	th: no more throttles for auth'd users	10 months ago
Claire	6bbcd9348e	Switch from 48px weight 600 material symbol icons to 24px weight 400 icons (#28064 )	10 months ago
Renaud Chaput	608f66f978	Change icon SVG imports to use a default import (#28709 )	10 months ago
github-actions[bot]	b86083f0dc	New Crowdin Translations (automated) (#28708 ) Co-authored-by: GitHub Actions <noreply@github.com>	10 months ago
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

1 2 3 4 5 ...

6696 Commits (309dd36816fbfb891141c6596a398984c97c553d)