Claire
e9a181c52c
Merge commit 'e95d25e1013b6328457b81bd98e8d6a841d45ec2' into glitch-soc/merge-upstream
2023-10-08 16:53:05 +02:00
Claire
702d162998
Merge commit '5393be7a21331c8615ffb79c2271db92f6959458' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/auth/registrations_controller.rb`:
Not a real conflict. Upstream removed the `set_instance_presenter` private
method from this class, and glitch-soc has an extra private method right
besides it for the theming system.
Removed `set_instance_presenter` as upstream did.
- `app/controllers/auth/sessions_controller.rb`:
Not a real conflict. Upstream removed the `set_instance_presenter` private
method from this class, and glitch-soc has an extra private method right
besides it for the theming system.
Removed `set_instance_presenter` as upstream did.
2023-10-08 16:48:19 +02:00
Michael Stanclift
cfc0da77ac
[Glitch] Fix retention dashboard not displaying correct month
...
Port 7fddeca190
2023-10-08 16:33:37 +02:00
Claire
19ebf7797e
Merge commit 'e6b903b21e0682c1156ffec583ac2836fda7d657' into glitch-soc/merge-upstream
2023-10-08 16:30:00 +02:00
Claire
4d59dfb1c6
Fix some remote posts getting truncated ( #27307 )
2023-10-06 12:58:02 +02:00
github-actions[bot]
e0b54ed3e1
New Crowdin Translations (automated) ( #27304 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-06 11:49:09 +02:00
Claire
2b98e2ecd6
Fix auto-loading-more when not scrolled ( #27286 )
2023-10-05 16:33:54 +02:00
github-actions[bot]
32ab474472
New Crowdin Translations (automated) ( #27277 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-05 13:13:14 +02:00
github-actions[bot]
8e4251f9e7
New Crowdin Translations (automated) ( #27270 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-04 10:53:04 +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
github-actions[bot]
e95d25e101
New Crowdin Translations (automated) ( #27260 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-03 10:47:28 +02:00
github-actions[bot]
ee866ec0e0
New Crowdin Translations (automated) ( #27220 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-02 13:35:29 +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
github-actions[bot]
695e42de0d
New Crowdin Translations (automated) ( #27202 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-09-29 10:04:18 +02:00
Claire
1da3c588ca
Fix link handling of mentions in user profiles when logged out ( #27185 )
2023-09-28 15:29:07 +02:00
github-actions[bot]
b93ce7d8b3
New Crowdin Translations (automated) ( #27168 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-09-28 10:44:16 +02:00
Christian Schmidt
6d0767558a
Make notification respect reduce-motion ( #27178 )
2023-09-28 10:39:38 +02:00
Michael Stanclift
7fddeca190
Fix retention dashboard not displaying correct month ( #27180 )
2023-09-28 10:16:15 +02:00
Claire
1eeaa0d84f
[Glitch] Fix width of large text icon buttons
...
Port 38753acaa5
2023-09-26 13:25:01 +02:00
gunchleoc
ca7d16912e
[Glitch] Fix line wrapping of language selection button with long locale codes
...
Port 88fa8e710a
2023-09-26 13:24:29 +02:00
Claire
02e6d9f8f9
[Glitch] Fix explore prompt sometimes showing up when the home TL is loading
...
Port a001ae2f39
2023-09-26 13:20:18 +02:00
Renaud Chaput
919ed0e469
[Glitch] Convert dropdown_menu state to Typescript
...
Port 4b7bc1f07c
2023-09-26 13:19:27 +02:00
Renaud Chaput
b2d67fbe33
[Glitch] Improve modals reducer types
...
Port b93ffb74bb
2023-09-26 13:17:08 +02:00
Claire
abdb58840a
Merge commit '57f592fed50747f3c97718a2761e17bafe6c8698' into glitch-soc/merge-upstream
2023-09-26 13:13:27 +02:00
Renaud Chaput
57f592fed5
Add Typescript types for some API objects ( #26602 )
2023-09-26 11:25:01 +02:00
github-actions[bot]
5ea3e8e765
New Crowdin Translations (automated) ( #27144 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-09-26 10:47:16 +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
gunchleoc
88fa8e710a
Fix line wrapping of language selection button with long locale codes ( #27100 )
2023-09-25 12:59:37 +02:00
github-actions[bot]
736fe75346
New Crowdin Translations (automated) ( #27080 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-09-25 10:50:09 +02:00
Renaud Chaput
4b7bc1f07c
Convert dropdown_menu state to Typescript ( #25585 )
2023-09-22 18:18:46 +02:00
Renaud Chaput
b93ffb74bb
Improve modals reducer types ( #26610 )
2023-09-22 16:41:50 +02:00
github-actions[bot]
e824585523
New Crowdin Translations (automated) ( #27052 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-09-22 11:06:48 +02:00
Claire
6760e67c64
[Glitch] Fix search results temporarily disappearing while scrolling and loading more results
...
Port 5356ddbcca
2023-09-21 15:14:38 +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
github-actions[bot]
effe4728cf
New Crowdin Translations (automated) ( #27005 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-09-21 11:06:04 +02:00
github-actions[bot]
61fe25fe74
New Crowdin Translations (automated) ( #26988 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-09-20 13:05:56 +02:00
Claire
f546b0c999
Merge branch 'main' into glitch-soc/merge-upstream
2023-09-19 17:07:29 +02: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
31dedf4697
[Glitch] Fix Web UI making duplicate search queries when scrolling
...
Port 4c1518a6f3
2023-09-18 12:12:55 +02:00
Claire
f61e29cc7e
[Glitch] Fix error in Web UI when server rules cannot be fetched
...
Port 893755f4cb
2023-09-18 12:11:09 +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
Claire
60ecca6acb
Revert tabs background color so they are easier to visually distinguish from contents
2023-09-16 09:50:00 +02:00
Claire
d3f14dd7d4
[Glitch] Fix dismiss button overlapping with text in dismissable banners
...
Port 2a4fcc51fd
2023-09-15 21:48:36 +02: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
cf8b242c4c
[Glitch] Fix notification permissions being requested immediately after login
...
Port 520b570474
2023-09-15 21:33:28 +02:00
Santiago Kozak
0b5903af7c
[Glitch] Fix recent search items not handling overflows correctly
...
Port d2cfcdd09e
2023-09-15 21:31:46 +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
Eugen Rochko
7384015505
[Glitch] Add recent searches in web UI
...
Port 9b2bc3d1de
2023-09-15 21:15:41 +02:00
Claire
263d601c25
[Glitch] Fix confusing behavior of mute button and volume slider in web UI
...
Port 91040da871
2023-09-15 21:12:53 +02:00
Eugen Rochko
58514651c3
[Glitch] Fix mute button and volume slider feeling disconnected in web UI
...
Port f3a2e15f8e
2023-09-15 21:12:13 +02:00
Eugen Rochko
15c865808a
[Glitch] Change onboarding prompt to use full width of banner in web UI
...
Port 1f141f656d
2023-09-15 21:09:28 +02:00
Claire
08b495d95c
Merge commit 'b1d89071384ef028c97a3d28cf8cf6bc0ca6c4ce' into glitch-soc/merge-upstream
2023-09-15 21:06:45 +02:00
Claire
9f3df3edee
[Glitch] Add some information about Full-text search being disabled in search popout
...
Port 9c1ef8302a
2023-09-15 21:01:40 +02:00
Claire
5d8c65f2a7
Merge commit '398635c0c4987ec44d937e98431ff5dee331ea94' into glitch-soc/merge-upstream
2023-09-15 20:57:40 +02:00
Eugen Rochko
526f457ebc
[Glitch] Add infinite scrolling for search results in web UI
...
Port 5d20733d8d
2023-09-15 20:54:20 +02:00
Eugen Rochko
f7a4d77d90
[Glitch] Add in: to search popout in web UI
...
Port d8bdba2f9f
2023-09-15 20:33:51 +02:00
Claire
3ca94f6d4a
Merge commit '93d051e47d27b5bd10be922a81d4d4eb6c306330' into glitch-soc/merge-upstream
2023-09-15 20:21:40 +02:00
Claire
e5269c6a65
[Glitch] Improve interaction modal error handling
...
Port 548c032dbb
2023-09-15 20:11:18 +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
Plastikmensch
075ee0b2d4
Fix wrong gradient color on collapsed private mentions ( #2402 )
...
Upstream changed the background color of private mentions, but the gradient used for collapsed toots still used the old color.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-09-13 08:44:40 +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
Santiago Kozak
d2cfcdd09e
Fix recent search items not handling overflows correctly ( #26893 )
2023-09-12 04:20:57 +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
Eugen Rochko
1f141f656d
Change onboarding prompt to use full width of banner in web UI ( #26829 )
2023-09-07 04:24:11 +02:00
Eugen Rochko
398635c0c4
Fix paragraph margins resulting in irregular read-more cut-off in web UI ( #26828 )
2023-09-07 04:24:01 +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
Stanislas Signoud
d6f5c27fa9
[Glitch] Fix light mode colors for advanced interface banner
...
Port a106c46478
2023-09-04 18:31:00 +02:00
Claire
e66f961e05
Merge branch 'main' into glitch-soc/merge-upstream
2023-09-04 18:27:46 +02:00
Stanislas Signoud
a106c46478
Fix light mode colors for advanced interface banner ( #26759 )
2023-09-04 10:14:01 +02:00
Plastikmensch
6b0702a3b5
Add recent to search props ( #2394 )
...
The new search popout requires the `recent` prop to be set, otherwise onboarding crashes with "recent is undefined"
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-09-03 08:46:30 +02:00
Claire
5c7df20c13
[Glitch] Add admin notifications for new Mastodon versions
...
Port front-end changes from 16681e0f20
2023-09-02 15:20:06 +02:00
Claire
c107512fa6
Merge commit '05093266e6e3c54f9096da9cdcdafdc83703c578' into glitch-soc/merge-upstream
2023-09-02 15:02:29 +02:00
Claire
4371df7fbe
[Glitch] Add authorized_fetch server setting in addition to env var
...
Port SCSS changes from 9e26cd5503
2023-09-02 15:01:37 +02:00
Eugen Rochko
728eb6a153
Fix wrong color on active icons with counters in web UI ( #26767 )
2023-09-02 14:46:26 +02:00
Claire
4ed629cd7e
Merge commit 'be991f1d18006a4820c1e9ca6625bf2bd2bfedac' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/form/admin_settings.rb`:
Upstream added the notion of overriden settings, while we had extra code for
pseudo-settings (only used to combine flavour and skin in a single select
field).
Ported upstream changes.
- `config/i18n-tasks.yml`:
Upstream added `simple_form.overridden` to `ignore_unused`,
we had `simple_form.glitch_only`.
Added `simple_form.glitch_only` as well.
2023-09-02 14:44:47 +02:00
Claire
807c0591e1
[Glitch] Fix search popout including full-text search instructions when full-text search is disabled
...
Port 6c4c72497a
2023-09-02 13:56:20 +02:00
Santiago Kozak
64e661b930
[Glitch] Allow filter form in profiles directory to wrap
...
Port f1d250135c
2023-09-02 13:55:53 +02:00
Stanislas Signoud
6c05ac4068
[Glitch] Add an explanation banner on switching to single column mode
...
Port 40b69cc1cd
2023-09-02 13:54:33 +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
f5bd2014e2
[Glitch] Fix sign up steps progress layout in right-to-left locales
...
Port 21ec596dab
2023-09-02 13:42:50 +02:00
Tim Rogers
beb5fcd0dc
[Glitch] Fix bug with reblogged view on Toots only showing latest reblogging accounts
...
Port 74eb7dbf2d
2023-09-02 13:42:15 +02:00
Tim Rogers
871ab84854
[Glitch] Fix bug with favourited view on Toots only showing latest favouriting accounts
...
Port ae6cf33321
2023-09-02 13:39:02 +02:00
Claire
ffb486648c
Merge commit 'cb9f96036cf78835e22aafb30b80717b5a8b7394' into glitch-soc/merge-upstream
2023-09-02 13:34:54 +02:00
Claire
6ee3e382df
Merge commit '0719216368bf3a90fdb7ab27201a0607b63ea203' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/packs/public.jsx`:
Some of the removed dead code was split from this code in
`app/javascript/core/public.js` and `app/javascript/core/settings.js`.
Removed this dead code, and removed `app/javascript/core/public.js`
altogether.
2023-09-02 13:18:16 +02:00
Claire
fbbe9f1c12
Merge commit 'a7d96e6affd4a2da65f09f3f4ffa1b9350bb9a42' into glitch-soc/merge-upstream
2023-09-02 12:20:33 +02:00
Eugen Rochko
cb50d95c06
[Glitch] Add search options to search popout in web UI
...
Port bceb893159
2023-09-02 12:09:07 +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
023673c0d9
[Glitch] Add data-nosnippet attribute to remote posts and local posts with noindex
...
Port c3a42e1280
2023-09-02 11:49:35 +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
9e26cd5503
Add authorized_fetch server setting in addition to env var ( #25798 )
2023-09-01 15:41:10 +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
Santiago Kozak
f1d250135c
Allow filter form in profiles directory to wrap ( #26682 )
2023-08-31 14:15:58 +02:00
Stanislas Signoud
40b69cc1cd
Add an explanation banner on switching to single column mode ( #26019 )
2023-08-31 12:18:46 +02:00
Claire
21ec596dab
Fix sign up steps progress layout in right-to-left locales ( #26728 )
2023-08-30 16:29:52 +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
Christian Schmidt
0719216368
Remove dead code from public.jsx ( #26547 )
2023-08-29 10:16:18 +02:00
github-actions[bot]
786e586686
New Crowdin translations ( #2388 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-08-29 08:28:45 +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
github-actions[bot]
efb1888320
New Crowdin translations ( #2376 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-08-26 22:53:46 +02: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
685270f3f7
[Glitch] Fix clicking “Explore” or “Live feeds” column headers to scroll in advanced mode
...
Port e90649b064
2023-08-24 22:00:27 +02:00
Claire
66e82cb8e1
[Glitch] Fix selecting domains to forward reports to not passing the information correctly
...
Port b2ac93dd73
2023-08-24 22:00:00 +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
Antonin Del Fabbro
406f3942a9
[Glitch] Change opacity of the delete icon in the search field to be more visible
...
Port 9a8190da4a
2023-08-24 21:51:13 +02:00
Claire
32e67e78a3
Merge commit 'e3fd07197379f1ac7fd4a761b3ff55effa1a2a6c' into glitch-soc/merge-upstream
2023-08-24 21:50:14 +02:00
Christian Schmidt
def58f8ac3
[Glitch] Fix some React warnings
...
Port 152b10b624
2023-08-24 21:49:26 +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
bdce78187c
[Glitch] Fix layout of the closed registrations modal
...
Port fe31571965
2023-08-24 21:38:08 +02:00
Christian Schmidt
9b094f3653
[Glitch] Fix profile picture preview
...
Port SCSS changes from bb23116e8d
2023-08-24 21:36:42 +02:00
Claire
296b3d1560
Merge commit 'dc09c10fa8cc9230bf14e48d790c8f0c26043f8f' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
Upstream re-generated the file, while glitch-soc has a specific ignore
for some file.
Updated the file as upstream did and kept our extra ignore.
- `config/webpack/shared.js`:
Upstream added a plugin, but our files are pretty different.
Added the plugin as well.
- `spec/helpers/application_helper_spec.rb`:
Upstream refactored tests, but part of them were different because
of glitch-soc's theming system.
Applied the refactoring to glitch-soc's change.
2023-08-24 21:26:27 +02:00
Claire
88ff45a3b2
Merge commit 'facfec1ba36cee27f232ebff90b990933719235a' into glitch-soc/merge-upstream
2023-08-24 21:03:56 +02:00
Claire
fbfc4145fd
Merge commit '1cdcd9dc08c91321f80ffe4822f6a3da15abeb2c' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/packs/public.jsx`:
Upstream updated code that we actually moved to `app/javascript/core/settings.js`.
Applied the changes there.
2023-08-24 21:01:19 +02:00
Christian Schmidt
e67c28a5fe
[Glitch] Remove redundant ready() wrapper
...
Port bb51c0676d
2023-08-24 20:35:22 +02:00
Claire
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
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
Antonin Del Fabbro
9a8190da4a
Change opacity of the delete icon in the search field to be more visible ( #26449 )
2023-08-23 15:51:07 +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
Claire
c053bfc45a
[Glitch] Fix “legal” report category not showing up in moderation interface
...
Port 0446394465
2023-08-22 18:54:22 +02:00
Claire
10404aece8
Merge commit '1cb978bcc3d291a045f367e072ca0af1a1c4dbbc' into glitch-soc/merge-upstream
2023-08-22 18:50:14 +02:00
Claire
245fe855be
[Glitch] Fix unfollow icon styling in advanced column
...
Port d9c21293aa
2023-08-22 18:48:23 +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
128daefc7a
Remove leftover .orig files that were mistakenly included ( #2379 )
2023-08-22 18:24:03 +02:00
Claire
fe31571965
Fix layout of the closed registrations modal ( #26593 )
2023-08-22 09:11:59 +02:00
mogaminsk
724d773844
[Glitch] Fix "Create Account" button in interaction modal
...
Port a664e15702
2023-08-21 21:08:56 +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
Christian Schmidt
bb23116e8d
Fix profile picture preview ( #26538 )
2023-08-18 18:24:32 +02:00
Christian Schmidt
bb51c0676d
Remove redundant ready() wrapper ( #26533 )
2023-08-18 12:06:08 +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
Santiago Kozak
85ecadb630
Fix hashtag bar display when status is in a thread ( #26497 )
2023-08-16 09:06:04 +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
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
987f190839
[Glitch] Fix reply not preserving the language from the replied-to post
...
Port 34f3001278
2023-08-13 19:24:50 +02:00
Claire
92df185be7
Merge commit '496eb6f7a4fa7de54f26da9642a76e6884648102' into glitch-soc/merge-upstream
2023-08-13 19:23:22 +02:00
Claire
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
Claire
7c4b115e7d
[Glitch] Fix interaction modal layout
...
Port cd6f2b3cbc
2023-08-13 19:12:42 +02:00
Eugen Rochko
0f8ddf367c
[Glitch] Change header of hashtag timelines in web UI
...
Port e325443b02
2023-08-13 19:11:52 +02:00
Claire
d9451feef0
[Glitch] Fix report modal secondary buttons style
...
Port 79936c584f
2023-08-13 19:08:08 +02:00
Claire
2f50b77ae8
[Glitch] Fix confirmation when closing media edition modal with unsaved changes
...
Port b59053ff8c
2023-08-13 19:06:02 +02:00
Trevor Wolf
f0ad745506
[Glitch] Fix light theme select option for hashtags
...
Port 93372fee1e
2023-08-13 19:05:24 +02:00
Eugen Rochko
03ae73bdc5
[Glitch] Change design of hidden media overlay (again) in web UI
...
Port 04e7efac3f
2023-08-13 19:04:07 +02:00
Eugen Rochko
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
CSDUMMI
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
Christian Schmidt
1461cc53ed
[Glitch] Add alt text for preview card thumbnails
...
Port 8da99ffb0d
2023-08-13 18:56:58 +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
Eugen Rochko
57a4e7927a
[Glitch] Add client-side timeout on resend confirmation button
...
Port 2f932cb2bb
2023-08-12 09:38:57 +02:00
Claire
ea8802a05a
Merge commit '3a4d3e9d4b573c400eec1743471d54cdccae50a5' into glitch-soc/merge-upstream
2023-08-12 09:36:38 +02:00
Claire
150cfcf3ae
Fix border-radius on “sensitive media” overlay for full-width media ( #2364 )
2023-08-12 09:30:27 +02:00
Claire
34f3001278
Fix reply not preserving the language from the replied-to post ( #26452 )
2023-08-12 00:06:37 +02:00
Claire
882e770400
[Glitch] Change interaction modal input to disable browser spell-checking, capitalization and autocomplete
...
Port 71fd70335a
2023-08-11 22:26:27 +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]
3378bdb01f
New Crowdin translations ( #2354 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-08-11 22:03:11 +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
79936c584f
Fix report modal secondary buttons style ( #26341 )
2023-08-04 16:25:44 +02:00
Claire
b59053ff8c
Fix confirmation when closing media edition modal with unsaved changes ( #26342 )
2023-08-04 15:48:29 +02:00
Trevor Wolf
93372fee1e
Fix light theme select option for hashtags ( #26311 )
2023-08-04 09:41:17 +02:00
Eugen Rochko
04e7efac3f
Change design of hidden media overlay (again) in web UI ( #26330 )
2023-08-03 20:39:45 +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
