Essem
08c8c856b3
Bump client-side max resize resolution to 3840x2160
2023-09-13 21:03:39 -05:00
Essem
4d9832b211
Merge remote-tracking branch 'upstream/main'
2023-09-07 08:52:29 -05:00
Essem
c57f803db7
Merge remote-tracking branch 'claire/glitch-soc/port-upstream-hashtags'
2023-09-04 19:10:42 -05:00
Essem
b871816f0e
Merge remote-tracking branch 'upstream/main'
2023-09-04 19:00:18 -05: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
Eugen Rochko
04220ff7e8
[Glitch] Fix colors and typography on hashtag bar in web UI
...
Port 10b06436d1
2023-09-02 15:34:20 +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 ' 05093266e6' 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 ' be991f1d18' 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 ' 6c4c72497a' 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 ' cb9f96036c' into glitch-soc/merge-upstream
2023-09-02 13:34:54 +02:00
Claire
6ee3e382df
Merge commit ' 0719216368' 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 ' a7d96e6aff' 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 ' dd72a8d28b' into glitch-soc/merge-upstream
2023-09-02 12:02:23 +02:00
Claire
3c7dbf3a16
Merge commit ' 5694e24bbf' 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
670f55e83c
Fix interaction between CWs and hashtag bars
2023-09-02 11:44:58 +02:00
Claire
d05e100f56
Fix hashtag bar styling
2023-09-02 11:44:58 +02:00
Claire
cbf9b0d8b1
[Glitch] Change hashtag bar tags to be de-emphasized
...
Port 613cfd625c
2023-09-02 11:44:58 +02:00
Renaud Chaput
5153b5e862
[Glitch] Better hashtag normalization when processing a post
...
Port 58acaa9ae6
2023-09-02 11:44:58 +02:00
Renaud Chaput
0412a9d775
[Glitch] Remove hashtags from the last line of a status if it only contains hashtags
...
Port 061fd66ee6
2023-09-02 11:44:58 +02:00
Claire
a547453059
[Glitch] Fix case-insensitive comparison of hashtags to do case-folding
...
Port 3ed2bf92d0
2023-09-02 11:44:58 +02:00
Claire
03580d3443
[Glitch] Fix hashtag bar sometimes including tags that appear in the post's body
...
Port f0862bcf98
2023-09-02 11:44:58 +02:00
Claire
58cfd200a5
[Glitch] Add display of out-of-band hashtags in the web interface
...
Port df6e719898
2023-09-02 11:44:58 +02:00
Claire
6b7c47311d
Merge commit ' 072112867b' 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
Essem
9da802a271
Fix mastomodern hashtag bar
2023-08-28 19:54:04 -05: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
