mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
22,454 Commits
69 Branches
20 Tags
354 MiB
Commit Graph

3809 Commits (feed8163981c8c7631f49e662ed902cb1ba7202a)

Author SHA1 Message Date
Claire 8dd671a977 Merge commit 'a50c8e951f03a8eb53957ad1c3703155b223ed24' into glitch-soc/merge-upstream 2024-07-31 18:16:01 +02:00
github-actions[bot] 520ff04248
New Crowdin Translations (automated) (#31219) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-07-31 08:09:49 +00:00
Claire 1f796d129d Merge commit '598ae4f2da86029b1c3c3e35e64b89873037b598' into glitch-soc/merge-upstream 
Conflicts:
- `config/routes/api.rb`:
  Upstream added an endpoint, textually close to a glitch-soc-only endpoint.
  Ported upstream changes.
 2024-07-30 20:47:34 +02:00
Claire 598ae4f2da
Add endpoints for unread notifications count (#31191) 2024-07-30 08:39:11 +00:00
Tim Rogers 2ce99c51dd
Fixed Rails route covering %40-encoded profile URL paths to not 404 (#31184) 2024-07-30 08:18:00 +00:00
github-actions[bot] 7d11a6c9b0
New Crowdin Translations (automated) (#31206) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-07-30 08:15:40 +00:00
Claire 654187a995 Merge commit '1229d2907a4a7ee09ee42cd24043d74561507e0a' into glitch-soc/merge-upstream 2024-07-29 19:16:58 +02:00
Emelia Smith c40e481169
Implement UI for Admin Search of Hashtags (#30880) 2024-07-29 15:49:44 +00:00
github-actions[bot] ec5a860924
New Crowdin Translations (automated) (#31169) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-07-29 08:24:15 +00:00
Claire fb411b6d0f Merge commit 'dd5379271410219de0806bb33e7cdfa427ea6988' into glitch-soc/merge-upstream 2024-07-27 13:19:38 +02:00
Emelia Smith 693d9b03ed
Enable OAuth PKCE Extension (#31129) 2024-07-26 08:53:10 +00:00
github-actions[bot] 3793c845c9
New Crowdin Translations (automated) (#31154) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-07-26 07:51:37 +00:00
Claire cf5d2c3fe4 Merge commit '887e64efd4abbf3980e008c7a5441b44fbd6c766' into glitch-soc/merge-upstream 2024-07-25 17:47:02 +02:00
Adam Niedzielski 887e64efd4
Allow @ at the end of an URL (#31124) 2024-07-25 15:02:58 +00:00
Claire c94c5da7b4 Merge commit '4d374cf73096be1e5347e131c91c99842e3c6dbb' into glitch-soc/merge-upstream 2024-07-25 12:43:25 +02:00
github-actions[bot] ef0e3e447a
New Crowdin Translations (automated) (#31119) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-07-25 07:44:00 +00:00
Claire d999fc52ba Merge commit '06f070d86d448b97c082c038220becaec8a038ce' into glitch-soc/merge-upstream 2024-07-24 20:07:37 +02:00
renovate[bot] 06f070d86d
fix(deps): update dependency fuzzysort to v3 (#30315) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2024-07-24 08:13:09 +00:00
Claire 68000956f4 Merge commit 'cd0ca4b99473f54464e5134f91b7b1c8d5544011' into glitch-soc/merge-upstream 2024-07-23 19:31:23 +02:00
Emelia Smith bb2e5a4b58
Add audit logs to Admin::InstancesController (#27386) 2024-07-23 08:12:30 +00:00
Claire 2aac73341a Merge commit '80d9bff6df137afc3376f47b62d10a2e3e9456e2' into glitch-soc/merge-upstream 
Conflicts:
- `app/services/backup_service.rb`:
  Conflict due to glitch-soc's local-only posts.
  Ported upstream's changes while keeping glitch-soc's feature.
 2024-07-22 17:38:30 +02:00
github-actions[bot] 5a60a3b80c
New Crowdin Translations (automated) (#31087) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-07-22 08:01:24 +00:00
Claire f7598b267b Merge commit '0397df9bef82042221f35e9938ad5b917fa1d4fc' into glitch-soc/merge-upstream 2024-07-19 17:45:19 +02:00
github-actions[bot] 8e0aed8ac7
New Crowdin Translations (automated) (#31072) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-07-19 08:21:09 +00:00
Claire c75fe09e2b Merge commit '82344342c1c5adb3f6a4b376559db737a9e982b7' into glitch-soc/merge-upstream 2024-07-18 17:56:25 +02:00
Renaud Chaput f587ff643f
Grouped Notifications UI (#30440) 
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-07-18 14:36:09 +00:00
github-actions[bot] 7d090b2ab6
New Crowdin Translations (automated) (#31055) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-07-18 08:00:29 +00:00
Claire 5e7720d11b Merge commit 'aa4d8987a00fe82490fb949b82d3baa33d0acd49' into glitch-soc/merge-upstream 2024-07-17 22:20:12 +02:00
github-actions[bot] 00c110ac7b
New Crowdin Translations (automated) (#31047) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-07-17 07:23:07 +00:00
Claire c546757cd1 Merge commit '66430cb25c824cfad0394216d8e7a523533bcf4b' into glitch-soc/merge-upstream 2024-07-16 17:54:36 +02:00
github-actions[bot] 66430cb25c
New Crowdin Translations (automated) (#31038) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-07-16 15:24:56 +00:00
Emelia Smith aa88aca0ad
Add optional OAuth application to reports (#30539) 2024-07-16 13:23:08 +00:00
Michael Stanclift 905921b2ef
Add missing "Update Report" string in audit log (#31033) 2024-07-16 07:06:19 +00:00
Claire 64b2c712d4 Merge commit '9d0bce40724eb77b7cc3917091b62e4ab159e29e' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/theme_helper.rb`:
  Conflict because upstream refactored theme-related code, and glitch-soc has
  a different theming system.
 2024-07-15 18:51:38 +02:00
github-actions[bot] 17117109ad
New Crowdin Translations (automated) (#31018) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-07-15 07:44:37 +00:00
mogaminsk d61b536df3
Add i18n strings for instance favicon and logo settings label (#31016) 2024-07-15 07:38:48 +00:00
Claire 55cf5e0188 Merge commit 'c929b4cace3f95fe54fdafe449ea7e972c8d61e8' into glitch-soc/merge-upstream 2024-07-12 13:41:54 +02:00
github-actions[bot] 28ad3588e4
New Crowdin Translations (automated) (#31006) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-07-12 08:25:27 +00:00
Claire ad52b04a1c
Add setting to disable hover cards (#30931) 
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
 2024-07-11 19:42:58 +00:00
Claire db0b12e5dc Merge commit '8c8bee5a36e0cd0b5d35903f8891896447c3e060' into glitch-soc/merge-upstream 2024-07-11 21:07:03 +02:00
Matt Jankowski 6c37529723
Use `module: :auth` to wrap `devise_for` routes config (#30990) 2024-07-11 11:13:55 +00:00
github-actions[bot] c244b70dc2
New Crowdin Translations (automated) (#30993) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-07-11 10:38:35 +00:00
github-actions[bot] 182fee1c45
New Crowdin Translations (automated) (#2738) 
* New Crowdin translations

* Fix bogus no.yml

* Fix bogus simple_form.no.yml

---------

Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-07-10 18:18:15 +02:00
Claire 52fb4f16ef Merge commit '2ea9336b6855b44126a55106a81e96ea68eaf8ff' into glitch-soc/merge-upstream 2024-07-10 16:58:06 +02:00
Renaud Chaput 36592d10aa
Change Sidekiq readiness file to use an environment variable (#30988) 2024-07-10 12:57:25 +00:00
github-actions[bot] 9984fca9a0
New Crowdin Translations (automated) (#30983) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-07-10 10:40:19 +00:00
Claire 388672ff0d Merge commit '967505ee9bcacf0e5189aa06c654ff586c198a46' into glitch-soc/merge-upstream 2024-07-09 20:39:09 +02:00
Renaud Chaput 7542a134d5
Add a file for Sidekiq to signal it is ready to process jobs (#30971) 2024-07-09 10:47:08 +00:00
Matt Jankowski f47d761e12
Remove unneeded `controller` option in routes (#30958) 2024-07-09 07:34:19 +00:00
Matt Jankowski 7a30c68953
Use `scope module: ...` block for `.well-known` routes (#30959) 2024-07-09 07:34:15 +00:00