Jeremy Kescher
c9f7e9454c
Merge branch 'upstream-main' into develop
Ruby Testing / build (production) (push) Has been cancelled
Ruby Testing / build (test) (push) Has been cancelled
Bundler Audit / security (push) Has been cancelled
Check i18n / check-i18n (push) Has been cancelled
CodeQL / Analyze (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
Historical data migration test / test (16-alpine) (push) Has been cancelled
Historical data migration test / test (17-alpine) (push) Has been cancelled
Ruby Testing / test (.ruby-version) (push) Has been cancelled
Ruby Testing / test (3.2) (push) Has been cancelled
Ruby Testing / Libvips tests (push) Has been cancelled
Ruby Testing / End to End testing (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (push) Has been cancelled
2024-11-08 14:46:42 +01:00
Jeremy Kescher
f7952496e0
feat(preview): Only show no-CW link context menu option for link preview on local posts
Check i18n / check-i18n (push) Has been cancelled
CodeQL / Analyze (push) Has been cancelled
Check formatting / lint (push) Has been cancelled
JavaScript Linting / lint (push) Has been cancelled
JavaScript Testing / test (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 / End to End testing (push) Has been cancelled
Ruby Testing / test (3.2) (push) Has been cancelled
Ruby Testing / Libvips tests (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (push) Has been cancelled
2024-11-05 22:25:28 +01:00
Renato "Lond" Cerqueira
4d9d10ea81
[Glitch] Fix 'unknown' media attachment rendering in detailed view
...
Port 01e25af2e3
2024-11-03 21:02:11 +01:00
Claire
95c95da891
[Glitch] Fix preview cards with long titles erroneously causing layout changes
...
Port 742eb549ab
2024-11-03 21:00:41 +01:00
Nathan Sparrow
43775c8ea4
[Glitch] Embed modal mobile fix
...
Port de1d8dc63a
2024-11-03 21:00:25 +01:00
Emelia Smith
9a5dcf0add
[Glitch] Feat: Implement interaction modal for Polls
...
Port dc0b1948be
2024-11-03 21:00:05 +01: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
Jeremy Kescher
2d5f770295
feat(preview): Allow bypassing CW/sensitive for link preview
Check i18n / check-i18n (push) Has been cancelled
CodeQL / Analyze (push) Has been cancelled
Crowdin / Upload translations / upload-translations (push) Has been cancelled
Check formatting / 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
Historical data migration test / test (16-alpine) (push) Has been cancelled
Historical data migration test / test (17-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 (push) Has been cancelled
Ruby Testing / End to End testing (push) Has been cancelled
Ruby Testing / Elastic Search integration testing (push) Has been cancelled
2024-11-03 18:26:16 +01:00
Jeremy Kescher
7fa9c34dee
Merge branch 'upstream-main' into develop
2024-11-01 17:13:04 +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
Renato "Lond" Cerqueira
01e25af2e3
Fix 'unknown' media attachment rendering in detailed view ( #32713 )
2024-10-31 09:37:31 +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
Claire
742eb549ab
Fix preview cards with long titles erroneously causing layout changes ( #32678 )
2024-10-30 08:34:56 +00:00
Nathan Sparrow
de1d8dc63a
Embed modal mobile fix ( #32641 )
2024-10-29 15:12:35 +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
Emelia Smith
dc0b1948be
Feat: Implement interaction modal for Polls ( #32609 )
2024-10-28 13:27:37 +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
e44a800887
Fix missing CSS for CW margins ( #2891 )
2024-10-27 21:08:59 +01:00
Claire
40b3c206e4
Change Content Warning design to match upstream's ( #2890 )
2024-10-27 16:08:01 +01:00
Claire
1d3d549e96
[Glitch] Redesign Content Warning and filters
...
Port 393f0a0159
2024-10-26 14:09:46 +02:00
renovate[bot]
e8d23f6bcb
[Glitch] Update eslint (non-major)
...
Port 11a63b2db6
2024-10-26 14:00:09 +02:00
Claire
8a222b3951
Fix assets build failure on glitch-soc
2024-10-26 13:54:36 +02:00
Eugen Rochko
227bf77252
[Glitch] Change design of rich text elements in web UI
...
Port d11231a420
2024-10-26 13:53:25 +02:00
David Roetzel
50a40d1b2f
[Glitch] Do not change follow counters when already following
...
Port 029c99bd7b
2024-10-26 13:50:30 +02:00
Emelia Smith
28287eb3b2
[Glitch] Fix 'unknown' media attachment type rendering
...
Port 346cdb998c
2024-10-26 13:49:07 +02:00
Renaud Chaput
d304540ebc
[Glitch] Replace execCommand for copying text with the modern clipboard API
...
Port fb6d7ed475
2024-10-26 13:47:22 +02: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
Eugen Rochko
d11231a420
Change design of rich text elements in web UI ( #32633 )
2024-10-24 07:28:22 +00:00
Matt Jankowski
c3e684b715
Remove unused svg logos ( #32581 )
2024-10-23 13:25:49 +00:00
Claire
393f0a0159
Redesign Content Warning and filters ( #32543 )
2024-10-23 09:47:23 +00:00
David Roetzel
029c99bd7b
Do not change follow counters when already following ( #32622 )
2024-10-22 12:49:10 +00:00
Emelia Smith
346cdb998c
Fix 'unknown' media attachment type rendering ( #32613 )
2024-10-22 08:31:53 +00:00
renovate[bot]
11a63b2db6
Update eslint (non-major) ( #32279 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
2024-10-21 08:03:44 +00:00
Renaud Chaput
fb6d7ed475
Replace execCommand for copying text with the modern clipboard API ( #32598 )
2024-10-21 07:08:18 +00:00
Emelia Smith
ba365ac8ec
[Glitch] Fix: Reword 'pick one' to 'single choice' for polls
...
Port bc2e642272
2024-10-19 19:27:27 +02:00
Claire
6bd185b423
[Glitch] Remove ability to get embed code for remote posts
...
Port 1fc165de02
2024-10-19 19:23:56 +02:00
hota
f0207d10be
[Glitch] Fix column-settings spacing in local timeline in advanced view
...
Port 0f37b7d6ac
2024-10-19 19:23:56 +02:00
Claire
b428921ec9
[Glitch] Add more explicit explanations about author attribution and fediverse:creator
...
Port 8b56509625
2024-10-19 19:23:56 +02:00
Renaud Chaput
829ff8633b
[Glitch] Add ability to group follow notifications in WebUI
...
Port 6c87c76e18
2024-10-19 19:23:56 +02:00
Claire
42336d810b
[Glitch] Fix only the first paragraph being displayed in some notifications
...
Port 25f8003d75
2024-10-19 19:23:56 +02:00
Renaud Chaput
2f854c5576
[Glitch] Add back a 6 hours mute duration option
...
Port 7a7a7cc448
2024-10-19 19:23:56 +02:00
Jeong Arm
e35ee2ce5c
[Glitch] Fix reblog icons on account media view
...
Port 5afdb81b36
2024-10-19 19:23:56 +02:00
Claire
886a422d09
[Glitch] Fix follow recommendation carrousel scrolling on RTL layouts, for real
...
Port 5e4cc1a39c
2024-10-19 19:23:56 +02:00
Renaud Chaput
d63594d97e
[Glitch] Fix back arrow pointing to the incorrect direction in RTL languages
...
Port 51345e5133
2024-10-19 19:23:52 +02: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
Claire
1fc165de02
Remove ability to get embed code for remote posts ( #32578 )
2024-10-18 10:51:05 +00: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
hota
0f37b7d6ac
Fix column-settings spacing in local timeline in advanced view ( #32567 )
2024-10-18 07:40:08 +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
