Eugen Rochko
d67bd44ca1
Add profile setup to onboarding in web UI ( #27829 )
2023-11-15 11:13:53 +00:00
Jeong Arm
922f086253
Fix open status on media modal ( #27867 )
2023-11-15 09:29:10 +00:00
Brian Holley
4aa06cbdbf
Fix "Hide these posts from home" list setting not refreshing when switching lists ( #27763 )
2023-11-14 00:39:54 +00:00
Eugen Rochko
7e3c10dec6
Add icons for private and disabled boost in web UI ( #27817 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-11-13 14:39:45 +00:00
Aleks Xhuvani
7840c6b75b
Do not try to update an undefined video element ( #27798 )
2023-11-09 22:35:53 +00:00
Claire
c451bbe249
Allow viewing and severing relationships with suspended accounts ( #27667 )
2023-11-09 14:50:25 +00:00
Claire
9b06c0f24a
Fix Web UI not displaying appropriate explanation when a user hides their follows/followers ( #27791 )
2023-11-09 12:58:02 +00:00
João Pedro Marques
d3cd37d73e
Feature - Prevents multiple audio/video attachments from being played at the same time ( #24717 )
2023-11-07 23:37:58 +00:00
Jasmin Johal
27cbdc6f22
Change alt text to empty string for avatars ( #21875 )
...
Co-authored-by: Renaud Chaput <renchap@gmail.com>
2023-11-07 21:46:08 +00:00
Aleks Xhuvani
58f01a5c9a
Add volume saving/reuse to video player ( #27488 )
2023-11-07 18:15:38 +00:00
Renaud Chaput
3bf2a7296e
Use Immutable Record
for accounts in Redux state ( #26559 )
2023-11-03 15:00:03 +00:00
mogaminsk
ac8e4ed38d
Fix inserting emojis from emoji picker fails with TypeError ( #27647 )
2023-11-01 07:22:02 +00:00
Claire
9c8891b39a
Rewrite AutosuggestTextarea
as Functional Component ( #27618 )
2023-10-31 10:17:37 +00:00
SouthFox
08bdd5751e
Fix account click on detailed status ( #27587 )
2023-10-27 14:03:21 +00:00
Renaud Chaput
13d310e64d
Simplify column headers ( #27557 )
2023-10-27 13:21:07 +00:00
Eugen Rochko
fa7e64df1d
Fix various icon styles in web UI ( #27579 )
2023-10-26 23:37:58 +00:00
Simon Rapilly
2d8f759a34
Add HTML lang attribute to preview card descriptions ( #27503 )
2023-10-26 20:34:15 +00:00
Renaud Chaput
537442853f
Use a context to propagate column-related Props, and remove forceUpdate
usage ( #27548 )
2023-10-26 11:00:10 +00:00
Claire
62620956d5
Merge commit '9a3d047f3e604e581e18346424569e28fc9c5b96' into glitch-soc/merge-upstream
2023-10-25 19:59:17 +02:00
Renaud Chaput
a4e6fe36cb
Add missing ban icons ( #27555 )
2023-10-25 12:47:37 +00:00
Claire
6e9f89e5b6
Merge commit 'c85e0a6b047f1a72ad970bc04c4e1be3f028b3d1' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/packs/admin.jsx`:
Upstream fixed `@rails/ujs` imports.
Already taken care of in 8a131fb7bc
- `app/javascript/packs/public.jsx`:
Upstream fixed `@rails/ujs` imports.
Already taken care of in 8a131fb7bc
2023-10-25 12:18:45 +02:00
Claire
ba527c071f
Merge commit '134de736dcbc6aa613fd5aec21d983d92d8b0be8' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.jsx`:
Upstream changed how icons are handled, including on a line modified by
glitch-soc to bump the number of poll options.
Applied upstream's change, while keeping the increased number of poll
options.
2023-10-25 12:14:24 +02:00
Renaud Chaput
f08ca3f042
Fix missing icon props ( #27539 )
2023-10-24 20:43:06 +00:00
Claire
4ef66d6538
Merge commit '15182d1e5e595b21c47b48c5d258f30a0251e753' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
glitch-soc had extra ignores.
Removed them.
2023-10-24 20:31:20 +02:00
Eugen Rochko
134de736dc
Change icons in web UI ( #27385 )
...
Co-authored-by: Renaud Chaput <renchap@gmail.com>
2023-10-24 17:45:08 +00:00
Claire
e6c3d3c744
Merge commit 'd9503a1965a16328b62ea7bf0bb54e87cbe30d29' into glitch-soc/merge-upstream
2023-10-24 19:21:01 +02:00
Claire
b0c76eaadd
Merge commit '0ad66175bf59a34b03d9ab2347181548d07089ea' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/mastodon/features/compose/components/compose_form.jsx`:
Upstream changed one import, close to a glitch-soc-only import to handle
different max character counts.
Ported upstream's change.
2023-10-24 18:41:20 +02:00
たいち ひ
9482810703
Rewrite emoji_unicode_mapping_light
to TS ( #25444 )
...
Co-authored-by: taichi.fukuda ひ <taichi.fukuda@systemi.co.jp>
2023-10-24 08:06:14 +00:00
Eugen Rochko
d9503a1965
Fix explore page reloading when you navigate back to it in web UI ( #27489 )
2023-10-23 17:07:13 +02:00
Renaud Chaput
9d45a444f9
Convert <Button>
to Typescript ( #27492 )
2023-10-23 09:43:00 +02:00
Claire
245513d630
Merge commit '1b70d7ed7c0fd3a9fcf028bf76b8c62ac8b3897f' into glitch-soc/merge-upstream
2023-10-21 14:33:33 +02:00
Eugen Rochko
33bd8eccd5
Fix missing background behind dismissable banner in web UI ( #27479 )
2023-10-20 04:08:13 +02:00
Claire
cc000c8859
Merge commit '126cd7705dbeca5712da941a72661e26c189658b' into glitch-soc/merge-upstream
2023-10-19 20:48:22 +02:00
Renaud Chaput
1b70d7ed7c
Upgrade to react-router v5 ( #25047 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-10-19 19:44:55 +02:00
Renaud Chaput
126cd7705d
Do not display the navigation banner in the logo container ( #27476 )
2023-10-19 19:36:08 +02:00
Claire
74fd46d3ab
Merge commit '9f218c9924b883207a3463a29314c92032cf06df' into glitch-soc/merge-upstream
2023-10-19 19:14:04 +02:00
Brian Campbell
f76e5111f0
Consider shown and pending status in explore prompt calculation ( #27466 )
...
Co-authored-by: Brian Campbell <brcampbell@beta.team>
2023-10-19 14:25:57 +02:00
Renaud Chaput
10df97c542
The class
props should be className
( #27462 )
2023-10-19 13:22:44 +02:00
Claire
63179f0bf4
Merge commit '5ef26d8fd50081c642b858a82bf0c5431b1c7e83' into glitch-soc/merge-upstream
2023-10-17 21:59:58 +02:00
Claire
c10a667ac2
Merge commit '935d54124e80e9fe5365c724e5c8827a2b3ed5b3' into glitch-soc/merge-upstream
2023-10-17 21:42:49 +02:00
Jeong Arm
ad44d832b8
Support "in:public" search filter ( #26976 )
2023-10-17 16:12:03 +02:00
Stanislas Signoud
935d54124e
Fix missing redirections to make sure /home redirect to the advanced UI ( #27378 )
2023-10-17 14:59:07 +02:00
Claire
3735e6f79d
Merge commit '27e84c069112a3d2abfad947642457cc997a261a' into glitch-soc/merge-upstream
2023-10-10 19:53:41 +02:00
Claire
9d1c3d0678
Fix scroll position in thread view reseting when closing a modal ( #27350 )
2023-10-10 11:35:32 +02:00
Claire
8ef1a95b1c
Merge commit '4c2aca777f6ae6942d0cf11aee56a925694ccdef' into glitch-soc/merge-upstream
2023-10-09 21:14:57 +02:00
Claire
4a9cdfb928
Merge commit '774e1189d26fffd914107a4236f6287043c988f8' into glitch-soc/merge-upstream
2023-10-09 21:12:28 +02:00
Claire
3da7afdeed
Merge commit 'c310374a2f83a890520ace50e41c1e3d046e15e1' into glitch-soc/merge-upstream
2023-10-09 21:10:47 +02:00
Claire
4c2aca777f
Fix clicking on already-loaded thread scrolling to the top of the thread ( #27338 )
2023-10-09 16:46:09 +02:00
Renaud Chaput
774e1189d2
Change eslint
config to autofix missing comma and indentation in JS files ( #26711 )
2023-10-09 13:38:29 +02:00
Claire
c310374a2f
Fix clicking on already-opened thread post scrolling to the top of the thread ( #27331 )
2023-10-09 12:21:02 +02:00
Claire
74c27e33e3
Merge commit '37bbd3c1064380a756b4e821655d7697105f99f5' into glitch-soc/merge-upstream
2023-10-08 17:10:39 +02:00
Claire
a5dbb1ee5a
Merge commit '5a437edc7f22d5797e5af29d9b450a03eccec304' into glitch-soc/merge-upstream
2023-10-08 17:05:40 +02:00
Claire
e9a181c52c
Merge commit 'e95d25e1013b6328457b81bd98e8d6a841d45ec2' into glitch-soc/merge-upstream
2023-10-08 16:53:05 +02:00
Claire
37bbd3c106
Fix double scroll bars in some columns in advanced interface ( #27187 )
2023-10-03 13:12:39 +02:00
Michael Stanclift
5a437edc7f
Keep version string displayed without breakpoints in UI ( #26986 )
2023-10-03 11:52:21 +02:00
Claire
d80a819fc6
Fix explore prompt appearing because of posts being received out of order ( #27211 )
2023-09-29 15:51:36 +02:00
Claire
abdb58840a
Merge commit '57f592fed50747f3c97718a2761e17bafe6c8698' into glitch-soc/merge-upstream
2023-09-26 13:13:27 +02:00
Claire
a001ae2f39
Fix explore prompt sometimes showing up when the home TL is loading ( #27062 )
2023-09-25 17:07:01 +02:00
Claire
38753acaa5
Fix width of large text icon buttons ( #27127 )
2023-09-25 15:06:57 +02:00
Renaud Chaput
4b7bc1f07c
Convert dropdown_menu
state to Typescript ( #25585 )
2023-09-22 18:18:46 +02:00
Claire
f05985f8ec
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream changed their README, we have a completely different one.
Kept our version.
2023-09-21 15:12:00 +02:00
Claire
5356ddbcca
Fix search results temporarily disappearing while scrolling and loading more results ( #27014 )
2023-09-21 13:51:21 +02:00
Claire
22ee4e057d
Merge commit 'a83615edc9fc1ce3363ddcf1fc676806421a5f65' into glitch-soc/merge-upstream
...
Conflicts:
- `streaming/index.js`:
Upstream has added a parameter to `streamFrom`, while glitch-soc had an
extra parameter.
Ported upstream changes.
2023-09-19 12:59:23 +02:00
Claire
70cae19b6b
Fix hashtag bar being sometimes incorrectly hidden ( #26960 )
2023-09-19 12:25:39 +02:00
Claire
9688c5fcc4
Merge branch 'main' into glitch-soc/merge-upstream
2023-09-18 12:09:37 +02:00
Claire
893755f4cb
Fix error in Web UI when server rules cannot be fetched ( #26957 )
2023-09-18 09:51:52 +02:00
Claire
e193c848fe
Merge commit '97e4011c3ce31c6d492d5f103e95a35b6ebdc9bd' into glitch-soc/merge-upstream
...
Conflicts:
- `config/initializers/content_security_policy.rb`:
Upstream added some code to add the Identity Provider's sign-in endpoint to
the `form-action` Content Security Policy directive but our version of the
file is pretty different.
Ported the change.
2023-09-15 21:25:05 +02:00
Claire
08b495d95c
Merge commit 'b1d89071384ef028c97a3d28cf8cf6bc0ca6c4ce' into glitch-soc/merge-upstream
2023-09-15 21:06:45 +02:00
Claire
5d8c65f2a7
Merge commit '398635c0c4987ec44d937e98431ff5dee331ea94' into glitch-soc/merge-upstream
2023-09-15 20:57:40 +02:00
Claire
3ca94f6d4a
Merge commit '93d051e47d27b5bd10be922a81d4d4eb6c306330' into glitch-soc/merge-upstream
2023-09-15 20:21:40 +02:00
Claire
e14372c2d1
Merge commit '548c032dbb90ae9c06b05fc05724c49d0b552fd9' into glitch-soc/merge-upstream
2023-09-15 20:08:09 +02:00
Renaud Chaput
bd06c13204
Convert actions/account_notes
into Typescript ( #26601 )
2023-09-11 16:09:22 +02:00
Claire
91040da871
Fix confusing behavior of mute button and volume slider in web UI ( #26860 )
2023-09-08 20:39:29 +02:00
Eugen Rochko
9b2bc3d1de
Add recent searches in web UI ( #26834 )
2023-09-07 14:56:19 +02:00
Eugen Rochko
f3a2e15f8e
Fix mute button and volume slider feeling disconnected in web UI ( #26827 )
2023-09-07 04:24:24 +02:00
Claire
9c1ef8302a
Add some information about Full-text search being disabled in search popout ( #26756 )
2023-09-06 17:23:58 +02:00
Eugen Rochko
d8bdba2f9f
Add in:
to search popout in web UI ( #26807 )
2023-09-06 06:46:26 +02:00
Eugen Rochko
9d290c23d2
Remove obfuscation of reply count in web UI ( #26768 )
2023-09-05 23:57:03 +02:00
Eugen Rochko
5d20733d8d
Add infinite scrolling for search results in web UI ( #26784 )
2023-09-05 23:54:24 +02:00
Claire
548c032dbb
Improve interaction modal error handling ( #26795 )
2023-09-05 23:49:48 +02:00
Claire
c107512fa6
Merge commit '05093266e6e3c54f9096da9cdcdafdc83703c578' into glitch-soc/merge-upstream
2023-09-02 15:02:29 +02:00
Claire
ac2dae0d11
Merge commit '6c4c72497a5722870e4432ef41dd4c9ec36a8928' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-releases.yml`:
Upstream changed comments close to a line we modified to account for
different container image repositories.
Updated the comments as upstream did.
2023-09-02 13:50:16 +02:00
Claire
ffb486648c
Merge commit 'cb9f96036cf78835e22aafb30b80717b5a8b7394' into glitch-soc/merge-upstream
2023-09-02 13:34:54 +02:00
Claire
c8aa3d6d06
Merge commit 'dd72a8d28b4479afdc19ac73cac83609d85b5f9e' into glitch-soc/merge-upstream
2023-09-02 12:02:23 +02:00
Claire
16681e0f20
Add admin notifications for new Mastodon versions ( #26582 )
2023-09-01 17:47:07 +02:00
Claire
6c4c72497a
Fix search popout including full-text search instructions when full-text search is disabled ( #26755 )
2023-09-01 15:13:27 +02:00
Stanislas Signoud
40b69cc1cd
Add an explanation banner on switching to single column mode ( #26019 )
2023-08-31 12:18:46 +02:00
Tim Rogers
74eb7dbf2d
Fix bug with reblogged view on Toots only showing latest reblogging accounts ( #26574 )
2023-08-29 14:42:20 +02:00
Tim Rogers
ae6cf33321
Fix bug with favourited view on Toots only showing latest favouriting accounts ( #26577 )
2023-08-29 10:56:19 +02:00
Eugen Rochko
bceb893159
Add search options to search popout in web UI ( #26662 )
2023-08-28 13:18:39 +02:00
Claire
941a9df28a
Merge commit '96bcee66fba582666259d1d7785c3a7f2a72b8aa' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-nightly.yml`:
Upstream changed how the nightly builds are versioned, the conflict
is because glitch-soc modified adjacent lines relative to the docker
repositories the images are pushed to.
Applied upstream's changes.
- `app/views/settings/preferences/notifications/show.html.haml`:
Upstream moved some settings around. Glitch-soc had more settings.
Applied upstream's changes, moving glitch-soc's extra settings
accordingly.
2023-08-24 21:56:00 +02:00
Claire
b6b68b44a1
Merge commit 'b91724fb9d0839365391310e20c2589ff6062d4f' into glitch-soc/merge-upstream
...
Conflicts:
- `Vagrantfile`:
Upstream bumped a bunch of values, including one that was already bumped by
glitch-soc.
Took upstream's version.
- `lib/paperclip/transcoder.rb`:
glitch-soc already had a partial fix for this.
Took upstream's version.
2023-08-24 21:46:17 +02:00
Claire
88ff45a3b2
Merge commit 'facfec1ba36cee27f232ebff90b990933719235a' into glitch-soc/merge-upstream
2023-08-24 21:03:56 +02:00
Claire
b2ac93dd73
Fix selecting domains to forward reports to not passing the information correctly ( #26636 )
2023-08-24 14:06:27 +02:00
Christian Schmidt
152b10b624
Fix some React warnings ( #26609 )
2023-08-23 15:43:41 +02:00
Renaud Chaput
44ba785242
Change the hashtag bar to be hidden when there is a CW and the post is not expanded ( #26615 )
2023-08-23 15:40:31 +02:00
Claire
10404aece8
Merge commit '1cb978bcc3d291a045f367e072ca0af1a1c4dbbc' into glitch-soc/merge-upstream
2023-08-22 18:50:14 +02:00
Claire
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
Claire
7e25e311d5
Merge commit '3a8370e1f459f5cf9695a610102ae6e53df36714' into glitch-soc/merge-upstream
2023-08-21 21:07:39 +02:00
Renaud Chaput
061fd66ee6
Remove hashtags from the last line of a status if it only contains hashtags ( #26499 )
2023-08-21 19:39:01 +02:00
Claire
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
Claire
d9c21293aa
Fix unfollow icon styling in advanced column ( #26482 )
2023-08-14 19:02:47 +02:00
mogaminsk
a664e15702
Fix "Create Account" button in interaction modal ( #26459 )
2023-08-14 12:04:04 +02:00
Claire
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
Claire
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
Claire
4caa9f0e69
Change the hashtag column to not display the hashtag header on pinned columns ( #26416 )
2023-08-09 16:32:40 +02:00
Claire
cd6f2b3cbc
Fix interaction modal layout ( #26368 )
2023-08-07 17:58:29 +02:00
Eugen Rochko
e325443b02
Change header of hashtag timelines in web UI ( #26362 )
2023-08-07 09:46:11 +02:00
Claire
b59053ff8c
Fix confirmation when closing media edition modal with unsaved changes ( #26342 )
2023-08-04 15:48:29 +02:00
CSDUMMI
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
Christian Schmidt
8da99ffb0d
Add alt text for preview card thumbnails ( #26184 )
2023-08-03 15:41:51 +02:00
Eugen Rochko
2cbdff97ce
Change design of role badges in web UI ( #26281 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-08-02 17:24:32 +02:00
Claire
71fd70335a
Change interaction modal input to disable browser spell-checking, capitalization and autocomplete ( #26267 )
2023-08-01 17:11:30 +02:00
Claire
92fa9d34b0
Merge commit '3554c527954441fd924586a49c7d99a89101ac7e' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/authorize_interactions_controller.rb`:
Small conflict due to our theming system.
- `streaming/index.js`:
Upstream refactored part of the streaming server.
We had some extra logic for handling local-only posts.
Applied the refactor.
2023-07-30 16:11:55 +02:00
Claire
454d8567d4
Merge commit '1814990a3d117555153321216fa593e4d9e84de3' into glitch-soc/merge-upstream
2023-07-30 15:54:34 +02:00
Claire
bd349cb850
Merge commit 'ce1f35d7e213327549b960bb64f63c67a141ea40' into glitch-soc/merge-upstream
...
Conflicts:
- `db/schema.rb`:
Upstream regenerated the schema file using Rails 7, the conflicts are
caused by our extra columns.
Applied upstream's changes, but keeping our extra columns.
2023-07-30 14:58:56 +02:00
Claire
b2515feb29
Merge commit 'cfd50f30bb5dda4dd90e1ad01f3e62c99135c36f' into glitch-soc/merge-upstream
2023-07-30 14:33:28 +02:00
Claire
42f36aa55a
Merge commit '5b457961fc1189a71599dc6c06b3f159b195a455' into glitch-soc/merge-upstream
...
Conflicts:
- `config/initializers/content_security_policy.rb`:
Upstream fixed an issue that was not present in glitch-soc.
Kept our version.
2023-07-30 13:49:35 +02:00
Claire
993d0a9950
Merge commit '1e3b19230a48174acf524cf1a9f5a498e220ea7d' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/account.rb`:
Upstream added new validations close to lines on which glitch-soc had
modified validations to handle custom limits set through environment
variables.
Ported upstream changes.
- `config/initializers/content_security_policy.rb`:
Upstream added `AZURE_ALIAS_HOST`. Glitch-soc's version of the file is
completely different.
Added `AZURE_ALIAS_HOST` to our version of the file.
2023-07-30 13:15:01 +02:00
Eugen Rochko
d4807a5e64
Change aspect ratios on link previews in web UI ( #26250 )
2023-07-30 03:35:17 +02:00
Plastikmensch
4d3a129212
Fix public TL not indicating new toots when onlyRemote
is enabled ( #26247 )
...
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-07-29 20:18:38 +02:00
Claire
a4ec187a20
Change the wording of the dismissable explore prompt ( #25917 )
2023-07-27 16:51:02 +02:00
Claire
bbea052935
Fix emoji picker button scrolling with textarea content in single-column view ( #25304 )
2023-07-27 16:20:33 +02:00
Claire
b4e739ff0f
Change interaction modal in web UI ( #26075 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2023-07-27 16:11:17 +02:00
Claire
1e4ccc655a
Add role badges to the WebUI ( #25649 )
2023-07-27 16:05:24 +02:00
Christian Schmidt
a4b69bec2e
Fix missing GIF badge in account gallery ( #26166 )
2023-07-26 03:33:31 +02:00
Eugen Rochko
f826a95f6e
Add published date and author to news on the explore screen in web UI ( #26155 )
2023-07-25 00:57:15 +02:00
Christian Schmidt
4299208487
Fix lang
for UI texts in link preview ( #26149 )
2023-07-24 23:01:31 +02:00
Eugen Rochko
714a20697f
Fix missing action label on sensitive videos and embeds in web UI ( #26135 )
2023-07-24 22:04:38 +02:00
Christian Schmidt
76fce34ebb
Add lang
attribute to trending links ( #26111 )
2023-07-24 13:48:23 +02:00
Eugen Rochko
6b2952d1dd
Change design of link previews in web UI ( #26136 )
2023-07-24 13:47:28 +02:00
Eugen Rochko
4d01d1a1ee
Remove 16:9 cropping from web UI ( #26132 )
2023-07-24 13:46:55 +02:00
Eugen Rochko
5e8cbb5f82
Remove back button from bookmarks, favourites and lists screens in web UI ( #26126 )
2023-07-23 17:55:20 +02:00
gunchleoc
217ef7f2af
Replace 'favourite' by 'favorite' for American English ( #26009 )
2023-07-21 19:09:13 +02:00
Trevor Wolf
59478a1b46
change focus ui for keyboard only input ( #25935 )
2023-07-21 13:20:14 +02:00
Claire
e4ea80d808
Change thread view to scroll to the selected post rather than the post being replied to ( #24685 )
2023-07-21 13:14:30 +02:00
Stanislas Signoud
586b1c9dca
Fix a missing redirection on getting-started in multi column mode ( #26070 )
2023-07-20 14:46:02 +02:00
Claire
c04f2d0cf7
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/admin/settings/appearance/show.html.haml`:
Upstream enforced an uniform code style around lambdas, and glitch-soc
had a different lambda due to its theming system.
Applied the same code style changes.
- `app/views/settings/preferences/appearance/show.html.haml`:
Upstream enforced an uniform code style around lambdas, and glitch-soc
removed some code just after the lambda.
Applied the same code style changes.
2023-07-17 19:02:23 +02:00
Claire
a442a1d1c6
Fix “Back” button sometimes redirecting out of Mastodon ( #25281 )
2023-07-17 17:32:46 +02:00
Claire
d9adda1a99
Merge commit '71db616fed817893d0efa363f0e7dbfcf23866a0' into glitch-soc/merge-upstream
2023-07-13 22:40:15 +02:00
Claire
71db616fed
Change “About” and “Privacy policy” links to open in a new tab in advanced interface ( #25973 )
2023-07-13 17:59:15 +02:00
Stanislas Signoud
5fad7bd58a
Change links in multi-column mode so tabs are open in single-column mode ( #25893 )
2023-07-13 17:18:09 +02:00
Claire
41f65edb21
Fix embed dropdown menu item for unauthenticated users ( #25964 )
2023-07-13 15:53:03 +02:00
Claire
25571b18ed
Merge commit '5a3f174d561cbdc79a597cd2b9502ed058d372da' into glitch-soc/merge-upstream
2023-07-13 14:22:20 +02:00
Renaud Chaput
447ab7ab24
[Glitch] Convert Home timeline components to Typescript
...
Port a75138d073
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-07-13 14:21:08 +02:00
Claire
177497b367
Merge commit '3ed9b55cb3987e3d32c56f857cb6903ca8bec3d4' into glitch-soc/merge-upstream
2023-07-13 14:02:28 +02:00
Claire
95a1fde6b6
Merge commit '73b64b89170cb72854a1709186c62ce31f476889' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/styles/fonts/roboto-mono.scss`:
Upstream updated the linter, which changed a few linter rules.
Some of those changed lines are different in glitch-soc because we use
different paths for the assets.
Applied the same style rules on our version of the file.
- `app/javascript/styles/fonts/roboto.scss`:
Upstream updated the linter, which changed a few linter rules.
Some of those changed lines are different in glitch-soc because we use
different paths for the assets.
Applied the same style rules on our version of the file.
2023-07-13 13:49:58 +02:00
Renaud Chaput
a7253075d1
Upgrade to typescript-eslint
v6 ( #25904 )
2023-07-13 11:49:16 +02:00
Renaud Chaput
a75138d073
Convert Home timeline components to Typescript ( #25583 )
2023-07-13 11:28:55 +02:00
Renaud Chaput
73b64b8917
Upgrade to Prettier 3 ( #25902 )
2023-07-13 11:26:45 +02:00
Claire
075887e1d6
Merge commit 'ea10febd257b5b729a50aeb3218389763f5f4b97' into glitch-soc/merge-upstream
2023-07-12 15:44:33 +02:00
Claire
82eebd0482
Merge commit '41a505513fb36f7c28c8d8a4270d5ee192169462' into glitch-soc/merge-upstream
...
Conflicts:
- `app/serializers/initial_state_serializer.rb`:
Upstream renamed an initial state parameter, where we had extra ones.
Renamed as upstream did.
- `app/workers/feed_insert_worker.rb`:
Upstream wrapped database query in a block, we had extra database
queries because of the DM timeline.
Moved everything in the block.
2023-07-12 15:27:32 +02:00
Claire
7e54a30f06
Merge commit '4534498a8e43f59980ee56e9938efab8580c78c8' into glitch-soc/merge-upstream
2023-07-12 15:00:41 +02:00
Claire
67055b0343
Fix import order inconsistencies ( #2289 )
2023-07-12 15:00:10 +02:00
Trevor Wolf
ea10febd25
fix buttons showing inconsistent styles ( #25903 )
2023-07-11 12:26:09 +02:00
Claire
af54bf52c8
Fix filters not applying to explore tab ( #25887 )
2023-07-10 19:33:07 +02:00
Claire
c27b82a437
Add forward_to_domains
parameter to POST /api/v1/reports
( #25866 )
2023-07-10 18:26:56 +02:00
Eugen Rochko
a7ca33ad96
Add toast with option to open post after publishing in web UI ( #25564 )
2023-07-08 20:01:08 +02:00
Eugen Rochko
a8edbcf963
Fix dropdowns being disabled for logged out users in web UI ( #25714 )
2023-07-08 20:00:52 +02:00
Eugen Rochko
ceeb2b8c41
Fix explore page being inaccessible when opted-out of trends in web UI ( #25716 )
2023-07-08 20:00:12 +02:00
Renaud Chaput
4534498a8e
Convert <DismissableBanner>
to Typescript ( #25582 )
2023-07-08 11:12:20 +02:00
alfe
20e85c0e83
Rewrite <ShortNumber />
as FC and TS ( #25492 )
2023-07-08 11:11:58 +02:00
fusagiko / takayamaki
e0d230fb37
simplify counters ( #25541 )
2023-07-08 11:11:22 +02:00
Claire
5de49e74d4
Merge branch 'main' into glitch-soc/merge-upstream
2023-07-05 12:01:26 +02:00
Eugen Rochko
000b835803
Add canonical link tags in web UI ( #25715 )
2023-07-05 11:25:27 +02:00
mogaminsk
6268188543
Fix local live feeds does not expand ( #25694 )
2023-07-04 00:37:57 +02:00
Eugen Rochko
54a10523e2
Change labels of live feeds tabs in web UI ( #25683 )
2023-07-03 22:57:18 +02:00
Claire
44e98a2740
Merge branch 'main' into glitch-soc/merge-upstream
2023-07-02 11:49:08 +02:00
mogaminsk
5b46345459
Prevent duplicate concurrent calls of /api/*/instance
in web UI ( #25663 )
2023-07-02 11:12:16 +02:00
Eugen Rochko
0512537eb6
Change dropdown icon above compose form from ellipsis to bars in web UI ( #25661 )
2023-07-02 10:39:55 +02:00
Claire
cea9db5a0b
Change local and federated timelines to be in a single firehose column ( #25641 )
2023-07-02 00:05:10 +02:00
Claire
9934949fc4
Fix onboarding prompt being displayed because of disconnection gaps ( #25617 )
2023-06-30 16:32:12 +02:00
Claire
285a691936
Remove the search button from UI header when logged out ( #25631 )
2023-06-28 14:57:51 +02:00
Claire
80a5c16ae1
Merge branch 'main' into glitch-soc/merge-upstream
2023-06-27 13:15:41 +02:00
Renaud Chaput
ae30a60b1f
Improve dismissable banner buttons when they dont fit on 1 line ( #25580 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-06-26 12:31:48 +02:00
Eugen Rochko
65aa04647a
Fix onboarding prompt flashing while home feed is loading in web UI ( #25579 )
2023-06-26 05:26:54 +02:00
Eugen Rochko
2b78c07ef1
Fix search not being easily findable on smaller screens in web UI ( #25576 )
2023-06-26 05:26:41 +02:00
Claire
178e151019
Merge commit '55e7c08a83547424024bac311d5459cb82cf6dae' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/user_settings.rb`:
Upstream added a constraint on a setting textually close
to glitch-soc-only settings.
Applied upstream's change.
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream added support for the `translate` attribute on a few elements,
where glitch-soc had a different set of allowed elements and attributes.
Extended glitch-soc's allowed attributes with `translate` as upstream did.
- `spec/validators/status_length_validator_spec.rb`:
Upstream refactored to use RSpec's `instance_double` instead of `double`,
but glitch-soc had changes to tests due to configurable max toot chars.
Applied upstream's changes while keeping tests against configurable max
toot chars.
2023-06-25 14:27:38 +02:00
Eugen Rochko
a985d587e1
Change labels and styles on the onboarding screen in web UI ( #25559 )
2023-06-23 16:34:27 +02:00
Claire
0842a68532
Remove unique accounts condition from Home onboarding prompt ( #25556 )
2023-06-23 14:44:54 +02:00
Eugen Rochko
00ec43914a
Add onboarding prompt when home feed too slow in web UI ( #25267 )
2023-06-22 23:48:40 +02:00
Claire
a8c1c8bd37
Fix j/k keyboard shortcuts on some status lists ( #25554 )
2023-06-22 17:54:43 +02:00
mogaminsk
8d2c26834f
Fix custom signup URL may not loaded ( #25531 )
2023-06-22 12:10:49 +02:00
Ian
69db507924
Change emoji picker icon ( #25479 )
2023-06-21 17:58:00 +02:00
Claire
6c99479ef4
Merge commit '9e245d147bcb2c72cc552ff8c276a1c34e2f686d' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/settings/profiles/show.html.haml`:
Upstream redesigned the settings page, where glitch-soc had changes because of
the ability to set some custom limits.
Went with upstream's design while keeping our custom limits.
- `yarn.lock`:
Upstream updated dependencies textually close to a glitch-soc-only dependency.
Updated the dependnencies as well.
2023-06-18 13:41:33 +02:00
Claire
65cbcce997
Merge commit '39110d1d0af5e3d9cf452ae47496a52797249fd0' into glitch-soc/merge-upstream
2023-06-18 10:36:14 +02:00
Claire
c9d06d10d4
Fix non-interactive upload container being given a button
role and tabIndex ( #25462 )
2023-06-16 12:03:06 +02:00
Eugen Rochko
f20698000f
Fix always redirecting to onboarding in web UI ( #25396 )
2023-06-14 09:05:03 +02:00
たいち ひ
3b5e302f7f
Rewrite emoji_mart_data_light
as TS ( #25138 )
2023-06-13 19:28:31 +02:00
alfe
a86886b1fd
Rewrite <LoadingIndicator/>
as FC and TS ( #25364 )
2023-06-13 19:26:25 +02:00
Renaud Chaput
1cb4514d0e
Add missing report category translation ( #25400 )
2023-06-13 15:05:40 +02:00
Eugen Rochko
432a5d2d4b
Change "bot" label to "automated" ( #25356 )
2023-06-11 04:47:07 +02:00
Claire
c48ec9cb8c
Merge commit 'b85c387c5c0527b0ad31c27031a09d361826c5fc' into glitch-soc/merge-upstream
...
Conflicts:
- `config/initializers/content_security_policy.rb`:
Kept our version, it was not affected by upstream's bug.
2023-06-10 16:48:01 +02:00
Claire
d8b0a732aa
Merge commit '1483a3ddfe74e4fb81d87447a1781943eab86c60' into glitch-soc/merge-upstream
...
Conflicts:
- `config/initializers/simple_form.rb`:
Upstream added a new simple_form component, where we had an extra one.
Kept both components.
2023-06-10 16:22:14 +02:00
Claire
93c714417f
Merge commit 'b922ad7a1b4bc8d968d0df2c7f307d4fec53435d' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`:
Upstream changed various script definitions in lines surrounding the one for
`i18n:extract`, which had glitch-soc-specific changes.
Updated the scripts as upstream did, while keeping our changes to
`i18n:extract`.
2023-06-10 14:38:04 +02:00
Claire
85722a918d
Merge commit '44cd88adc4e2f4028dcc2b08b98368f0dc90cee4' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/dependabot.yml`:
Updated upstream, but we've deleted it.
Keep it deleted.
- `app/javascript/mastodon/locales/index.js`:
Reworked upstream, but the code was mostly in
`app/javascript/locales/index.js` in glitch-soc.
Updated that file accordingly.
- `app/javascript/packs/public.jsx`:
Not a real conflict, but different imports in
glitch-soc and upstream.
- `app/views/layouts/application.html.haml`:
Conflict due to locales loading and theme system
discrepancies.
Updated in our own way.
- `app/views/layouts/embedded.html.haml`:
Conflict due to locales loading and theme system
discrepancies.
Updated in our own way.
- `config/webpack/generateLocalePacks.js`:
Deleted upstream, as upstream now directly loads the
JSON at runtime.
Deleted as well, will switch to runtime loading in
an upcoming commit.
- `config/webpack/shared.js`:
Not a real conflict, but different imports in
glitch-soc and upstream.
- `config/webpack/translationRunner.js`:
Mostly deleted upstream, to be replaced with `formatjs-formatter.js`
instead.
Moved the glitch-soc logic there and deleted the file.
2023-06-10 12:38:33 +02:00
Eugen Rochko
67d17ce194
Add legal
as report category ( #23941 )
2023-06-06 23:41:59 +02:00
Eugen Rochko
e4fd9503ec
Change design of dropdowns in web UI ( #25107 )
2023-06-06 21:49:49 +02:00
alfe
fb5bf5cbf8
Rewrite <LoadMore />
as FC and TS ( #25259 )
2023-06-06 11:28:50 +02:00
Claire
1483a3ddfe
Add data-nosnippet so Google doesn't use trending posts in snippets for / ( #25279 )
2023-06-05 17:32:24 +02:00