1
0
mirror of https://github.com/funamitech/mastodon synced 2024-12-12 21:59:04 +09:00
Commit Graph

22416 Commits

Author SHA1 Message Date
Claire
8de5df225e
Change instructions to use bundle exec rails instead of rake (#30917) 2024-07-05 08:54:45 +00:00
Claire
05cfe04415
Merge pull request #2765 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes up to df9e26158d
2024-07-04 17:28:51 +02: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
Claire
df9e26158d
Bump version to v4.3.0-alpha.5 (#30920) 2024-07-04 14:59:54 +00:00
Claire
d3a056adfd
Merge pull request from GHSA-xjvf-fm67-4qc3 2024-07-04 16:45:52 +02:00
Claire
502cf75b16
Merge pull request from GHSA-58x8-3qxw-6hm7
* Fix insufficient permission checking for public timeline endpoints

Note that this changes unauthenticated access failure code from 401 to 422

* Add more tests for public timelines

* Require user token in `/api/v1/statuses/:id/translate` and `/api/v1/scheduled_statuses`
2024-07-04 16:26:49 +02:00
Claire
395f17ca17
Merge pull request from GHSA-vp5r-5pgw-jwqx
* Fix streaming sessions not being closed when revoking access to an app

* Add tests for GHSA-7w3c-p9j8-mq3x
2024-07-04 16:11:28 +02:00
renovate[bot]
b730147618
fix(deps): update dependency ws to v8.18.0 (#30914)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-07-04 13:46:14 +00:00
renovate[bot]
528661a091
fix(deps): update dependency pino-http to v10.2.0 (#30913)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-07-04 13:46:08 +00: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
58f027a019
Merge pull request #2763 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes up to 9be77fc0db
2024-07-03 22:56:52 +02:00
Claire
70ff7a7c69 Merge commit '9be77fc0dbb01c1a8a54cd3da97e16c7941df367' into glitch-soc/merge-upstream 2024-07-03 22:10:41 +02:00
Emelia Smith
47f0faebc9
Implement HTML ruby tags for east-asian languages (#30897) 2024-07-03 20:05:59 +00:00
David Roetzel
9be77fc0db
Revert "Add system check for missing database indexes" (#30909) 2024-07-03 13:36:42 +00:00
renovate[bot]
20c749bd45
chore(deps): update dependency rubocop-rspec to v3.0.2 (#30902)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-07-03 09:14:15 +00:00
renovate[bot]
f99159d1eb
fix(deps): update dependency webpack-merge to v6 (#30891)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-07-03 08:46:51 +00:00
renovate[bot]
6270281037
chore(deps): update dependency doorkeeper to v5.7.1 (#30053)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-07-03 08:05:19 +00:00
renovate[bot]
1dbffc30f1
chore(deps): update opentelemetry-ruby (non-major) (#30903)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-07-03 08:04:38 +00:00
Matt Jankowski
5651c16d11
Limit browser version to enforce ruby 3.1 support (#30766) 2024-07-03 07:47:40 +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
renovate[bot]
ba7e7a6368
chore(deps): update opentelemetry-ruby (non-major) (#30898)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-07-03 07:21:05 +00:00
renovate[bot]
2e295bd5e7
chore(deps): update dependency aws-sdk-s3 to v1.156.0 (#30899)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-07-03 07:20:48 +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
71375e984f
Merge pull request #2761 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes up to d3f504245c
2024-07-01 23:53:33 +02:00
Claire
4d4f7ede4f Revert "Temporarily disable hover cards"
This reverts commit 935b955b15.
2024-07-01 21:21:22 +02:00
Eugen Rochko
4c5067e3a4 [Glitch] Add timeline of public posts about a trending link in web UI
Port 20fa9ce484 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-07-01 21:19:38 +02:00
Eugen Rochko
a70b1141d6 [Glitch] Fix missing confirmation when unfollowing from hover card in web UI
Port d3f504245c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-07-01 20:55:56 +02:00
Eugen Rochko
dcfd39991b [Glitch] Change hover cards to not appear until the mouse stops in web UI
Port b728c0e8ce to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-07-01 20:50:26 +02:00
Claire
92dcc50278 Merge commit 'd3f504245cab5a9a0e89262e0a1398d035dffac9' into glitch-soc/merge-upstream 2024-07-01 20:45:13 +02:00
Eugen Rochko
d3f504245c
Fix missing confirmation when unfollowing from hover card in web UI (#30879) 2024-07-01 18:10:22 +00:00
Eugen Rochko
b728c0e8ce
Change hover cards to not appear until the mouse stops in web UI (#30850) 2024-07-01 15:52:01 +00: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
renovate[bot]
aeefe5b2be
chore(deps): update eslint (non-major) (#30883)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-07-01 09:03:38 +00:00
renovate[bot]
aefb4c027b
chore(deps): update dependency rubocop-rails to v2.25.1 (#30876)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-07-01 08:35:19 +00: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
renovate[bot]
ed15ae075c
fix(deps): update dependency @reduxjs/toolkit to v2.2.6 (#30875)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-07-01 08:27:03 +00:00
renovate[bot]
4c701463b4
chore(deps): update dependency aws-sdk-s3 to v1.155.0 (#30871)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-07-01 08:26:08 +00:00
renovate[bot]
2f1df842f8
chore(deps): update dependency test-prof to v1.3.3.1 (#30872)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-07-01 08:25:52 +00:00
renovate[bot]
3c1e1685c7
fix(deps): update dependency postcss to v8.4.39 (#30877)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-07-01 08:21:55 +00:00
renovate[bot]
9c7d56db9a
fix(deps): update dependency postcss-preset-env to v9.5.15 (#30878)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-07-01 08:21:40 +00:00
renovate[bot]
8142c7aa3e
chore(deps): update definitelytyped types (non-major) (#30882)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-07-01 08:21:15 +00:00
Aria
6d6064d2c0
fix(collapsing): fix and simplify post collapsing CSS (#2757) 2024-06-30 22:27:38 +02:00
Claire
a396985c14
Merge pull request #2760 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes up to 5d4dbbcc67
2024-06-30 22:25:48 +02:00
Claire
935b955b15 Temporarily disable hover cards 2024-06-30 21:48:30 +02:00
Eugen Rochko
412e5ddcbf [Glitch] Fix follow button in hover cards not working when signed out in web UI
Port ea6c455e81 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-06-30 18:41:48 +02:00
Eugen Rochko
98185247b8 [Glitch] Add hover cards in web UI
Port e89317d4c1

Co-authored-by: Renaud Chaput <renchap@gmail.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-06-30 18:41:48 +02:00
Eugen Rochko
4179f5fcf3 [Glitch] Change author_account to be authors in REST API
Port 096057b845 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-06-30 17:33:23 +02:00
Eugen Rochko
d612daee97 [Glitch] Convert <ColumnHeader> to Typescript
Port 3939352e92 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-06-30 17:33:23 +02:00