sd/chuckya-fe-standalone
2
0
Fork 0
Code Pull requests Activity
20,340 commits 2 branches 0 tags 263 MiB
Commit graph

3,430 commits

Author SHA1 Message Date
Essem
bbf2dbaf56
 		Merge remote-tracking branch 'upstream/main' 2023-12-17 19:48:56 -06:00
Claire
ddf3ad9541 Merge commit '3bf896c973' into glitch-soc/main 
Conflicts:
- `package.json`:
  Upstream removed a dependency textually close to a glitch-only dependency.
  Updated as upstream while keeping our dependency.
 2023-12-17 17:43:30 +01:00
Claire
1474318691 Merge commit 'a916251d8a' into glitch-soc/main 
Conflicts:
- `app/models/trends/statuses.rb`:
  Upstream fixed a bug in the trending post condition.
  Glitch-soc's condition is different because we potentially allow CWed content
  to trend.
  Ported upstream's fix while keeping glitch-soc's change.
- `config/initializers/content_security_policy.rb`:
  Kept our version for now, we will switch to upstream later down the road.
 2023-12-17 15:32:29 +01:00
Essem
00dae881c5
 		Merge remote-tracking branch 'upstream/main' 2023-12-12 20:30:34 -06:00
Claire
9f92b05bd2 Merge commit '2e6bf60f15' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Upstream has updated their README but we have a completely different one.
  Kept our version of `README.md`
 2023-12-10 18:05:02 +01:00
Essem
8f2327095e
 		Merge branch 'main' of https://github.com/glitch-soc/mastodon 2023-12-03 21:12:22 -06:00
