djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2024-12-02 13:00:28 -05:00
Code Issues Packages Projects Releases Wiki Activity
23,722 Commits 69 Branches 20 Tags 385 MiB
6374937147
Commit Graph

3998 Commits

Author SHA1 Message Date
Claire
6374937147 Merge commit 'e68b26c8df2056182564abcee230927ed53200c8' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/trends/statuses.rb`:
  Upstream added a date restriction to trendable posts, while glitch-soc had
  slightly different conditions.
  Added the date restriction to glitch-soc's conditions.
 2024-11-24 16:46:28 +01:00
github-actions[bot]
4252b13a4b
New Crowdin Translations (automated) (#32990) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-11-20 08:24:50 +00:00
github-actions[bot]
9fc2fc2251
New Crowdin Translations (automated) (#32969) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-11-19 09:05:39 +00:00
Shlee
06fcee099a
DB Replica database_tasks as ENV (#32908) 2024-11-19 08:54:28 +00:00
Matt Jankowski
c0c34d35e2
Move self destruct check to config_for and add constant for verifier string (#32943) 2024-11-18 09:57:16 +00:00
github-actions[bot]
02985aae69
New Crowdin Translations (automated) (#32927) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-11-18 09:20:37 +00:00
Renaud Chaput
bcf5d30e01
Add OpenTelemetry VCS attributes (#32904) 2024-11-18 08:41:09 +00:00
Claire
4f1242964b Merge commit '44d92fa4f6aac5c45ad358287af48cd879f5665e' into glitch-soc/merge-upstream 2024-11-15 18:44:32 +01:00
github-actions[bot]
c546aa57cb
New Crowdin Translations (automated) (#32900) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-11-15 10:30:11 +00:00
Emelia Smith
ddfb3d123b
Improve display of statuses in admin panel (#30813) 2024-11-15 09:38:01 +00:00
github-actions[bot]
aaebf142aa
New Crowdin Translations (automated) (#32884) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-11-14 09:39:33 +00:00
Jaz-Michael King
03ecf5df3b
Adds a range of reserved usernames to reduce potential misuse by malicious actors (#32828) 2024-11-13 13:10:01 +00:00
github-actions[bot]
baad795384
New Crowdin Translations (automated) (#32868) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-11-13 09:33:02 +00:00
Matt Jankowski
ace4268308
Remove unused api/v1/polls#create route (#32860) 2024-11-12 17:27:23 +00:00
Claire
f5f6273d2b
Move ALLOWED_PRIVATE_ADDRESSES parsing to an initializer (#32850) 2024-11-12 13:00:52 +00:00
github-actions[bot]
0d06d70d11
New Crowdin Translations (automated) (#32811) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-11-12 08:47:59 +00:00
Emelia Smith
a34edc211f
Add audit logging to Relays (#32819) 2024-11-12 08:35:08 +00:00
Matt Jankowski
c099797700
Use mastodon config namespace to load software update default value via config_for (#30534) 2024-11-12 08:28:31 +00:00
github-actions[bot]
d29f27fad7
New Crowdin Translations (automated) (#2851) 
* New Crowdin translations

* Update simple_form.no.yml

* Update no.yml

---------

Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-11-10 22:07:04 +01:00
Emelia Smith
e22ec25077
Fix typo in account unlocked localisation (#32821) 2024-11-10 12:26:51 +00:00
Claire
f0f807cec7 Merge commit '1e71c4e247eb8900a718b04113ffce9c1b8ad2f4' into glitch-soc/merge-upstream 2024-11-10 13:18:43 +01:00
github-actions[bot]
8df867b20a
New Crowdin Translations (automated) (#32803) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-11-08 09:53:47 +00:00
Matt Jankowski
41227aeb95
Update Rails to version 7.2.2 (#30391) 2024-11-07 14:58:20 +00:00
Matt Jankowski
ae667624ac
Use with_options for shared settings options in routes (#30847) 2024-11-07 10:07:04 +00:00
github-actions[bot]
4ed3ce2377
New Crowdin Translations (automated) (#32793) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-11-07 09:45:05 +00:00
github-actions[bot]
871e3b25e8
New Crowdin Translations (automated) (#32782) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-11-06 08:21:13 +00:00
Eugen Rochko
d6349c0e9a
Add year in review feature to web UI (#32709) 2024-11-05 14:40:07 +00:00
David Roetzel
d60ef3f17e
Disable httplog gem in production (#32776) 2024-11-05 08:55:34 +00:00
github-actions[bot]
933fa81baf
New Crowdin Translations (automated) (#32772) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-11-05 08:41:09 +00:00
Matt Jankowski
a139dac18e
Remove cookie rotator (#32289) 2024-11-04 09:11:00 +00:00
github-actions[bot]
2271b39a5c
New Crowdin Translations (automated) (#32733) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-11-04 08:56:11 +00:00
Claire
f624ef2778 Merge commit 'b06fd54c305915527e3a6edc575dc23b623143ef' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/formatting_helper.rb`:
  Upstream wrapped some code glitch-soc had modified in an OTEL instrumentation span.
  Wrapped the modified code.
 2024-11-03 20:51:58 +01:00
