asonix/mastodon
1
1
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity
15299 commits 36 branches 245 tags 214 MiB
Commit graph

2714 commits

Author SHA1 Message Date
asonix ba9c861116 Merge pull request 'v4.2.7' (#64) from asonix/changes into asonix/downstream 
Reviewed-on: #64
 2024-02-16 15:16:31 +00:00
asonix 3d2b9d7275 Update translations 2024-02-16 09:10:34 -06:00
asonix ceb016ee32 Merge branch 'asonix/changes' into v4.2.7-branch 2024-02-16 09:09:20 -06:00
Claire 870ee80fd3 Fix user creation failure handling in OAuth paths (#29207) 2024-02-14 22:55:31 +01:00
asonix 69f27dc032 Merge pull request 'v4.2.6' (#61) from asonix/changes into asonix/downstream 
Reviewed-on: #61
 2024-02-14 16:38:21 +00:00
asonix 047282424a Merge branch 'asonix/changes' into v4.2.6-branch 2024-02-14 10:32:35 -06:00
Claire 1a33d348d0 Add sidekiq_unique_jobs:delete_all_locks task and disable sidekiq-unique-jobs UI by default (#29199) 2024-02-14 13:17:45 +01:00
Emelia Smith 6d43b63275 Disable administrative doorkeeper routes (#29187) 2024-02-14 11:03:21 +01:00
asonix 294328b682 Merge pull request 'v4.2.4' (#55) from asonix/changes into asonix/downstream 
Reviewed-on: #55
 2024-01-29 19:44:09 +00:00
asonix 2aa07583aa Update translations 2024-01-29 13:36:42 -06:00
asonix ea41b1ddf5 Merge branch 'asonix/changes' into v4.2.4-branch 2024-01-29 13:34:34 -06:00
Claire 6fe2a47357 Add rate-limit of TOTP authentication attempts at controller level (#28801) 2024-01-24 15:31:13 +01:00
asonix 93c5b81807 Merge pull request 'v4.2.2' (#49) from asonix/changes into asonix/downstream 
Reviewed-on: #49
 2023-12-04 19:33:41 +00:00
asonix ed188ff314 Merge branch 'asonix/changes' into v4.2.2-branch 2023-12-04 13:26:47 -06:00
Claire bece853e3c Fix error and incorrect URLs in /api/v1/accounts/:id/featured_tags for remote accounts (#27459) 2023-12-04 15:28:15 +01:00
Claire ef149674f0 Change Content-Security-Policy to be tighter on media paths (#26889) 2023-12-04 15:28:15 +01:00
asonix 3345fefe7f Merge branch 'asonix/changes' into asonix/downstream 2023-12-01 16:21:55 -06:00
asonix 4fd72176ac Add TangerineUI 2023-12-01 16:20:26 -06:00
Claire eea2654236
Fix format-dependent redirects being cached regardless of requested format (#27634) 2023-11-13 17:58:00 +01:00
asonix 2012081e52 Merge pull request 'v4.2.1' (#44) from asonix/changes into asonix/downstream 
Reviewed-on: #44
 2023-10-11 17:21:26 +00:00
asonix 775f3c1477 Merge branch 'asonix/changes' into v4.2.1-branch 2023-10-11 12:15:36 -05:00
github-actions[bot] 4262cfbe41 New Crowdin Translations (automated) (#27347) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-10 13:52:41 +02:00
github-actions[bot] 5a33b81479 New Crowdin Translations (automated) (#27321) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-10 13:52:41 +02:00
github-actions[bot] 2e2936eb64 New Crowdin Translations (automated) (#27304) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-10 13:52:41 +02:00
github-actions[bot] 88fc73dbbc New Crowdin Translations (automated) (#27277) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-10 13:52:41 +02:00
github-actions[bot] aba0c5abd9 New Crowdin Translations (automated) (#27270) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-10 13:52:41 +02:00
github-actions[bot] 7c6f41039d New Crowdin Translations (automated) (#27260) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-10 13:52:41 +02:00
github-actions[bot] 7b86708980 New Crowdin Translations (automated) (#27220) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-10 13:52:41 +02:00
github-actions[bot] 2cd969cca7 New Crowdin Translations (automated) (#27202) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-10 13:52:41 +02:00
github-actions[bot] 4e5791bba1 New Crowdin Translations (automated) (#27168) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-10 13:52:41 +02:00
github-actions[bot] aed930b629 New Crowdin Translations (automated) (#27144) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-10 13:52:41 +02:00
github-actions[bot] 9cb7fa57f6 New Crowdin Translations (automated) (#27080) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-10 13:52:41 +02:00
github-actions[bot] 40702a81fa New Crowdin Translations (automated) (#27052) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-10 13:52:41 +02:00
asonix 9f6d4a0814 Merge branch 'asonix/changes' into asonix/downstream 2023-09-21 15:36:32 -05:00
asonix 2439291425 Rename 'mastodon' theme to 'default' 2023-09-21 15:36:09 -05:00
asonix 4d82b91f87 Merge branch 'asonix/changes' into asonix/downstream 2023-09-21 14:56:51 -05:00
asonix 0c7e49f2b2 re-add default theme 2023-09-21 14:56:20 -05:00
asonix 51d7132aed Merge branch 'asonix/changes' into asonix/downstream 2023-09-21 14:15:29 -05:00
asonix 981ec9876d Update rails locale files 2023-09-21 13:55:43 -05:00
asonix 1c6d88fc31 Remove strip-formatting patch 2023-09-21 12:48:05 -05:00
asonix 53b9790142 Merge branch 'asonix/changes' into v4.2.0-branch 2023-09-21 11:21:56 -05:00
Claire 8acc75435b
Change S3 checksum mode to be disabled by default (#27007) 2023-09-21 14:00:51 +02:00
github-actions[bot] effe4728cf
New Crowdin Translations (automated) (#27005) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-09-21 11:06:04 +02:00
github-actions[bot] 61fe25fe74
New Crowdin Translations (automated) (#26988) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-09-20 13:05:56 +02:00
github-actions[bot] 73ecc4de6e
New Crowdin Translations (automated) (#26978) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-09-19 16:26:51 +02:00
github-actions[bot] 67eaaa4b90
New Crowdin Translations (automated) (#26966) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-09-19 10:41:48 +02:00
github-actions[bot] 1b4902fabf
New Crowdin Translations (automated) (#26913) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-09-18 13:46:07 +02:00
Claire a04ae16201
Fix CSP when using ONE_CLICK_SSO_LOGIN (#26901) 2023-09-13 19:54:04 +02:00
github-actions[bot] 921c6fe654
New Crowdin Translations (automated) (#26498) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-09-13 15:10:41 +02:00
Robert R George 20666482ef
Added admin api for managing tags (#26872) 2023-09-13 11:22:53 +02:00