mirrors/catstodon
1
0
Fork 0
mirror of https://git.kescher.at/CatCatNya/catstodon.git synced 2024-11-22 14:08:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
23324 commits 5 branches 147 tags 265 MiB
Commit graph

3941 commits

Author SHA1 Message Date
Claire
b28ce2424c Merge commit 'c40ab43dc703be988c277d4ba6b7987a3a80e16c' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/application_helper.rb`:
  Upstream added a helper where glitch-soc had its own, not really
  a conflict.
  Added upstream's helper.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream renamed a constant that was used slightly differently in glitch-soc.
  Renamed it as upstream did.
 2024-10-06 16:07:58 +02:00
gunchleoc
160917e718
Pluralize csv imports (#27094) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-10-04 08:19:01 +00:00
github-actions[bot]
1b247a1dc2
New Crowdin Translations (automated) (#32249) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-10-04 07:29:53 +00:00
github-actions[bot]
fe3f5375e3
New Crowdin Translations (automated) (#32233) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-10-03 09:15:31 +00:00
Christian Schmidt
33d3ca7cf1
Support /.well-known/host-meta.json (#32206) 2024-10-02 09:23:44 +00:00
github-actions[bot]
ea72d5ec3a
New Crowdin Translations (automated) (#32214) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-10-02 09:05:57 +00:00
Matt Jankowski
df98cf71e3
Avoid repeated icon stack in settings sidebar (#32201) 2024-10-01 13:50:20 +00:00
Matt Jankowski
4b4bf82ea9
Fix nav item active highlight for some paths (#32159) 2024-10-01 10:48:27 +00:00
Matt Jankowski
efd3f59627
Use module: :users in routes/admin section (#30767) 2024-10-01 10:02:58 +00:00
Emelia Smith
454d21ab5a
Remove OAuth Password Grant Type support (#30960) 2024-10-01 09:56:58 +00:00
Matt Jankowski
685067efd1
Avoid id duplication conflict with main navigation from settings profile link (#32181) 2024-10-01 08:23:05 +00:00
github-actions[bot]
5839ee434b
New Crowdin Translations (automated) (#32195) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-10-01 08:21:17 +00:00
Claire
9af9ef6fb3 Merge commit '03210085b7481568cc507f088144aaf1dae73c88' into glitch-soc/merge-upstream 2024-09-30 13:04:19 +02:00
Claire
e22eff8900
Remove regexp timeout feature (#32169) 2024-09-30 09:41:06 +00:00
github-actions[bot]
f477dc399e
New Crowdin Translations (automated) (#32140) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-09-30 08:53:29 +00:00
Claire
7ef25ae53b Merge commit '9d664f87a04b6a5157ddbe60ee33b5b7a960198e' into glitch-soc/merge-upstream 2024-09-29 11:06:09 +02:00
github-actions[bot]
c9b0699964
New Crowdin Translations (automated) (#32121) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-09-27 07:34:46 +00:00
Claire
513f187daf
Add “A Mastodon update is available.” message on admin dashboard for non-bugfix updates (#32106) 2024-09-26 19:27:57 +00:00
github-actions[bot]
278a075b22
New Crowdin Translations (automated) (#32103) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-09-26 08:47:38 +00:00
Christian Schmidt
db332553c9
Rename "Data export" menu item (#32099) 2024-09-25 19:54:28 +00:00
Eugen Rochko
3426ea2912
Add preview of followers removed in domain block modal in web UI (#32032) 2024-09-25 18:13:36 +00:00
Claire
633165ba9c Merge commit '28966fa0a6d7b98ee94696acdc79e45449ce8349' into glitch-soc/merge-upstream 2024-09-25 17:41:37 +02:00
Renaud Chaput
28966fa0a6
Remove deprecated v2_alpha endpoint for grouped notifications (#32089) 2024-09-25 15:21:11 +00:00
github-actions[bot]
4e6fc3a62f
New Crowdin Translations (automated) (#32083) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-09-25 07:40:14 +00:00
Claire
c6039f99ce Merge commit '70988519df66f0b8edeb6ca95140f1d3e436fea8' into glitch-soc/merge-upstream 2024-09-24 19:34:30 +02:00
David Roetzel
cfb8fc6222
Increase regexp timeout and allow override (#32056) 2024-09-24 13:16:58 +00:00
github-actions[bot]
11ac5c8929
New Crowdin Translations (automated) (#32052) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-09-24 09:42:14 +00:00
Claire
c2c3a66478 Merge commit '5dfdec645313e556413147597138a8008bc35996' into glitch-soc/merge-upstream 2024-09-23 20:24:18 +02:00
Eugen Rochko
aaab6b7adc
Add reblogs and favourites counts to statuses in ActivityPub (#32007) 2024-09-23 13:14:15 +00:00
Tim Campbell
11eae691ba
Feature more otel customization (#31998) 2024-09-23 08:55:35 +00:00
github-actions[bot]
ed90d9342e
New Crowdin Translations (automated) (#32011) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-09-23 08:50:19 +00:00
Eugen Rochko
5fae1d55e5
Fix OAuth authorization prompt referring to third-party apps (#32005) 2024-09-23 08:42:03 +00:00
Claire
221bba1897 Merge commit '7ed9c590b98610f8d68deab9ef8df260eec6d8f0' into glitch-soc/merge-upstream 2024-09-21 15:06:06 +02:00
github-actions[bot]
162f9a3c90
New Crowdin Translations (automated) (#31993) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-09-20 08:31:28 +00:00
github-actions[bot]
efdc17513d
New Crowdin Translations (automated) (#31974) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-09-19 10:34:19 +00:00
Matt Jankowski
5405bdd344
Remove unused E2EE messaging code (#31193) 2024-09-18 09:27:43 +00:00
github-actions[bot]
bd86c692cf
New Crowdin Translations (automated) (#31959) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-09-18 08:06:44 +00:00
Claire
665e9129fe Merge commit 'e0648a916ab81925545504173bf4f43ec64d4f3c' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/custom_emoji.rb`:
  An upstream refactor touched lines adjacent to ones modified in glitch-soc.
  Ported upstream's changes.
 2024-09-16 21:08:58 +02:00