Claire
046141d2a4
 		Fix i18n unused check being tripped by no in YAML files (#2496) 2023-12-03 11:21:34 +01:00
Essem
d58be1516f
 		Fix CSP for Tenor 
Probably want to look into properly proxying it at some point.
 2023-11-29 11:07:07 -06:00
Essem
6aafe6c541
 		Merge branch 'main' of https://github.com/glitch-soc/mastodon 2023-11-27 10:22:34 -06:00
Claire
660372d130
 		Revert recent CSP changes (#2485) 
* Revert "Fix image and media loading when using external storage server"

This reverts commit 6cfa0245ca.

* Revert "Change glitch-soc's CSP config to match upstream's closer (#2474)"

This reverts commit d59196e170.
 2023-11-26 15:32:35 +01:00
Essem
6dd12b9cd2
 		Merge remote-tracking branch 'upstream/main' 2023-11-21 19:38:13 -06:00
Claire
6cfa0245ca Fix image and media loading when using external storage server 
Fixes #2479
 2023-11-21 13:45:29 +01:00
Claire
d59196e170
 		Change glitch-soc's CSP config to match upstream's closer (#2474) 2023-11-20 13:02:49 +01:00
Essem
19def877be
 		Merge remote-tracking branch 'upstream/main' 2023-11-15 11:04:05 -06:00
GitHub Actions
46a28fc41f New Crowdin translations 2023-11-11 04:27:29 +00:00
Essem
5222d41546
 		Add notification emails for reactions 2023-11-10 15:16:29 -06:00
Essem
4200584ff3
 		A bit of cleanup 2023-11-05 20:10:42 -06:00
github-actions[bot]
2d548e273e
 		New Crowdin Translations (automated) (#27646) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-11-03 10:10:13 +00:00
Matt Jankowski
7ef56d6e50
 		Move json_ld context loaders to config/initializers (#27590) 2023-10-31 15:21:23 +00:00
Matt Jankowski
3107a9410c
 		Silence deprecation warning about secrets/credentials with Devise patch (#27578) 2023-10-31 11:10:15 +00:00
Renaud Chaput
0e3401bc1c
 		Improve Babel configuration and automatically load polyfills (#27333) 2023-10-31 10:55:13 +00:00
github-actions[bot]
e5b7ae9576
 		New Crowdin Translations (automated) (#27630) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-31 08:43:17 +00:00
Essem
0868c11651
 		Merge branch 'main' of https://github.com/glitch-soc/mastodon 2023-10-30 14:42:53 -05:00
github-actions[bot]
a918208ec6
 		New Crowdin Translations (automated) (#27596) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-30 14:19:25 +00:00
Matt Jankowski
eae5c7334a
 		Extract class from CSP configuration/initialization (#26905) 2023-10-27 16:20:40 +00:00
Matt Jankowski
1f5187e2e2
 		Misc spec/refactor to user mailer and user mailer spec (#27486) 2023-10-27 09:57:16 +00:00
github-actions[bot]
8ca16f032e
 		New Crowdin Translations (automated) (#27583) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-27 09:38:04 +00:00
Claire
bbf46cc418
 		Fix error and incorrect URLs in /api/v1/accounts/:id/featured_tags for remote accounts (#27459) 2023-10-27 08:35:21 +00:00
Matt Jankowski
12550a6a28
 		Use Rails.env.local? shorthand method to check env (#27519) 2023-10-26 21:20:41 +00:00
Matt Jankowski
4aa05d45fc
 		Capture minimum postgres version 12 (#27528) 2023-10-26 20:35:15 +00:00
github-actions[bot]
3427b51d63
 		New Crowdin Translations (automated) (#27567) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-26 11:05:47 +00:00
Claire
49b8433c56
 		Fix confusing screen when visiting a confirmation link for an already-confirmed email (#27368) 2023-10-25 21:33:44 +00:00
Claire
62620956d5 Merge commit '9a3d047f3e' into glitch-soc/merge-upstream 2023-10-25 19:59:17 +02:00
Matt Jankowski
9a3d047f3e
 		Run bin/rails app:update with Rails 7.1 (#27522) 2023-10-25 13:56:09 +00:00
Claire
6e9f89e5b6 Merge commit 'c85e0a6b04' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/packs/admin.jsx`:
  Upstream fixed `@rails/ujs` imports.
  Already taken care of in 8a131fb7bc
- `app/javascript/packs/public.jsx`:
  Upstream fixed `@rails/ujs` imports.
  Already taken care of in 8a131fb7bc
 2023-10-25 12:18:45 +02:00
Claire
ba527c071f Merge commit '134de736dc' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.jsx`:
  Upstream changed how icons are handled, including on a line modified by
  glitch-soc to bump the number of poll options.
  Applied upstream's change, while keeping the increased number of poll
  options.
 2023-10-25 12:14:24 +02:00
github-actions[bot]
c85e0a6b04
 		New Crowdin Translations (automated) (#27544) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-25 07:36:07 +00:00
Claire
4ef66d6538 Merge commit '15182d1e5e' into glitch-soc/merge-upstream 
Conflicts:
- `.rubocop_todo.yml`:
  glitch-soc had extra ignores.
  Removed them.
 2023-10-24 20:31:20 +02:00
Claire
3c9c0299c0 Fix ActiveRecord::Migrator monkey-patch 2023-10-24 20:23:46 +02:00
Claire
4b0fb764c3 Merge commit 'e93a75f1a1' into glitch-soc/merge-upstream 
Conflicts and ported changes:
- updated `@rails/ujs` imports
 2023-10-24 19:59:19 +02:00
Eugen Rochko
134de736dc
 		Change icons in web UI (#27385) 
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2023-10-24 17:45:08 +00:00
Claire
e25cc4deb7 Merge commit '379115e601' into glitch-soc/merge-upstream 
Conflicts:
- `config/navigation.rb`:
  Conflict due to glitch-soc having extra navigation items for its theming
  system.
  Ported upstream changes.
 2023-10-24 19:31:14 +02:00
Claire
57c0de949b Merge commit '8b770ce811' into glitch-soc/merge-upstream 
Conflicts:
- `config/initializers/content_security_policy.rb`:
  Upstream changed how asset host CSP directives are used, and glitch-soc has
  a pretty different CSP file.
  It may be worth reconsidering the differences between upstream and glitch-soc
  but for now, just port the change.
 2023-10-24 19:17:20 +02:00
Claire
b0c76eaadd Merge commit '0ad66175bf' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/mastodon/features/compose/components/compose_form.jsx`:
  Upstream changed one import, close to a glitch-soc-only import to handle
  different max character counts.
  Ported upstream's change.
 2023-10-24 18:41:20 +02:00
github-actions[bot]
50b7ea810e
 		New Crowdin Translations (automated) (#27523) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-24 09:51:34 +00:00
Matt Jankowski
e93a75f1a1
 		Rails 7.1 update (#25963) 2023-10-23 17:58:29 +00:00
Claire
379115e601
 		Add SELF_DESTRUCT env variable to process self-destructions in the background (#26439) 2023-10-23 15:46:21 +00:00
Claire
99f2534cee
 		Add support for displaying unknown servers on /admin/instances/:domain (#27150) 2023-10-23 14:27:57 +02:00
Claire
c3e0eb3699
 		Change Content-Security-Policy to be tighter on media paths (#26889) 2023-10-23 14:27:07 +02:00
github-actions[bot]
70fd819935
 		New Crowdin Translations (automated) (#27490) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-23 10:04:54 +02:00