Skye
166d412414
Merge remote-tracking branch 'treehouse/main' into th-downstream
9 months ago
d6a8c69b5c
th: Merge remote-tracking branch 'glitch/main'
9 months ago
ecc917008e
th: maybe deal with spam
9 months ago
Skye
76b36ba10d
Revert "Revert "Merge remote-tracking branch 'TheEssem/feature/emoji-reactions' into th-downstream""
...
This reverts commit 8aae9712d9
9 months ago
e7ca82762d
Fix user creation failure handling in OAuth paths ( #29207 )
9 months ago
a1c7ba38b7
th: Merge remote-tracking branch 'glitch/main' ( 486e4bc7d3)
9 months ago
3c3ef8b9d3
Add `sidekiq_unique_jobs:delete_all_locks` task and disable `sidekiq-unique-jobs` UI by default ( #29199 )
9 months ago
eae436c5a8
Disable administrative doorkeeper routes ( #29187 )
9 months ago
19f1ffe287
Fix self-destruct schedule not actually replacing initial schedule ( #29049 )
9 months ago
94a0b7a7f0
th: CSP: allow unsafe-inline for CSS
9 months ago
e9dbe31776
th: Merge remote-tracking branch 'glitch/main'
9 months ago
27f74617cc
th: Merge remote-tracking branch 'glitch/main' ( 915cd36ac1)
9 months ago
5fa2821853
Merge commit '3205a654caf903002c2db872f802a3332201678b' into glitch-soc/merge-upstream
10 months ago
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
70de52c297
Merge commit '7a1f087659204e9d0cbba2de37e45b1921cefe20' into glitch-soc/merge-upstream
10 months ago
c8f59d2ca4
Fix `Style/TernaryParentheses` cop ( #28387 )
10 months ago
59d2ea0d82
New Crowdin Translations (automated) ( #28899 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
10 months ago
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
b19ae521b7
Add confirmation when redirecting logged-out requests to permalink ( #27792 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
10 months ago
a34d27c18f
New Crowdin Translations (automated) ( #28875 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
10 months ago
5b1eb09d54
Add annual reports for accounts ( #28693 )
10 months ago
78ee1453f9
New Crowdin Translations (automated) ( #28857 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
10 months ago
102eff7c05
Merge commit 'e2d9635074ad33cc8144adc434bcd90faae9c424' into glitch-soc/merge-upstream
10 months ago
e2d9635074
Add notification email on invalid second authenticator ( #28822 )
10 months ago
76e383ea1e
New Crowdin Translations (automated) ( #28827 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
10 months ago
3593ee2e36
Add rate-limit of TOTP authentication attempts at controller level ( #28801 )
10 months ago
5fc4ae7c5f
Move privacy policy into markdown file ( #28699 )
10 months ago
9cd17020bc
New Crowdin Translations (automated) ( #28798 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
10 months ago
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
1ab42ad12b
New Crowdin Translations (automated) ( #28749 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
10 months ago
c523a9601b
Rename local webpack* var in development env CSP config ( #28766 )
10 months ago
0ce081fe49
Remove monkey patch in favor of supported Devise config value ( #28760 )
10 months ago
e4d07c7bcc
Merge commit '01b6c83c369061c2175d50dfb3ae1db502862664' into glitch-soc/merge-upstream
10 months ago
01b6c83c36
Add a new `@/` alias for the root frontend directory and use it where possible ( #28753 )
10 months ago
01df34b9db
Remove bypass and use use glitch-soc's theming system for inert.css
10 months ago
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
2f521bc84a
Merge commit 'a2f02a07758c32f0dcc6388b4f30ca5a84e762f3' into glitch-soc/merge-upstream
10 months ago
464051c2d2
Merge commit '1070804a1a6121170f7bba923789d73b978e6fe7' into glitch-soc/merge-upstream
10 months ago
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
1323dfac80
Merge commit 'a90696011e563e62100cba56e2d52f6babbaff00' into glitch-soc/merge-upstream
10 months ago
7f471e70c0
Update new email templates ( #28416 )
...
Co-authored-by: Matt Jankowski <matt@jankowski.online>
10 months ago
1012ffac9e
New Crowdin Translations (automated) ( #28721 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
10 months ago
c97bffb054
th: ENV['TH_DEACTIVATE_DANGEROUS_THROTTLES'] (pls don't use)
10 months ago
566b41cc3b
th: ENV['TH_DEACTIVATE_THROTTLES']
10 months ago
569931db6f
th: revert throttles
10 months ago
d1559d4dee
th: renamed to TH_DEACTIVATE_AUTHED_THROTTLES + TH_DEACTIVATE_UNAUTHED_API_THROTTLES
10 months ago
f50dc0b28f
th: no more throttles for auth'd users
10 months ago
6bbcd9348e
Switch from 48px weight 600 material symbol icons to 24px weight 400 icons ( #28064 )
10 months ago
608f66f978
Change icon SVG imports to use a default import ( #28709 )
10 months ago
b86083f0dc
New Crowdin Translations (automated) ( #28708 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
10 months ago
Skye
Kouhai
Claire
Emelia Smith
Ariadne Conill
github-actions[bot]
Matt Jankowski
Eugen Rochko
Renaud Chaput
HTeuMeuLeu