mirrors
/
catstodon
mirror of https://git.kescher.at/CatCatNya/catstodon.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity
22,266 Commits
5 Branches
114 Tags
270 MiB
develop
main
essem/emoji-reactions-plus-upstream
merge/emoji-reactions
merge/filtering
v4.3.0-alpha.3+glitch+cat+1.2.2
v4.3.0-alpha.3+glitch+cat+1.2.1
v4.3.0-alpha.3+glitch+cat+1.2.0
v4.3.0-alpha.3+glitch+cat+1.1.3
v4.3.0-alpha.3+glitch+cat+1.1.2
v4.3.0-alpha.3+glitch+cat+1.1.1
v4.3.0-alpha.3+glitch+cat+1.1.0
v4.3.0-alpha.3+glitch+cat+1.0.9
v4.3.0-alpha.3+glitch+cat+1.0.8
v4.3.0-alpha.3+glitch+cat+1.0.7
v4.3.0-alpha.3+glitch+cat+1.0.6
v4.3.0-alpha.3+glitch+cat+1.0.5
v4.3.0-alpha.3+glitch+cat+1.0.4
v4.3.0-alpha.3+glitch+cat+1.0.3
v4.3.0-alpha.3+glitch+cat+1.0.2
v4.3.0-alpha.3+glitch+cat+1.0.1
v4.3.0-alpha.3+glitch+cat+1.0.0
v4.3.0-alpha.2+glitch+cat+1.0.18
v4.3.0-alpha.1+glitch+cat+1.0.17
v4.3.0-alpha.1+glitch+cat+1.0.16
v4.3.0-alpha.1+glitch+cat+1.0.15
v4.3.0-alpha.0+glitch+cat+1.0.14
v4.3.0-alpha.0+glitch+cat+1.0.13
v4.3.0-alpha.0+glitch+cat+1.0.12
v4.3.0-alpha.0+glitch+cat+1.0.11
v4.3.0-alpha.0+glitch+cat+1.0.10
v4.3.0-alpha.0+glitch+cat+1.0.9
v4.3.0-alpha.0+glitch+cat+1.0.8
v4.3.0-alpha.0+glitch+cat+1.0.7
v4.3.0-alpha.0+glitch+cat+1.0.6
v4.3.0-alpha.0+glitch+cat+1.0.5
v4.3.0-alpha.0+glitch+cat+1.0.4
v4.3.0-alpha.0+glitch+cat+1.0.3
v4.3.0-alpha.0+glitch+cat+1.0.2
v4.3.0+1.0.1
v4.3.0+1.0.0
4.0.1+1.0.0
4.0.1+1.0.1
4.0.1+1.0.2
4.0.1+1.0.3
4.0.1+1.0.4
v3.5.3+1.0.0
v3.5.3+1.0.1
v3.5.3+1.0.3
v3.5.3+1.0.4
v3.5.3+1.0.5
v3.5.3+1.0.6
v3.5.3+1.0.7
v3.5.3+1.0.8
v3.5.3+1.0.9
v3.5.3+1.1.0
v3.5.3+1.1.1
v3.5.3+1.1.2
v3.5.3+1.1.3
v3.5.3+1.1.4
v3.5.3+1.1.5
v3.5.3+1.1.6
v3.5.3+1.2.1
v3.5.3+1.2.2
v3.5.3+1.2.3
v4.0.0+1.0.0
v4.0.2+1.0.0
v4.0.2+1.0.1
v4.0.2+1.0.10
v4.0.2+1.0.11
v4.0.2+1.0.12
v4.0.2+1.0.13
v4.0.2+1.0.2
v4.0.2+1.0.3
v4.0.2+1.0.4
v4.0.2+1.0.5
v4.0.2+1.0.6
v4.0.2+1.0.7
v4.0.2+1.0.8
v4.0.2+1.0.9
v4.0.2+1.1.0
v4.0.2+1.1.1
v4.0.2+1.1.2
v4.0.2+1.1.3
v4.0.2+1.1.4
v4.0.2+1.1.5
v4.0.2+1.1.6
v4.0.2+1.1.7
v4.0.2+1.1.8
v4.0.2+1.1.9
v4.1.0+1.0.0
v4.1.0+1.0.1
v4.1.0+2.0.0
v4.1.0+2.0.1
v4.1.0+2.0.2
v4.1.0+2.0.4
v4.1.0+2.0.5
v4.1.0+2.1.0
v4.1.0+2.1.1
v4.1.1+1.0.0
v4.1.1+1.0.1
v4.1.1+1.0.2
v4.1.1+1.0.3
v4.1.1+1.0.4
v4.1.1+1.0.5
v4.1.1+1.0.6
v4.1.1+1.0.7
v4.1.2+1.0.0
v4.1.2+1.0.1
v4.1.2+1.0.2
v4.1.2+1.0.3
v4.1.2+1.0.4
v4.1.2+1.1.0
v4.1.2+1.1.1
v4.1.2+1.1.2
v4.1.2+1.1.3
v4.1.2+1.1.4
v4.1.3+1.0.0
v4.1.4+1.0.0
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'main'
${ noResults }
Commit Graph