github-actions[bot]
e78db58b65
New Crowdin Translations (automated) (#32708) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-10-31 10:01:05 +00:00
Emelia Smith
e1b7382ea6
Add userinfo oauth endpoint (#32548) 2024-10-30 14:38:10 +00:00
github-actions[bot]
0a599d08d8
New Crowdin Translations (automated) (#32695) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-10-30 10:02:02 +00:00
github-actions[bot]
244aaf9a38
New Crowdin Translations (automated) (#32687) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-10-29 09:29:22 +00:00
github-actions[bot]
0426cb78f7
New Crowdin Translations (automated) (#32589) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-10-28 13:23:13 +00:00
Claire
8103e69b17 Merge commit '77cd16f4ee7ab807df6fffb1538a6659a8182a9e' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/styles/mastodon/components.scss`:
  Conflict caused by glitch-soc changing the path to images, and upstream
  removing styling using such an image.
  Removed the styling as upstream did.
- `app/models/account.rb`:
  Conflict due to upstream changing lines adjacent to a change made in glitch-soc
  to have configurable limits.
  Ported upstream's changes.
- `yarn.lock`:
  Dependencies adjacent to glitch-soc-only dependencies updated.
  Updated them as well.
 2024-10-26 13:38:07 +02:00
Matt Jankowski
97b18d10b4
Move hcaptcha service config to config_for yml (#30662) 2024-10-23 14:25:43 +00:00
Matt Jankowski
35f008aa2a
Move translation service config to config_for yml (#30663) 2024-10-23 13:32:18 +00:00
David Roetzel
05f23df3b7
Add endpoint to remove web push subscription (#32626) 2024-10-23 08:02:31 +00:00
Matt Jankowski
40b4f73c18
Pre-import Rails 7.2 generated config minor changes (#30579) 2024-10-21 08:07:07 +00:00
Claire
6281c4dedd Merge commit '1fc165de02d79294c8a218f5fa82bcd477484ca1' into glitch-soc/merge-upstream 
Conflicts:
- `.env.production.sample`:
  Upstream added a block of three environment variables, while glitch-soc
  has a different version of the file overall.
  Added upstream's changes.
- `app/helpers/application_helper.rb`:
  Upstream added a helper, while glitch-soc had extra helpers.
  Added upstream's helper.
 2024-10-19 19:13:32 +02:00
github-actions[bot]
8eae0d067d
New Crowdin Translations (automated) (#32573) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-10-18 07:56:43 +00:00
Claire
8b56509625
Add more explicit explanations about author attribution and fediverse:creator (#32383) 2024-10-17 09:03:08 +00:00
github-actions[bot]
009f2ebc32
New Crowdin Translations (automated) (#32553) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-10-17 08:21:51 +00:00
Claire
6ff1954bdb
Change Active Record Encryption variable check to check for emptiness (#32537) 2024-10-16 08:43:45 +00:00
github-actions[bot]
acc1973f3a
New Crowdin Translations (automated) (#32533) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-10-16 08:12:43 +00:00
github-actions[bot]
7d89cea0ea
New Crowdin Translations (automated) (#32339) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-10-15 09:26:28 +00:00
Claire
4d9b4ef72f Merge commit '7c10b0fb7a078661558fef86399d86831423260c' into glitch-soc/merge-upstream 2024-10-14 19:46:52 +02:00