Claire
f546b0c999
Merge branch 'main' into glitch-soc/merge-upstream
2023-09-19 17:07:29 +02:00
Essem
1007c16320
Merge remote-tracking branch 'upstream/main'
2023-09-19 10:05:45 -05:00
github-actions[bot]
73ecc4de6e
New Crowdin Translations (automated) ( #26978 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-09-19 16:26:51 +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
1e87575b70
Merge commit '6eb6209d02514c5271238a23601be643c7b9f52d' into glitch-soc/merge-upstream
2023-09-19 12:53:32 +02:00
Claire
70cae19b6b
Fix hashtag bar being sometimes incorrectly hidden ( #26960 )
2023-09-19 12:25:39 +02:00
github-actions[bot]
67eaaa4b90
New Crowdin Translations (automated) ( #26966 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-09-19 10:41:48 +02:00
github-actions[bot]
1b4902fabf
New Crowdin Translations (automated) ( #26913 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-09-18 13:46:07 +02:00
Claire
9688c5fcc4
Merge branch 'main' into glitch-soc/merge-upstream
2023-09-18 12:09:37 +02:00
Claire
4c1518a6f3
Fix Web UI making duplicate search queries when scrolling ( #26959 )
2023-09-18 11:20:09 +02:00
Claire
893755f4cb
Fix error in Web UI when server rules cannot be fetched ( #26957 )
2023-09-18 09:51:52 +02:00
Essem
81c06b286f
Merge branch 'main' of https://github.com/glitch-soc/mastodon
2023-09-16 11:27:11 -05:00
Claire
dfc05ec8df
Merge commit '6273416292090b2f6bfda33f070cea325a1759df' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-nightly.yml`:
Upstream modified this file close to a line modified by glitch-soc to
disable the ARMv64 builder (as glitch-soc doesn't have one).
Ported upstream's changes.
- `.github/workflows/build-releases.yml`:
Upstream modified this file close to lines changed by glitch-soc to
change the Docker image repositories used (only ghcr, and based on the
organization's name).
Ported upstream's changes.
2023-09-15 21:43:49 +02:00
Claire
5ed72f668f
Merge commit 'b90383d07388fe8513e59a6deb1a2391146c6561' into glitch-soc/merge-upstream
2023-09-15 21:39:21 +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
Claire
2a4fcc51fd
Fix dismiss button overlapping with text in dismissable banners ( #26935 )
2023-09-15 19:53:28 +02:00
github-actions[bot]
921c6fe654
New Crowdin Translations (automated) ( #26498 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-09-13 15:10:41 +02:00
Claire
520b570474
Fix notification permissions being requested immediately after login ( #26472 )
2023-09-12 18:27:01 +02:00
Claire
287520453c
Fix front-end bug when processing relationship-related account actions ( #26902 )
2023-09-12 16:30:03 +02:00
Renaud Chaput
0712cc2b99
Fix Redux types ( #26899 )
2023-09-12 12:18:19 +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
Essem
b871816f0e
Merge remote-tracking branch 'upstream/main'
2023-09-04 19:00:18 -05: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
fbbe9f1c12
Merge commit 'a7d96e6affd4a2da65f09f3f4ffa1b9350bb9a42' into glitch-soc/merge-upstream
2023-09-02 12:20:33 +02:00
Claire
c8aa3d6d06
Merge commit 'dd72a8d28b4479afdc19ac73cac83609d85b5f9e' into glitch-soc/merge-upstream
2023-09-02 12:02:23 +02:00
Claire
3c7dbf3a16
Merge commit '5694e24bbf9afccbbf1b44d3a405a4e2bc0ff08d' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-nightly.yml`:
Upstream changed the environment variables used for defining the version
number. This change occurs close to lines that were modified in glitch-soc
to account for the different repositories to push to.
Ported upstream changes.
- `.github/workflows/build-push-pr.yml`:
Upstream changed the environment variables used for defining the version
number. This change occurs close to lines that were modified in glitch-soc
to account for the different repositories to push to.
Ported upstream changes.
- `lib/mastodon/version.rb`:
Upstream changed how the version string is built from environment variables.
Adapted the logic to account for the `+glitch` in glitch-soc.
2023-09-02 11:56:09 +02:00
Claire
6b7c47311d
Merge commit '072112867b9a3ec090ad2c92d6363b47b2265d74' into glitch-soc/merge-upstream
2023-09-02 11:41:40 +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
10b06436d1
Fix colors and typography on hashtag bar in web UI ( #26666 )
2023-08-28 19:49:38 +02:00
Eugen Rochko
bceb893159
Add search options to search popout in web UI ( #26662 )
2023-08-28 13:18:39 +02:00
renovate[bot]
9d9de8d219
Update dependency @testing-library/jest-dom to v6 ( #26479 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
2023-08-28 12:19:42 +02:00
Essem
7f94e0a8a7
Merge remote-tracking branch 'upstream/main'
2023-08-27 00:23:51 -05:00
Eugen Rochko
71641766f2
Fix toast saying "published" instead of "saved" after editing post in web UI ( #26664 )
2023-08-25 22:03:04 +02:00
Claire
c3a42e1280
Add data-nosnippet
attribute to remote posts and local posts with noindex
( #26648 )
2023-08-25 11:31:20 +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
Essem
0451c28535
Merge remote-tracking branch 'upstream/main'
2023-08-24 13:51:53 -05:00
Claire
e90649b064
Fix clicking “Explore” or “Live feeds” column headers to scroll in advanced mode ( #26633 )
...
Co-authored-by: Plastikmensch <Plastikmensch@users.noreply.github.com>
2023-08-24 14:10:48 +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
Claire
613cfd625c
Change hashtag bar tags to be de-emphasized ( #26606 )
2023-08-23 15:44:52 +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
Renaud Chaput
58acaa9ae6
Better hashtag normalization when processing a post ( #26614 )
2023-08-23 08:18:07 +02:00
Essem
958fe2b770
Merge remote-tracking branch 'upstream/main'
2023-08-22 17:05:43 -05: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
3ed2bf92d0
Fix case-insensitive comparison of hashtags to do case-folding ( #26525 )
2023-08-17 12:49:52 +02:00
Claire
0446394465
Fix “legal” report category not showing up in moderation interface ( #26509 )
2023-08-16 16:38:33 +02:00
Claire
f0862bcf98
Fix hashtag bar sometimes including tags that appear in the post's body ( #26506 )
2023-08-16 11:47:59 +02:00
Essem
e8ba9a39d7
Merge remote-tracking branch 'upstream/main'
2023-08-15 17:18:04 -05: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
github-actions[bot]
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
mogaminsk
a664e15702
Fix "Create Account" button in interaction modal ( #26459 )
2023-08-14 12:04:04 +02:00
Claire
92df185be7
Merge commit '496eb6f7a4fa7de54f26da9642a76e6884648102' into glitch-soc/merge-upstream
2023-08-13 19:23:22 +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
Essem
1ec905149e
Merge remote-tracking branch 'upstream/main'
2023-08-12 16:44:23 -05:00
Claire
34f3001278
Fix reply not preserving the language from the replied-to post ( #26452 )
2023-08-12 00:06:37 +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
github-actions[bot]
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
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
github-actions[bot]
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
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
Eugen Rochko
9d719bcd85
Change reblogs to be excluded from "Posts and replies" tab in web UI ( #26302 )
2023-08-03 20:39:33 +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
Essem
d9ea6abec0
Merge remote-tracking branch 'upstream/main'
2023-07-31 12:24:48 -05: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