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

3891 Commits (196b141af5f133978e12e4819097fbd9e699e97a)

Author SHA1 Message Date
github-actions[bot] c4e0a7dced
New Crowdin Translations (automated) (#31463) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-08-19 08:29:48 +00:00
Claire 3ea00508ac Merge commit '2d589a5ed445b474ab7cec27b0db2a331ed7bd49' into glitch-soc/merge-upstream 2024-08-16 20:06:59 +02:00
github-actions[bot] 9a24552732
New Crowdin Translations (automated) (#31440) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-08-16 09:11:33 +00:00
Claire 169b35869f Merge commit 'a1ddaa9ee96ab1d05f4e37f3472b0418e0d5628e' into glitch-soc/merge-upstream 2024-08-14 21:17:43 +02:00
github-actions[bot] 202f43ccc6
New Crowdin Translations (automated) (#31411) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-08-14 07:04:01 +00:00
github-actions[bot] 862e793b45
New Crowdin Translations (automated) (#31394) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-08-13 07:42:08 +00:00
Matt Jankowski 02df1b4e4a
Finish email allow/deny list naming migration (#30530) 2024-08-13 07:37:32 +00:00
Claire 83480df820 Merge commit 'b42661ba95b7872ba278fca9b0fee8faffd89e52' into glitch-soc/merge-upstream 
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream added `<s>` to the list of allowed tags, the conflict is because
  we have a different list of allowed tags.
  Added `<s>` like upstream did.
 2024-08-12 17:46:24 +02:00
Emelia Smith b42661ba95
Add missing Appeals link under Moderation in navigiation (#31071) 2024-08-12 14:45:30 +00:00
Emelia Smith a1f723a6a4
Add support for PKCE Extension in OmniAuth OIDC (#31131) 2024-08-12 14:32:52 +00:00
github-actions[bot] 3abb5c0eaa
New Crowdin Translations (automated) (#31382) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-08-12 07:22:50 +00:00
Claire f441b280dc Merge commit '85152af95f51642bcef0ba781a1e7213d79e8f03' into glitch-soc/merge-upstream 2024-08-11 21:05:09 +02:00
github-actions[bot] 85152af95f
New Crowdin Translations (automated) (#31377) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-08-11 18:51:39 +00:00
github-actions[bot] 634ab0bad0
New Crowdin Translations (automated) (#31351) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-08-11 18:13:10 +00:00
Robin c39a8e1061
Change “e-mail” to “email” in en.yml (#31317) 2024-08-10 09:32:57 +00:00
Emelia Smith d3089018d5
Move Follow Recommendations to Trends menu, rename to Recommendations & Trends (#31292) 2024-08-10 09:17:10 +00:00
Claire 31a00c0c1a Merge commit '658addcbf783f6baa922d11c9524ebb9ddbcbc59' into glitch-soc/merge-upstream 2024-08-09 17:15:32 +02:00
Claire eaedd52def
Fix incorrect rate limit on PUT requests (#31356) 2024-08-09 14:48:05 +00:00
Claire cbdd8edf68
Revamp notification policy options (#31343) 2024-08-09 13:30:55 +00:00
Jeong Arm 9bae237792
Change confirmation prompt on trending management (#19626) 2024-08-09 12:47:02 +00:00
Claire dd2a991e24 Merge commit '079d681ac6f279f3a7a6be5c3734549f3be8f912' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/material-icons/400-24px/code.svg`:
  Icon newly-introduced upstream.
  Used upstream's more recent version.
- `app/javascript/material-icons/400-24px/mail.svg`:
  Icon newly-introduced upstream.
  Used upstream's more recent version.
- `app/javascript/material-icons/400-24px/manufacturing.svg`:
  Icon newly-introduced upstream.
  Used upstream's more recent version.
- `app/views/admin/settings/shared/_links.html.haml`:
  Glitch-soc had extra menu items, ported the changes for them too.
- `config/navigation.rb`:
  Glitch-soc had extra menu items, ported the changes for them too.
 2024-08-08 19:30:16 +02:00
github-actions[bot] 0e4d3c0403
New Crowdin Translations (automated) (#31337) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-08-08 13:54:10 +00:00
Matt Jankowski abc4ed48f2
Replace more `font-awesome` icons in navigation sidebar area (#30974) 2024-08-07 22:52:08 +00:00
Claire 06e034db15 Merge commit '670e4655d13975e0597bd1c74ebeeeeffc4edc37' into glitch-soc/merge-upstream 2024-08-07 19:22:25 +02:00
github-actions[bot] fc964c9bfd
New Crowdin Translations (automated) (#31321) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-08-07 09:32:16 +00:00
Claire 08adca0c63 Merge commit 'c8b9e60ec123c458efff83eedcfd07f067ef05ae' into glitch-soc/merge-upstream 2024-08-06 17:27:48 +02:00
github-actions[bot] d15f46a0b8
New Crowdin Translations (automated) (#31307) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-08-06 07:22:38 +00:00
github-actions[bot] cb56a6dc7e
New Crowdin Translations (automated) (#31276) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-08-05 07:43:04 +00:00
Claire e67e07211f Merge commit 'ad95c98054574080ac5d15584b3018d1db836531' into glitch-soc/merge-upstream 
Conflicts:
- `package.json`:
  Upstream removed their direct dependency `autoprefixer`, which was textually adjacent
  to glitch-soc-only dependency `atrament`.
  Removed direct dependency on `autoprefixer`.
- `yarn.lock`:
  Upstream removed their direct dependency `autoprefixer`, which was textually adjacent
  to glitch-soc-only dependency `atrament`.
  Removed direct dependency on `autoprefixer`.
 2024-08-02 18:09:48 +02:00
github-actions[bot] caeae25b55
New Crowdin Translations (automated) (#31261) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-08-02 07:01:04 +00:00
Claire da5b45a573
Add endpoints to accept and dismiss multiple notification requests at once (#31242) 2024-08-01 12:36:54 +00:00
github-actions[bot] 584b1524dd
New Crowdin Translations (automated) (#31237) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-08-01 09:27:24 +00:00
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
Claire 6a55232988 Merge commit 'fa8e972722fb8fc056aa348dddaee4005b4a8ac4' into glitch-soc/merge-upstream 2024-07-08 19:41:14 +02:00
github-actions[bot] 1a37862a76
New Crowdin Translations (automated) (#30940) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-07-08 08:03:44 +00:00
Matt Jankowski c29fdadefd
Use `scope module: ...` for more API routes (#30935) 2024-07-08 07:21:49 +00:00
Claire 11dd51ef44 Merge commit '63ba69810eca80fc2d10114a79f2988c1b75892f' into glitch-soc/merge-upstream 
Conflicts:
- `.env.production.sample`:
  Upstream and glitch-soc had different comments, some comments got updated upstream.
  Updated them in glitch-soc accordingly.
 2024-07-06 21:02:42 +02:00
github-actions[bot] 81547845ac
New Crowdin Translations (automated) (#30925) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-07-05 09:09:40 +00:00
Matt Jankowski 8c375d8a5c
Use `scope module: ...` for settings/2FA routes (#30919) 2024-07-05 08:57:54 +00:00
Claire 8de5df225e
Change instructions to use `bundle exec rails` instead of `rake` (#30917) 2024-07-05 08:54:45 +00:00
Claire e61a7794f8 Merge commit 'df9e26158d9787859b24bdc276af478abf05e1af' into glitch-soc/merge-upstream 
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
  Conflict because glitch-soc has a different list of allowed tags.
  Added upstream's new allowed tags while keeping ours.
- `spec/requests/api/v1/timelines/public_spec.rb`:
  Conflict because of glitch-soc's default settings.
  Updated accordingly.
 2024-07-04 17:12:14 +02:00
github-actions[bot] 8331f9e379
New Crowdin Translations (automated) (#30916) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-07-04 08:46:27 +00:00
Claire 70ff7a7c69 Merge commit '9be77fc0dbb01c1a8a54cd3da97e16c7941df367' into glitch-soc/merge-upstream 2024-07-03 22:10:41 +02:00
David Roetzel 9be77fc0db
Revert "Add system check for missing database indexes" (#30909) 2024-07-03 13:36:42 +00:00
github-actions[bot] dd85e3bcc5
New Crowdin Translations (automated) (#30901) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-07-03 07:30:30 +00:00
David Roetzel ebd8e1bbb6
Add system check for missing database indexes (#30888) 2024-07-03 07:19:54 +00:00
github-actions[bot] 1fc14e324b
New Crowdin Translations (automated) (#30890) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-07-02 08:41:54 +00:00
Claire 92dcc50278 Merge commit 'd3f504245cab5a9a0e89262e0a1398d035dffac9' into glitch-soc/merge-upstream 2024-07-01 20:45:13 +02:00
Eugen Rochko 20fa9ce484
Add timeline of public posts about a trending link in web UI (#30840) 2024-07-01 14:45:48 +00:00
Claire d270165be3 Merge commit 'aeefe5b2bea6e0fb511f029c2aacdefa7bd41eb8' into glitch-soc/merge-upstream 2024-07-01 12:05:39 +02:00
github-actions[bot] 7756db6551
New Crowdin Translations (automated) (#30873) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-07-01 08:34:38 +00:00