7b09f585fa
Merge commit 'bb51c0676d0cf27babc2c01ee337ca5fd24ae37c' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/packs/public.jsx`:
Upstream refactored slightly (but touching almost all the lines in the code),
glitch-soc had moved a few of the code to another file.
Refactored as upstream did.
2023-08-24 20:34:14 +02:00
c053bfc45a
[Glitch] Fix “legal” report category not showing up in moderation interface
...
Port 0446394465
2023-08-22 18:54:22 +02:00
10404aece8
Merge commit '1cb978bcc3d291a045f367e072ca0af1a1c4dbbc' into glitch-soc/merge-upstream
2023-08-22 18:50:14 +02:00
245fe855be
[Glitch] Fix unfollow icon styling in advanced column
...
Port d9c21293aa
2023-08-22 18:48:23 +02:00
2126812f65
Merge commit 'd9c21293aa6e105cedeff6b5e469af40a20909d9' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/settings/preferences/other/show.html.haml`:
Upstream moved some settings, where glitch-soc has an extra setting.
Ported upstream changes, moving the same settings as them.
2023-08-22 18:31:28 +02:00
128daefc7a
Remove leftover `.orig` files that were mistakenly included ( #2379 )
2023-08-22 18:24:03 +02:00
724d773844
[Glitch] Fix "Create Account" button in interaction modal
...
Port a664e15702
2023-08-21 21:08:56 +02:00
7e25e311d5
Merge commit '3a8370e1f459f5cf9695a610102ae6e53df36714' into glitch-soc/merge-upstream
2023-08-21 21:07:39 +02:00
bb51c0676d
Remove redundant ready() wrapper ( #26533 )
2023-08-18 12:06:08 +02:00
3ed2bf92d0
Fix case-insensitive comparison of hashtags to do case-folding ( #26525 )
2023-08-17 12:49:52 +02:00
0446394465
Fix “legal” report category not showing up in moderation interface ( #26509 )
2023-08-16 16:38:33 +02:00
f0862bcf98
Fix hashtag bar sometimes including tags that appear in the post's body ( #26506 )
2023-08-16 11:47:59 +02:00
85ecadb630
Fix hashtag bar display when status is in a thread ( #26497 )
2023-08-16 09:06:04 +02:00
df6e719898
Add display of out-of-band hashtags in the web interface ( #26492 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2023-08-14 23:42:30 +02:00
d9c21293aa
Fix unfollow icon styling in advanced column ( #26482 )
2023-08-14 19:02:47 +02:00
c452ccd913
New Crowdin Translations (automated) ( #26444 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-08-14 14:54:31 +02:00
a664e15702
Fix "Create Account" button in interaction modal ( #26459 )
2023-08-14 12:04:04 +02:00
987f190839
[Glitch] Fix reply not preserving the language from the replied-to post
...
Port 34f3001278
2023-08-13 19:24:50 +02:00
92df185be7
Merge commit '496eb6f7a4fa7de54f26da9642a76e6884648102' into glitch-soc/merge-upstream
2023-08-13 19:23:22 +02:00
e28727aab3
[Glitch] Change the hashtag column to not display the hashtag header on pinned columns
...
Port 4caa9f0e69
2023-08-13 19:13:11 +02:00
7c4b115e7d
[Glitch] Fix interaction modal layout
...
Port cd6f2b3cbc
2023-08-13 19:12:42 +02:00
0f8ddf367c
[Glitch] Change header of hashtag timelines in web UI
...
Port e325443b02
2023-08-13 19:11:52 +02:00
d9451feef0
[Glitch] Fix report modal secondary buttons style
...
Port 79936c584f
2023-08-13 19:08:08 +02:00
2f50b77ae8
[Glitch] Fix confirmation when closing media edition modal with unsaved changes
...
Port b59053ff8c
2023-08-13 19:06:02 +02:00
f0ad745506
[Glitch] Fix light theme select option for hashtags
...
Port 93372fee1e
2023-08-13 19:05:24 +02:00
03ae73bdc5
[Glitch] Change design of hidden media overlay (again) in web UI
...
Port 04e7efac3f
2023-08-13 19:04:07 +02:00
8247df3a8d
[Glitch] Change reblogs to be excluded from "Posts and replies" tab in web UI
...
Port 9d719bcd85
2023-08-13 19:02:17 +02:00
64fc66d3db
[Glitch] Add direct link to the Single-Sign On provider if there is only one sign up method available ( #26083 )
...
Port 120f5802c0
2023-08-13 19:00:25 +02:00
1461cc53ed
[Glitch] Add alt text for preview card thumbnails
...
Port 8da99ffb0d
2023-08-13 18:56:58 +02:00
6530f9709c
Merge commit '121443c0fca383268b8022c048dd137994785aff' into glitch-soc/main
...
Conflicts:
- `.rubocop_todo.yml`:
Upstream regenerated this file, glitch-soc had a specific ignore.
2023-08-13 18:47:15 +02:00
57a4e7927a
[Glitch] Add client-side timeout on resend confirmation button
...
Port 2f932cb2bb
2023-08-12 09:38:57 +02:00
ea8802a05a
Merge commit '3a4d3e9d4b573c400eec1743471d54cdccae50a5' into glitch-soc/merge-upstream
2023-08-12 09:36:38 +02:00
150cfcf3ae
Fix border-radius on “sensitive media” overlay for full-width media ( #2364 )
2023-08-12 09:30:27 +02:00
34f3001278
Fix reply not preserving the language from the replied-to post ( #26452 )
2023-08-12 00:06:37 +02:00
882e770400
[Glitch] Change interaction modal input to disable browser spell-checking, capitalization and autocomplete
...
Port 71fd70335a
2023-08-11 22:26:27 +02:00
44a5f1b64a
Merge commit '425d77f8124a50fc033e8fb3bdf7b89a6a25f4fa' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
Upstream regenerated this file, glitch-soc had a specific ignore.
- `README.md`:
Upstream updated its README, but glitch-soc has a completely different one.
Kept glitch-soc's README
2023-08-11 22:15:41 +02:00
3378bdb01f
New Crowdin translations ( #2354 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-08-11 22:03:11 +02:00
8cbf4a5296
New Crowdin Translations (automated) ( #26373 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-08-10 09:47:42 +02:00
4caa9f0e69
Change the hashtag column to not display the hashtag header on pinned columns ( #26416 )
2023-08-09 16:32:40 +02:00
cd6f2b3cbc
Fix interaction modal layout ( #26368 )
2023-08-07 17:58:29 +02:00
d2dbaba407
New Crowdin Translations (automated) ( #26209 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-08-07 13:37:54 +02:00
e325443b02
Change header of hashtag timelines in web UI ( #26362 )
2023-08-07 09:46:11 +02:00
79936c584f
Fix report modal secondary buttons style ( #26341 )
2023-08-04 16:25:44 +02:00
b59053ff8c
Fix confirmation when closing media edition modal with unsaved changes ( #26342 )
2023-08-04 15:48:29 +02:00
93372fee1e
Fix light theme select option for hashtags ( #26311 )
2023-08-04 09:41:17 +02:00
04e7efac3f
Change design of hidden media overlay (again) in web UI ( #26330 )
2023-08-03 20:39:45 +02:00
9d719bcd85
Change reblogs to be excluded from "Posts and replies" tab in web UI ( #26302 )
2023-08-03 20:39:33 +02:00
120f5802c0
Add direct link to the Single-Sign On provider if there is only one sign up method available ( #26083 )
2023-08-03 16:43:15 +02:00
8da99ffb0d
Add alt text for preview card thumbnails ( #26184 )
2023-08-03 15:41:51 +02:00
2f932cb2bb
Add client-side timeout on resend confirmation button ( #26300 )
2023-08-03 01:51:10 +02:00
Claire
mogaminsk
Christian Schmidt
Santiago Kozak
github-actions[bot]
Eugen Rochko
Trevor Wolf
CSDUMMI