Claire
e0648a916a
Rename /api/v2_alpha/notifications* to /api/v2/notifications* (#31840) 2024-09-16 12:10:02 +00:00
Claire
d5cf27e667
Add global Regexp timeout (#31928) 2024-09-16 09:40:18 +00:00
github-actions[bot]
474abf3c7f
New Crowdin Translations (automated) (#31911) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-09-16 08:48:20 +00:00
Claire
117ac13d12 Merge commit '5ba3405be4c1f708f198580b481f822698dab392' into glitch-soc/merge-upstream 2024-09-13 21:37:34 +02:00
github-actions[bot]
353ade767b
New Crowdin Translations (automated) (#31898) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-09-13 08:41:46 +00:00
Claire
83b553c7d1 Merge commit '0226bbe5165a53658b29e46ddbef6a10507fdc8c' into glitch-soc/merge-upstream 2024-09-12 21:32:39 +02:00
Claire
3465d39494 Merge commit '24ef8255b3f9b44cb54f49bc78fe3382a7070b1a' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/accounts_helper.rb`:
  Upstream removed a helper, textually adjacent to a glitch-soc-only one.
  Not really a conflict.
  Removed the helper as upstream did.
- `app/views/layouts/embedded.html.haml`:
  Conflicts due to theming system.
  Adapted upstream's change to our theming system.
- `app/views/statuses/_simple_status.html.haml`:
  Removed upstream, but we had local changes.
  Removed as upstream did.
 2024-09-12 20:05:08 +02:00
Claire
caaa412e6e Merge commit 'f2a92c2d22345568ca7f47ee1d1d70de53eb547d' into glitch-soc/merge-upstream 2024-09-12 17:34:16 +02:00
Claire
90d7a4bac4 Merge commit 'a27f7f4e561c9d2fe21d984059603d2f500c005b' into glitch-soc/merge-upstream 2024-09-12 17:22:06 +02:00
Claire
a496aeabcb
Change form-action Content-Security-Policy directive to be more restrictive (#26897) 2024-09-12 13:24:19 +00:00
Eugen Rochko
24ef8255b3
Change design of embed modal in web UI (#31801) 2024-09-12 12:54:16 +00:00
Claire
10e2b87774 Merge commit '0c3c06f7cc50c9207a44f56e184ce6a41f953171' into glitch-soc/merge-upstream 2024-09-12 12:09:21 +02:00