monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
22,241 Commits 1 Branch 0 Tags 261 MiB
Commit Graph

7687 Commits

Author SHA1 Message Date
Holly 7ad6d6c03a readd 6 hour and 3 day mutes 2024-08-12 18:37:20 +00:00
Holly ec7bc4ea5f Merge branch 'upstream' into main 2024-07-04 22:45:26 +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
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
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 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
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
Aria 6d6064d2c0
fix(collapsing): fix and simplify post collapsing CSS (#2757) 2024-06-30 22:27:38 +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
Renaud Chaput 8160a655a5 [Glitch] Convert `<Directory>` to Typescript / function component 
Port 863c470a2b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-06-30 17:33:23 +02:00
Renaud Chaput 1ac4e64a3b [Glitch] Change light mode to apply CSS variables to the body 
Port 8c0ff6498e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-06-30 14:49:55 +02:00
Claire d2aea85e6c Merge commit '5d4dbbcc67c98007d417cbe67b5a2261889304dc' into glitch-soc/merge-upstream 2024-06-30 11:25:40 +02:00
renovate[bot] 1bccba1408
chore(deps): update dependency @testing-library/react to v16 (#30533) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2024-06-28 11:39:32 +00:00
github-actions[bot] a5134f2695
New Crowdin Translations (automated) (#30867) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-06-28 08:33:57 +00:00
Eugen Rochko ea6c455e81
Fix follow button in hover cards not working when signed out in web UI (#30864) 2024-06-27 22:01:40 +00:00
Eugen Rochko 096057b845
Change `author_account` to be `authors` in REST API (#30846) 2024-06-27 13:17:18 +00:00
github-actions[bot] 6d1c1fd684
New Crowdin Translations (automated) (#30851) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-06-27 08:00:04 +00:00
Eugen Rochko 3939352e92
Convert `<ColumnHeader>` to Typescript (#30849) 2024-06-26 19:46:28 +00:00
Eugen Rochko e89317d4c1
Add hover cards in web UI (#30754) 
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2024-06-26 19:33:38 +00:00
Renaud Chaput 863c470a2b
Convert `<Directory>` to Typescript / function component (#30829) 2024-06-26 18:04:50 +00:00
Renaud Chaput 8c0ff6498e
Change light mode to apply CSS variables to the body (#30839) 2024-06-25 21:57:22 +00:00
Claire 7d89d1f186 [Glitch] Fix API requests after #30818 
Port 2c7eed1fa1 to glitch-soc
 2024-06-25 19:07:42 +02:00
Claire 85e6efd351 Merge commit '2c7eed1fa1e7af72dd03a041a60f2cfd42e913e0' into glitch-soc/merge-upstream 2024-06-25 19:06:59 +02:00
Claire 2c7eed1fa1
Fix API requests after #30818 (#30837) 2024-06-25 16:53:03 +00:00
Renaud Chaput 3a20290915 [Glitch] Change `apiRequest` to accept both `params` and `data` 
Port 547e97945d
 2024-06-25 18:03:51 +02:00
Claire 6f2771cb32 Merge commit '845fe1c6936a7b386fd74ae567c19600a88e795a' into glitch-soc/merge-upstream 2024-06-25 17:57:39 +02:00
Renaud Chaput 547e97945d
Change `apiRequest` to accept both `params` and `data` (#30818) 2024-06-25 13:45:41 +00:00
github-actions[bot] 052c90b8de
New Crowdin Translations (automated) (#30825) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-06-25 07:45:58 +00:00
Claire 21ca03581a Merge commit '6527d5039141fe4a80645147b581d76952a64f39' into glitch-soc/merge-upstream 2024-06-24 19:39:42 +02:00
github-actions[bot] 61722b1b1f
New Crowdin Translations (automated) (#30808) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-06-24 10:46:53 +00:00
Renaud Chaput 2f994bb34a [Glitch] Fix error when deleting a status 
Port 7d12522ed7 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-06-21 12:03:35 +02:00
Claire 6300273664 Merge commit '9e932fa1ddaea569ca52fe663eb4bb13a5a43e0a' into glitch-soc/merge-upstream 2024-06-21 12:02:42 +02:00
github-actions[bot] 9e932fa1dd
New Crowdin Translations (automated) (#30789) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-06-21 09:14:44 +00:00
Renaud Chaput 7d12522ed7
Fix error when deleting a status (#30784) 2024-06-20 22:39:06 +00:00
Renaud Chaput 8ae61fdee5 [Glitch] Convert `disconnectTimeline` and `timelineDelete` actions to Typescript 
Port 1c65932776 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-06-20 19:22:24 +02:00
Claire fd867adffe Merge commit 'bb2d77b4a07e95e7d96df080f2d6994c1422b0c0' into glitch-soc/merge-upstream 2024-06-20 18:36:13 +02:00