Commit graph

23391 commits

Author SHA1 Message Date
Claire
e48a64d3b5
Fix distracting and confusing always-showing scrollbar track in boost confirmation modal (#31524) 2024-08-21 10:25:14 +00:00
mogaminsk
8c7642cd18
Change translation strings of grouped notification label to have full context (#31486) 2024-08-21 08:56:36 +00:00
Claire
b91264b1f3
Update dependency fugit (#31522) 2024-08-21 08:15:12 +00:00
github-actions[bot]
3994195fea
New Crowdin Translations (automated) (#31521)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-21 07:19:16 +00:00
Eugen Rochko
b06c7b6b5a
Change hints for missing remote content in web UI (#31516) 2024-08-21 07:08:58 +00:00
Claire
d815b3d100
Merge pull request #2818 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes up to 9ba7c90151
2024-08-20 22:02:24 +02:00
Claire
bdc0e0d27e [Glitch] Fix non-grouped notifications not loading on page load
Port 9ba7c90151 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-20 19:42:36 +02:00
Matt Jankowski
4c85fec993 [Glitch] Remove font-awesome npm package
Port 4c4bcad866 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-20 18:49:56 +02:00
Renaud Chaput
e19b3aaaba [Glitch] Update CSS color variables to match our latest design system
Port 4016fd5128 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-20 18:42:33 +02:00
Eugen Rochko
eb9405bed9 [Glitch] Fix margin in follow notification in web UI
Port 05b4380051 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-20 18:41:32 +02:00
Michael Stanclift
57c38b9156 [Glitch] Harmonize persistent scrollbar styles
Port 2f01f5f4ea to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-20 18:40:36 +02:00
Renaud Chaput
4e5d85b637 [Glitch] Improve the list selection UI for notification requests
Port 98bf2fc27c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-20 18:39:48 +02:00
Claire
f5c0c32edd Merge commit '9ba7c90151463a6e4f7952317253fe8c113e9b0a' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/material-icons/400-24px/chat.svg`:
  Glitch-soc used this one but not upstream.
  Upstream pulled a presumably more up-to-date version of the file.
  Switched to upstream's version.
- `app/views/layouts/application.html.haml`:
  Upstream removed use of font-awesome.
  I hope we are ready.
- `app/views/layouts/embedded.html.haml`:
  Upstream removed use of font-awesome.
  I hope we are ready.
- `app/views/layouts/error.html.haml`:
  Upstream removed use of font-awesome.
  I hope we are ready.
2024-08-20 18:31:50 +02:00
Claire
9ba7c90151
Fix non-grouped notifications not loading on page load (#31514) 2024-08-20 16:18:33 +00:00
Matt Jankowski
f91403ccaa
Remove unused fa_icon helper method (#31511) 2024-08-20 15:59:59 +00:00
Matt Jankowski
4c4bcad866
Remove font-awesome npm package (#31512) 2024-08-20 15:59:47 +00:00
Renaud Chaput
4016fd5128
Update CSS color variables to match our latest design system (#31510) 2024-08-20 15:56:44 +00:00
renovate[bot]
6c26fb0ed6
Update dependency core-js to v3.38.1 (#31507)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-08-20 14:36:14 +00:00
Eugen Rochko
05b4380051
Fix margin in follow notification in web UI (#31508) 2024-08-20 14:03:09 +00:00
Claire
711e1fce0a
Fix pagination parameters in GET /api/v2_alpha/notificatins (#31509) 2024-08-20 13:54:08 +00:00
Matt Jankowski
fa2e7b1708
Migrate fontawesome->material in more views (#31360) 2024-08-20 11:52:45 +00:00
Matt Jankowski
3be1b1eaae
Use material symbol for filters/statuses views (#31371) 2024-08-20 11:52:27 +00:00
Matt Jankowski
71405eabfc
Use material symbols in table link helper (#31359) 2024-08-20 11:48:15 +00:00
github-actions[bot]
c75f7262ed
New Crowdin Translations (automated) (#31504)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-20 07:59:21 +00:00
Michael Stanclift
2f01f5f4ea
Harmonize persistent scrollbar styles (#31445) 2024-08-20 07:48:51 +00:00
Renaud Chaput
98bf2fc27c
Improve the list selection UI for notification requests (#31457) 2024-08-19 22:11:58 +00:00
Michael Stanclift
a7a2ff6c1d
Use Dockerfile ADD to obtain ffmpeg and libvips source (#31498) 2024-08-19 19:44:28 +00:00
Claire
89a61954a7
Merge pull request #2817 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes up to 53c183f899
2024-08-19 20:43:17 +02:00
Claire
bfd01110d8 [Glitch] Reload notifications when accepted notifications are merged (streaming only)
Port 53c183f899 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-19 18:43:57 +02:00
Claire
99ffae7d44 [Glitch] Refactor some actions to be proper async actions instead of passing a continuation
Port 1e612c5a09 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-19 18:43:24 +02:00
Emelia Smith
a7751d26e7 [Glitch] Disable rule selector in ReportReasonSelector if instance has no rules
Port 71f257d529 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-19 18:34:06 +02:00
Claire
1760f84349 Merge commit '53c183f899b5382f1eebd72e34a090c30f8eba6a' into glitch-soc/merge-upstream 2024-08-19 18:25:31 +02:00
Claire
53c183f899
Reload notifications when accepted notifications are merged (streaming only) (#31419) 2024-08-19 15:59:06 +00:00
Edward Moulsdale
d4f135bc6d
Fix in memoriam accounts appearing in follow recommendations (#31474)
Co-authored-by: Utkarsh Wankar <46633523+kernal053@users.noreply.github.com>
2024-08-19 15:55:42 +00:00
Claire
d2e4be0456
Hopefully fix notifications pagination flaky test (#31494) 2024-08-19 14:53:54 +00:00
Claire
1e612c5a09
Refactor some actions to be proper async actions instead of passing a continuation (#31453) 2024-08-19 14:41:32 +00:00
Renaud Chaput
40f6631ac9
Fix Husky git hooks not being installed anymore (#31435) 2024-08-19 13:55:18 +00:00
Emelia Smith
99051479c1
Fix Trending Tags pending review having an unstable sort order (#31473)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-08-19 13:25:40 +00:00
Emelia Smith
71f257d529
Disable rule selector in ReportReasonSelector if instance has no rules (#31458) 2024-08-19 12:28:06 +00:00
renovate[bot]
31d374e5f5
Update opentelemetry-ruby (non-major) (#31451)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-08-19 11:42:33 +00:00
renovate[bot]
3db3e3dae5
Update dependency postcss-preset-env to v10.0.2 (#31488)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-08-19 08:56:08 +00:00
github-actions[bot]
c4e0a7dced
New Crowdin Translations (automated) (#31463)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-08-19 08:29:48 +00:00
renovate[bot]
9cda8c0197
Update dependency use-debounce to v10.0.3 (#31468)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-08-19 08:12:01 +00:00
renovate[bot]
d57ee31413
Update devDependencies (non-major) (#31489)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-08-19 08:10:15 +00:00
renovate[bot]
d6404714b6
Update eslint (non-major) (#31490)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-08-19 08:10:13 +00:00
Jeremy Kescher
1c0c393a19
Bump Catstodon revision to 1.0.10
Some checks failed
Bundler Audit / security (push) Has been cancelled
Check i18n / check-i18n (push) Has been cancelled
CodeQL / Analyze (javascript) (push) Has been cancelled
CodeQL / Analyze (ruby) (push) Has been cancelled
Check formatting / lint (push) Has been cancelled
CSS Linting / lint (push) Has been cancelled
Haml Linting / lint (push) Has been cancelled
JavaScript Linting / lint (push) Has been cancelled
Ruby Linting / lint (push) Has been cancelled
JavaScript Testing / test (push) Has been cancelled
Historical data migration test / test (14-alpine) (push) Has been cancelled
Historical data migration test / test (15-alpine) (push) Has been cancelled
Ruby Testing / build (production) (push) Has been cancelled
Ruby Testing / build (test) (push) Has been cancelled
Ruby Testing / test (.ruby-version) (push) Has been cancelled
Ruby Testing / test (3.1) (push) Has been cancelled
Ruby Testing / test (3.2) (push) Has been cancelled
Ruby Testing / Libvips tests (.ruby-version) (push) Has been cancelled
Ruby Testing / Libvips tests (3.1) (push) Has been cancelled
Ruby Testing / Libvips tests (3.2) (push) Has been cancelled
Ruby Testing / End to End testing (.ruby-version) (push) Has been cancelled
Ruby Testing / End to End testing (3.1) (push) Has been cancelled
Ruby Testing / End to End testing (3.2) (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:8.10.2) (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (.ruby-version, opensearchproject/opensearch:2) (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (3.1, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (3.2, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Has been cancelled
2024-08-18 18:10:19 +02:00
Jeremy Kescher
6a092bd6a3
Merge branch 'glitch' into develop 2024-08-18 18:08:34 +02:00
Claire
ec1ee7a732
Merge pull request #2815 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes up to 2d589a5ed4
2024-08-16 21:44:46 +02:00
Renaud Chaput
ceeabffee5 [Glitch] Add a follow button & follower count on follow notifications
Port 32a78e56e0 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-08-16 20:09:01 +02:00
Claire
3ea00508ac Merge commit '2d589a5ed445b474ab7cec27b0db2a331ed7bd49' into glitch-soc/merge-upstream 2024-08-16 20:06:59 +02:00