3776 Commits (main)

Author SHA1 Message Date
github-actions[bot] 1025fff6b9
New Crowdin Translations (automated) (#29772) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2 months ago
github-actions[bot] b3d970bdb8
New Crowdin Translations (automated) (#29756) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2 months ago
Renaud Chaput 02ea161506
Support "system" theme setting (light/dark theme depending on user system preference) (#29748) 
Co-authored-by: Nishiki Liu <hello@nshki.com>
 2 months ago
github-actions[bot] 799e3be9bd
New Crowdin Translations (automated) (#29726) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2 months ago
github-actions[bot] 5db5fa879b
New Crowdin Translations (automated) (#29708) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2 months ago
Matt Jankowski a59f5694fe
Add empty line after ✨magic✨ frozen string comment (#29696) 2 months ago
github-actions[bot] c007dd5dd2
New Crowdin Translations (automated) (#29687) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2 months ago
Jeremy Kescher 0353a3d759
Merge branch 'glitch-soc' into develop 
# Conflicts:
#	app/javascript/flavours/glitch/features/compose/components/emoji_picker_dropdown.jsx
#	app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx
#	app/javascript/mastodon/features/ui/components/navigation_panel.jsx
 2 months ago
Claire 44bf7b8128
Add notifications of severed relationships (#27511) 2 months ago
Claire eb3aed9545 Merge commit '50fd94f481cf23a81662140afe99df2fbf1149be' into glitch-soc/merge-upstream 
Conflicts:
- `yarn.lock`:
  Upstream touched a dependency that is on an adjacent line to a
  glitch-soc-only dependency in that file.
  Updated as upstream did.
 2 months ago
github-actions[bot] 6c0b1a41a1
New Crowdin Translations (automated) (#29657) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2 months ago
Claire 876aa35350 Merge commit 'ffc5be4820ed7bad4656489f096230dd7965140b' into glitch-soc/merge-upstream 
Conflicts:
- `package.json`:
  Upstream updated a dependency that is on an adjacent line to a
  glitch-soc-only dependency in that file.
  Updated as upstream did.
- `yarn.lock`:
  Upstream updated a dependency that is on an adjacent line to a
  glitch-soc-only dependency in that file.
  Updated as upstream did.
 2 months ago
Jeremy Kescher a53f2cf970
Merge branch 'glitch-soc' into develop 2 months ago
Claire bc6f9befde
Change “Notifications” settings page to “E-mail notifications” (#29646) 2 months ago
Matt Jankowski 6c68c3c0ce
Introduce `inline_svg` gem, minimal usage, prep for material design icons (#29612) 2 months ago
github-actions[bot] 4e61bce4e9
New Crowdin Translations (automated) (#29641) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2 months ago
Claire cf08a438e7
Add badge on account card in report moderation interface when account is already suspended (#29592) 2 months ago
Matt Jankowski ecdbf15ebe
Remove unused `link_to_older` and `link_to_newer` helper methods (#29620) 2 months ago
github-actions[bot] 04817e965a
New Crowdin Translations (automated) (#29623) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2 months ago
Claire 82c2af0356
Fix `user_mailer.welcome.hashtags_recent_count` not having plural form (#29607) 2 months ago
Claire 2e49bc97b0 Merge commit '7720c684c5bf54e73e8815defe15473777d1c201' into glitch-soc/merge-upstream 2 months ago
github-actions[bot] 6865fda593
New Crowdin Translations (automated) (#29603) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2 months ago
Jeremy Kescher 21a23b58ab
Merge branch 'glitch-soc' into develop 2 months ago
Jeremy Kescher caccc2e0f4
Merge branch 'glitch-soc' into develop 
# Conflicts:
#	README.md
#	app/javascript/flavours/glitch/components/status.jsx
#	app/javascript/flavours/glitch/features/notifications/components/column_settings.jsx
#	app/javascript/flavours/glitch/locales/en.json
#	app/javascript/flavours/glitch/reducers/compose.js
#	app/javascript/flavours/glitch/styles/components.scss
#	app/javascript/mastodon/reducers/compose.js
#	app/models/notification.rb
 2 months ago
Claire e91ede5be6 Merge commit 'df6086d4027910fb160d531b4fe7ffdec26b0cd7' into glitch-soc/merge-upstream 2 months ago
Matt Jankowski 049d9171eb
Use `with_options` for shared option in `accounts#show` routing block (#28914) 2 months ago
Matt Jankowski 79e7590578
Clean up `activitypub` module route scope near instance actor (#29579) 2 months ago
Matt Jankowski 65e8349980
Clean up `activitypub` module route scope near collections/boxes (#29580) 2 months ago
Matt Jankowski 18ffd4d925
Add module `instances` route scope in api routes (#29581) 2 months ago
Matt Jankowski 01ecc80118
Add module `accounts` route scope in api routes (#29582) 2 months ago
github-actions[bot] 5aea35de13
New Crowdin Translations (automated) (#29587) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2 months ago
Claire 48134bcd10 Merge commit 'acf3f410aef3cfb9e8f5f73042526de9b2f96d13' into glitch-soc/merge-upstream 2 months ago
Claire 27ffc09847 Merge commit 'af4e44e30a6a2701102a7d573e47e9db42025821' into glitch-soc/merge-upstream 2 months ago
github-actions[bot] 171948b910
New Crowdin Translations (automated) (#29563) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2 months ago
github-actions[bot] dc36b961aa
New Crowdin Translations (automated) (#29554) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2 months ago
Claire a5127d0ef8 Merge commit '24319836de6046fb2985ec1a24c30ad7d47584d7' into glitch-soc/merge-upstream 
Conflicts:
- `config/routes/api.rb`:
  glitch-soc has an extra `:destroy` action on notifications for historical reasons.
  Kept it for now, while otherwise updating as upstream did.
 2 months ago
Matt Jankowski a38e424185
Use unchanging github links in docs/comments (#29545) 2 months ago
Eugen Rochko c10bbf5fe3
Add notification policies and notification requests in web UI (#29433) 2 months ago
Eugen Rochko 5b3a8737d6
Add hints for rules (#29539) 2 months ago
github-actions[bot] f85168b189
New Crowdin Translations (automated) (#29467) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2 months ago
Eugen Rochko 50b17f7e10
Add notification policies and notification requests (#29366) 2 months ago
Claire 45e56db8e4 Merge commit 'f89512fbedb547f66a72eefdff047768fb505eb6' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Upstream updated its README, we have a completely different one.
  Kept our version.
 2 months ago
Jeremy Kescher 6aa17a7c1b
Merge branch 'glitch-soc' into develop 3 months ago
Dave MacLeod b6b94c971f
Add Interlingue to available_locales (#28630) 3 months ago
Claire 159e500749 Merge commit '18945f62e07617ac44b7a25a61799b0959fe67f7' into glitch-soc/merge-upstream 3 months ago
HTeuMeuLeu 934cab7508
New welcome email (#28883) 
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
 3 months ago
Jeremy Kescher 05747febb6
Merge branch 'glitch-soc' into develop 3 months ago
Claire 4d7e7cc562 Merge commit '6dfe318f34d69066dc0f453a228fdfc6af84b62e' into glitch-soc/merge-upstream 3 months ago
Claire 1c4f36422d Fix bogus translation files 3 months ago
github-actions[bot] cdf5098166
New Crowdin Translations (automated) (#29452) 
Co-authored-by: GitHub Actions <noreply@github.com>
 3 months ago
GitHub Actions ab195bcee1 New Crowdin translations 3 months ago
Jeremy Kescher de1e89f42c
Merge branch 'glitch-soc' into develop 3 months ago
Claire ccdf56085d Merge commit '7f84bbfd92377689f84121ec45c5b9d809d94cde' into glitch-soc/merge-upstream 3 months ago
github-actions[bot] 7f84bbfd92
New Crowdin Translations (automated) (#29430) 
Co-authored-by: GitHub Actions <noreply@github.com>
 3 months ago
Claire a482932649 Merge commit '6f7615ba86afda56e1d661442286a1d68467a525' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/application_controller.rb`:
  Not a real conflict, upstream fixed a bug in a line adjacent to code
  modified by glitch-soc.
  Ported upstream's change.
 3 months ago
github-actions[bot] bc4c5ed918
New Crowdin Translations (automated) (#29423) 
Co-authored-by: GitHub Actions <noreply@github.com>
 3 months ago
Claire 67ca8bb56a Merge commit '8156113d58db851d00f8052e66459e6dafb71e82' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/packs/admin.jsx`:
  Change applied to `app/javascript/core/admin.js` instead.
 3 months ago
github-actions[bot] 98e3dc2578
New Crowdin Translations (automated) (#29382) 
Co-authored-by: GitHub Actions <noreply@github.com>
 3 months ago
Jeremy Kescher 009251a17d
Merge branch 'glitch-soc' into develop 
# Conflicts:
#	app/javascript/mastodon/features/ui/components/navigation_panel.jsx
#	app/javascript/mastodon/initial_state.js
#	app/serializers/initial_state_serializer.rb
#	config/initializers/chewy.rb
#	config/locales/en.yml
#	config/locales/ja.yml
 3 months ago
Claire 2dc244784c Merge commit 'cfa71a4d16e71b04a42dda564ed8e188bd1badd9' into glitch-soc/merge-upstream 3 months ago
Claire 1ad91dece8 Merge commit '9d8dfeb5fbbc274482489a3ac9f22dd736da156c' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/packs/admin.jsx`:
  Changes applied to `app/javascript/core/admin.js` instead.
 3 months ago
Claire 7901dc9e24 Merge commit '491dd9764244c8adf37861f00d916c96bdbfdaf8' into glitch-soc/merge-upstream 
Conflicts:
- `app/workers/scheduler/auto_close_registrations_scheduler.rb`:
  Changes were already cherry-picked and updated further in glitch-soc.
  Kept glitch-soc's version.
 3 months ago
Claire d2cfc6e5e2 Merge commit '08342ad40c1b92caf873282190efe8533a7d6e2e' into glitch-soc/merge-upstream 3 months ago
Claire ef3d15554b Merge commit 'c645490d553124d800d30488595f7d2d9d61584d' into glitch-soc/merge-upstream 
Conflicts:
- `Gemfile.lock`:
  Changes were already cherry-picked and updated further in glitch-soc.
  Kept glitch-soc's version.
- `README.md`:
  Upstream updated its README, we have a completely different one.
  Kept glitch-soc's README.
- `app/models/account.rb`:
  Not a real conflict, upstream updated some lines textually adjacent
  to glitch-soc-specific lines.
  Ported upstream's changes.
 3 months ago
Claire ab2f0daa10 Merge commit 'aaa58d4807377e04649499ebee91757b16b9a007' into glitch-soc/merge-upstream 
Conflicts:
- `.github/workflows/build-security.yml`:
  Changes were already cherry-picked and adapted in glitch-soc.
  Kept glitch-soc's version.
- `Gemfile.lock`:
  Changes were already cherry-picked and updated further in glitch-soc.
  Kept glitch-soc's version.
- `lib/mastodon/version.rb`:
  Changes were already cherry-picked and updated further in glitch-soc.
  Kept glitch-soc's version.
 3 months ago
Claire 5b9ddfcfcc Merge commit 'fa0ba677538588086d83c97c0ea56f9cd1556590' into glitch-soc/merge-upstream 3 months ago
Jeremy Kescher 6e635a4283
Clarify English locale 3 months ago
Claire 20615a516d Merge commit '805dba7f8d2a2d5f910ec1396247b36417170345' into glitch-soc/merge-upstream 3 months ago
noellabo d518f06eae
Add reject blurhash to Admin setting 3 months ago
Jeremy Kescher a4e12a484d
Merge branch 'glitch-soc' into develop 3 months ago
Paolo Melchiorre aca691726b
Fix #21492 Add missing WebP hint in avatar/header localizations (#22395) 3 months ago
github-actions[bot] bba4118ddd
New Crowdin Translations (automated) (#29369) 
Co-authored-by: GitHub Actions <noreply@github.com>
 3 months ago
Claire d23f445527 Automatically switch from open to approved registrations in absence of moderators (#29318) 3 months ago
Claire b71904816a
Change registrations to be disabled by default for new servers (#29280) 3 months ago
github-actions[bot] 449fcf1ae7
New Crowdin Translations (automated) (#29343) 
Co-authored-by: GitHub Actions <noreply@github.com>
 3 months ago
Claire 2751acb6cd
Automatically switch from open to approved registrations in absence of moderators (#29318) 3 months ago
github-actions[bot] fd2b6c29c6
New Crowdin Translations (automated) (#29311) 
Co-authored-by: GitHub Actions <noreply@github.com>
 3 months ago
github-actions[bot] 9a2b9d1484
New Crowdin Translations (automated) (#29298) 
Co-authored-by: GitHub Actions <noreply@github.com>
 3 months ago
github-actions[bot] ad16362efe
New Crowdin Translations (automated) (#29255) 
Co-authored-by: GitHub Actions <noreply@github.com>
 3 months ago
noellabo 5255bd08e0
Add reject pattern to Admin setting (Ported to Glitch Soc) 
# Conflicts:
#	app/views/admin/settings/shared/_links.html.haml
#	config/routes/admin.rb
 3 months ago
Matt Jankowski 1d9d14b8de
Use `abort` instead of `warn(); exit` in boot.rb env check (#29209) 3 months ago
Jeremy Kescher ce878a78bb
Merge branch 'glitch-soc' into develop 3 months ago
github-actions[bot] 1c93d625c6
New Crowdin Translations (automated) (#29195) 
Co-authored-by: GitHub Actions <noreply@github.com>
 3 months ago
Claire e7ca82762d Fix user creation failure handling in OAuth paths (#29207) 3 months ago
Claire d4d0565b0f
Fix user creation failure handling in OAuth paths (#29207) 3 months ago
Jeremy Kescher 1c9291adcd
Merge branch 'glitch-soc' into develop 
# Conflicts:
#	app/javascript/flavours/glitch/styles/components/accounts.scss
#	app/javascript/flavours/glitch/styles/components/status.scss
 3 months ago
Claire 3c3ef8b9d3 Add `sidekiq_unique_jobs:delete_all_locks` task and disable `sidekiq-unique-jobs` UI by default (#29199) 3 months ago
Claire 554e2a019e
Add `sidekiq_unique_jobs:delete_all_locks` task and disable `sidekiq-unique-jobs` UI by default (#29199) 3 months ago
Emelia Smith eae436c5a8 Disable administrative doorkeeper routes (#29187) 3 months ago
Emelia Smith 46142cdbdd
Disable administrative doorkeeper routes (#29187) 3 months ago
github-actions[bot] 6482948547
New Crowdin Translations (automated) (#29156) 
Co-authored-by: GitHub Actions <noreply@github.com>
 3 months ago
Claire 8125dae5a8
Rename `ES_CA_CERT` to `ES_CA_FILE` for consistency (#29147) 3 months ago
github-actions[bot] c07028b2fa
New Crowdin Translations (automated) (#29152) 
Co-authored-by: GitHub Actions <noreply@github.com>
 3 months ago
github-actions[bot] 2a362d62a8
New Crowdin Translations (automated) (#29145) 
Co-authored-by: GitHub Actions <noreply@github.com>
 3 months ago
github-actions[bot] 17052714a2
New Crowdin Translations (automated) (#29121) 
Co-authored-by: GitHub Actions <noreply@github.com>
 3 months ago
Claire 2912829411
Add support for specifying custom CA cert for Elasticsearch (#29122) 3 months ago
Jeremy Kescher 40ef7b3849
Merge branch 'glitch-soc' into develop 
# Conflicts:
#	app/javascript/flavours/glitch/initial_state.js
#	app/serializers/initial_state_serializer.rb
 3 months ago
Claire 19f1ffe287 Fix self-destruct schedule not actually replacing initial schedule (#29049) 3 months ago
github-actions[bot] 90ccf7beb2
New Crowdin Translations (automated) (#28965) 
Co-authored-by: GitHub Actions <noreply@github.com>
 3 months ago
Claire 64300e0fe3
Fix self-destruct schedule not actually replacing initial schedule (#29049) 3 months ago
Matt Jankowski ce0d134147
Add `redirect_with_vary` to `AllowedMethods` for `Style/FormatStringToken` cop (#28973) 4 months ago
Jeremy Kescher c2c2afc294
Merge branch 'glitch-soc' into develop 4 months ago
Claire 5fa2821853 Merge commit '3205a654caf903002c2db872f802a3332201678b' into glitch-soc/merge-upstream 4 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>
 4 months ago
github-actions[bot] 45287049ab
New Crowdin Translations (automated) (#28923) 
Co-authored-by: GitHub Actions <noreply@github.com>
 4 months ago
Claire 70de52c297 Merge commit '7a1f087659204e9d0cbba2de37e45b1921cefe20' into glitch-soc/merge-upstream 4 months ago
Matt Jankowski c8f59d2ca4
Fix `Style/TernaryParentheses` cop (#28387) 4 months ago
github-actions[bot] 59d2ea0d82
New Crowdin Translations (automated) (#28899) 
Co-authored-by: GitHub Actions <noreply@github.com>
 4 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.
 4 months ago
Eugen Rochko b19ae521b7
Add confirmation when redirecting logged-out requests to permalink (#27792) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 4 months ago
github-actions[bot] a34d27c18f
New Crowdin Translations (automated) (#28875) 
Co-authored-by: GitHub Actions <noreply@github.com>
 4 months ago
Eugen Rochko 5b1eb09d54
Add annual reports for accounts (#28693) 4 months ago
github-actions[bot] 78ee1453f9
New Crowdin Translations (automated) (#28857) 
Co-authored-by: GitHub Actions <noreply@github.com>
 4 months ago
Claire 102eff7c05 Merge commit 'e2d9635074ad33cc8144adc434bcd90faae9c424' into glitch-soc/merge-upstream 4 months ago
Claire e2d9635074
Add notification email on invalid second authenticator (#28822) 4 months ago
github-actions[bot] 76e383ea1e
New Crowdin Translations (automated) (#28827) 
Co-authored-by: GitHub Actions <noreply@github.com>
 4 months ago
Claire 3593ee2e36
Add rate-limit of TOTP authentication attempts at controller level (#28801) 4 months ago
Matt Jankowski 5fc4ae7c5f
Move privacy policy into markdown file (#28699) 4 months ago
github-actions[bot] 9cd17020bc
New Crowdin Translations (automated) (#28798) 
Co-authored-by: GitHub Actions <noreply@github.com>
 4 months ago
Jeremy Kescher 93ae46fa14
Merge branch 'glitch-soc' into develop 4 months ago
Jeremy Kescher 5d4cfe4cd8
Merge branch 'glitch-soc' into develop 4 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.
 4 months ago
github-actions[bot] 1ab42ad12b
New Crowdin Translations (automated) (#28749) 
Co-authored-by: GitHub Actions <noreply@github.com>
 4 months ago
Matt Jankowski c523a9601b
Rename local webpack* var in development env CSP config (#28766) 4 months ago
Matt Jankowski 0ce081fe49
Remove monkey patch in favor of supported Devise config value (#28760) 4 months ago
Claire e4d07c7bcc Merge commit '01b6c83c369061c2175d50dfb3ae1db502862664' into glitch-soc/merge-upstream 4 months ago
Renaud Chaput 01b6c83c36
Add a new `@/` alias for the root frontend directory and use it where possible (#28753) 4 months ago
Claire 01df34b9db Remove bypass and use use glitch-soc's theming system for inert.css 4 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.
 4 months ago
Claire 2f521bc84a Merge commit 'a2f02a07758c32f0dcc6388b4f30ca5a84e762f3' into glitch-soc/merge-upstream 4 months ago
Claire 464051c2d2 Merge commit '1070804a1a6121170f7bba923789d73b978e6fe7' into glitch-soc/merge-upstream 4 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.
 4 months ago
Claire 1323dfac80 Merge commit 'a90696011e563e62100cba56e2d52f6babbaff00' into glitch-soc/merge-upstream 4 months ago
HTeuMeuLeu 7f471e70c0
Update new email templates (#28416) 
Co-authored-by: Matt Jankowski <matt@jankowski.online>
 4 months ago
github-actions[bot] 1012ffac9e
New Crowdin Translations (automated) (#28721) 
Co-authored-by: GitHub Actions <noreply@github.com>
 4 months ago
Jeremy Kescher c677b8de19
v4.3.0-alpha.0+glitch+cat+1.0.5 4 months ago
Claire 6bbcd9348e
Switch from 48px weight 600 material symbol icons to 24px weight 400 icons (#28064) 4 months ago
Renaud Chaput 608f66f978
Change icon SVG imports to use a default import (#28709) 4 months ago
github-actions[bot] b86083f0dc
New Crowdin Translations (automated) (#28708) 
Co-authored-by: GitHub Actions <noreply@github.com>
 4 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.
 4 months ago
Claire 47d213e701 Merge commit '5dc634796aba951f6a085e1ed0e1b807e25d7d41' into glitch-soc/merge-upstream 4 months ago
Claire 51d2d98174 Merge commit 'a0e237a96fca2774d3c9ed43063a45e395bb7f40' into glitch-soc/merge-upstream 4 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`.
 4 months ago
Matt Jankowski 4e02838832
Enable "low risk" Rails 7.1 setting defaults (#28626) 4 months ago
github-actions[bot] 01ca84e541
New Crowdin Translations (automated) (#28660) 
Co-authored-by: GitHub Actions <noreply@github.com>
 4 months ago
gunchleoc 173953c23e
Fix ISO code for Canadian French (#26015) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 4 months ago
github-actions[bot] 8e7d5fe2ac
New Crowdin Translations (automated) (#28658) 
Co-authored-by: GitHub Actions <noreply@github.com>
 4 months ago
github-actions[bot] cc67943df2
New Crowdin Translations (automated) (#28627) 
Co-authored-by: GitHub Actions <noreply@github.com>
 4 months ago
Renaud Chaput a0e237a96f
Upgrade Redux packages (#28585) 4 months ago
Matt Jankowski e09419f22a
Move old framework defaults file to regular config value (#28623) 4 months ago