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
d11231a420
Change design of rich text elements in web UI ( #32633 )
2024-10-24 07:28:22 +00:00
c3e684b715
Remove unused svg logos ( #32581 )
2024-10-23 13:25:49 +00:00
393f0a0159
Redesign Content Warning and filters ( #32543 )
2024-10-23 09:47:23 +00:00
029c99bd7b
Do not change follow counters when already following ( #32622 )
2024-10-22 12:49:10 +00:00
346cdb998c
Fix 'unknown' media attachment type rendering ( #32613 )
2024-10-22 08:31:53 +00:00
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
fb6d7ed475
Replace `execCommand` for copying text with the modern `clipboard` API ( #32598 )
2024-10-21 07:08:18 +00:00
ba365ac8ec
[Glitch] Fix: Reword 'pick one' to 'single choice' for polls
...
Port bc2e642272
2024-10-19 19:27:27 +02:00
6bd185b423
[Glitch] Remove ability to get embed code for remote posts
...
Port 1fc165de02
2024-10-19 19:23:56 +02:00
f0207d10be
[Glitch] Fix column-settings spacing in local timeline in advanced view
...
Port 0f37b7d6ac
2024-10-19 19:23:56 +02:00
b428921ec9
[Glitch] Add more explicit explanations about author attribution and `fediverse:creator`
...
Port 8b56509625
2024-10-19 19:23:56 +02:00
829ff8633b
[Glitch] Add ability to group follow notifications in WebUI
...
Port 6c87c76e18
2024-10-19 19:23:56 +02:00
42336d810b
[Glitch] Fix only the first paragraph being displayed in some notifications
...
Port 25f8003d75
2024-10-19 19:23:56 +02:00
2f854c5576
[Glitch] Add back a 6 hours mute duration option
...
Port 7a7a7cc448
2024-10-19 19:23:56 +02:00
e35ee2ce5c
[Glitch] Fix reblog icons on account media view
...
Port 5afdb81b36
2024-10-19 19:23:56 +02:00
886a422d09
[Glitch] Fix follow recommendation carrousel scrolling on RTL layouts, for real
...
Port 5e4cc1a39c
2024-10-19 19:23:56 +02:00
d63594d97e
[Glitch] Fix back arrow pointing to the incorrect direction in RTL languages
...
Port 51345e5133
2024-10-19 19:23:52 +02:00
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
1fc165de02
Remove ability to get embed code for remote posts ( #32578 )
2024-10-18 10:51:05 +00:00
8eae0d067d
New Crowdin Translations (automated) ( #32573 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-10-18 07:56:43 +00:00
0f37b7d6ac
Fix column-settings spacing in local timeline in advanced view ( #32567 )
2024-10-18 07:40:08 +00:00
8b56509625
Add more explicit explanations about author attribution and `fediverse:creator` ( #32383 )
2024-10-17 09:03:08 +00:00
009f2ebc32
New Crowdin Translations (automated) ( #32553 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-10-17 08:21:51 +00:00
bc2e642272
Fix: Reword 'pick one' to 'single choice' for polls ( #32397 )
2024-10-16 10:40:40 +00:00
6c87c76e18
Add ability to group follow notifications in WebUI ( #32520 )
2024-10-16 08:33:11 +00:00
acc1973f3a
New Crowdin Translations (automated) ( #32533 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-10-16 08:12:43 +00:00
25f8003d75
Fix only the first paragraph being displayed in some notifications ( #32348 )
2024-10-16 07:30:53 +00:00
7a7a7cc448
Add back a 6 hours mute duration option ( #32522 )
2024-10-16 07:27:44 +00:00
5afdb81b36
Fix reblog icons on account media view ( #32506 )
2024-10-15 10:01:21 +00:00
5e4cc1a39c
Fix follow recommendation carrousel scrolling on RTL layouts, for real ( #32505 )
2024-10-15 09:38:04 +00:00
7d89cea0ea
New Crowdin Translations (automated) ( #32339 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-10-15 09:26:28 +00:00
51345e5133
Fix back arrow pointing to the incorrect direction in RTL languages ( #32485 )
2024-10-15 09:15:25 +00:00
ab50b2613e
[Glitch] Fix follow recommendation carrousel scrolling on RTL layouts
...
Port 7c10b0fb7a
2024-10-14 20:11:29 +02:00
075eb3ed38
[Glitch] Fix mute duration not being shown in list of muted accounts in web UI
...
Port a295832960f3a782b928145279af335f956fff1f to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-10-14 20:11:02 +02:00
71a6ced55c
[Glitch] Fix “Mark every notification as read” not updating the read marker if scrolled down
...
Port e018e6321feb97609b18ac61d3349beb6de170b5 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-10-14 20:11:02 +02:00
9b3aaa9609
[Glitch] Fix “Mention” appearing for otherwise filtered posts
...
Port f75eb1a8b0386d2ca5c1c05ee3b10364b3e11211 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-10-14 20:11:02 +02:00
1a9be3e0eb
[Glitch] Restore list column border
...
Port de4f7859b4cf5fc5254173368cf35f0d711331b6 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-10-14 20:11:02 +02:00
39723a4d9c
[Glitch] Fix list edition modal styling
...
Port 45a520603b10792e24a2190215c0305c739108d0 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-10-14 20:11:02 +02:00
6cedbb4c50
[Glitch] Bring icon vertical middle to applications list style
...
Port fa4a82326d4e33c63a76c6725c36e85fe3ae9310 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-10-14 20:11:02 +02:00
4d9b4ef72f
Merge commit '7c10b0fb7a078661558fef86399d86831423260c' into glitch-soc/merge-upstream
2024-10-14 19:46:52 +02:00
7c10b0fb7a
Fix follow recommendation carrousel scrolling on RTL layouts ( #32462 )
2024-10-14 15:25:32 +00:00
888e6a3439
Fix setting to hide the quick filter bar ( #2882 )
...
Fixes #2881
2024-10-11 17:45:07 +02:00
6e96ec840d
Fix the favicon notification badge not using the correct notification count ( #2880 )
...
Fixes #2879
2024-10-10 19:31:51 +02:00
22fd767425
Fix mute duration not being shown in list of muted accounts in web UI ( #32388 )
2024-10-10 14:53:12 +00:00
3b07fe1bba
Fix “Mark every notification as read” not updating the read marker if scrolled down ( #32385 )
2024-10-10 13:42:08 +00:00
a5a3733c97
Fix “Mention” appearing for otherwise filtered posts ( #32356 )
2024-10-10 11:04:38 +00:00
cdf603239e
Restore list column border ( #32367 )
2024-10-09 19:33:28 +00:00
03dbebdfef
Fix list edition modal styling ( #32358 )
2024-10-09 17:24:22 +00:00
fda52b2a52
Fix 4 columns barely not fitting on 1920px screen ( #32361 )
2024-10-09 17:16:57 +00:00
Claire
Eugen Rochko
Matt Jankowski
David Roetzel
Emelia Smith
renovate[bot]
Renaud Chaput
hota
Jeong Arm
github-actions[bot]
Michael Stanclift