f546b0c999
Merge branch 'main' into glitch-soc/merge-upstream
1 year ago
73ecc4de6e
New Crowdin Translations (automated) ( #26978 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
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.
1 year ago
1e87575b70
Merge commit '6eb6209d02514c5271238a23601be643c7b9f52d' into glitch-soc/merge-upstream
1 year ago
70cae19b6b
Fix hashtag bar being sometimes incorrectly hidden ( #26960 )
1 year ago
67eaaa4b90
New Crowdin Translations (automated) ( #26966 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
1b4902fabf
New Crowdin Translations (automated) ( #26913 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
31dedf4697
[Glitch] Fix Web UI making duplicate search queries when scrolling
...
Port 4c1518a6f3
1 year ago
f61e29cc7e
[Glitch] Fix error in Web UI when server rules cannot be fetched
...
Port 893755f4cb
1 year ago
9688c5fcc4
Merge branch 'main' into glitch-soc/merge-upstream
1 year ago
4c1518a6f3
Fix Web UI making duplicate search queries when scrolling ( #26959 )
1 year ago
893755f4cb
Fix error in Web UI when server rules cannot be fetched ( #26957 )
1 year ago
60ecca6acb
Revert tabs background color so they are easier to visually distinguish from contents
1 year ago
d3f14dd7d4
[Glitch] Fix dismiss button overlapping with text in dismissable banners
...
Port 2a4fcc51fd
1 year ago
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.
1 year ago
5ed72f668f
Merge commit 'b90383d07388fe8513e59a6deb1a2391146c6561' into glitch-soc/merge-upstream
1 year ago
cf8b242c4c
[Glitch] Fix notification permissions being requested immediately after login
...
Port 520b570474
1 year ago
0b5903af7c
[Glitch] Fix recent search items not handling overflows correctly
...
Port d2cfcdd09e
1 year ago
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.
1 year ago
7384015505
[Glitch] Add recent searches in web UI
...
Port 9b2bc3d1de
1 year ago
263d601c25
[Glitch] Fix confusing behavior of mute button and volume slider in web UI
...
Port 91040da871
1 year ago
58514651c3
[Glitch] Fix mute button and volume slider feeling disconnected in web UI
...
Port f3a2e15f8e
1 year ago
15c865808a
[Glitch] Change onboarding prompt to use full width of banner in web UI
...
Port 1f141f656d
1 year ago
08b495d95c
Merge commit 'b1d89071384ef028c97a3d28cf8cf6bc0ca6c4ce' into glitch-soc/merge-upstream
1 year ago
9f3df3edee
[Glitch] Add some information about Full-text search being disabled in search popout
...
Port 9c1ef8302a
1 year ago
5d8c65f2a7
Merge commit '398635c0c4987ec44d937e98431ff5dee331ea94' into glitch-soc/merge-upstream
1 year ago
526f457ebc
[Glitch] Add infinite scrolling for search results in web UI
...
Port 5d20733d8d
1 year ago
f7a4d77d90
[Glitch] Add `in:` to search popout in web UI
...
Port d8bdba2f9f
1 year ago
3ca94f6d4a
Merge commit '93d051e47d27b5bd10be922a81d4d4eb6c306330' into glitch-soc/merge-upstream
1 year ago
e5269c6a65
[Glitch] Improve interaction modal error handling
...
Port 548c032dbb
1 year ago
e14372c2d1
Merge commit '548c032dbb90ae9c06b05fc05724c49d0b552fd9' into glitch-soc/merge-upstream
1 year ago
2a4fcc51fd
Fix dismiss button overlapping with text in dismissable banners ( #26935 )
1 year ago
921c6fe654
New Crowdin Translations (automated) ( #26498 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
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>
1 year ago
520b570474
Fix notification permissions being requested immediately after login ( #26472 )
1 year ago
287520453c
Fix front-end bug when processing relationship-related account actions ( #26902 )
1 year ago
0712cc2b99
Fix Redux types ( #26899 )
1 year ago
d2cfcdd09e
Fix recent search items not handling overflows correctly ( #26893 )
1 year ago
bd06c13204
Convert `actions/account_notes` into Typescript ( #26601 )
1 year ago
91040da871
Fix confusing behavior of mute button and volume slider in web UI ( #26860 )
1 year ago
9b2bc3d1de
Add recent searches in web UI ( #26834 )
1 year ago
f3a2e15f8e
Fix mute button and volume slider feeling disconnected in web UI ( #26827 )
1 year ago
1f141f656d
Change onboarding prompt to use full width of banner in web UI ( #26829 )
1 year ago
398635c0c4
Fix paragraph margins resulting in irregular read-more cut-off in web UI ( #26828 )
1 year ago
9c1ef8302a
Add some information about Full-text search being disabled in search popout ( #26756 )
1 year ago
d8bdba2f9f
Add `in:` to search popout in web UI ( #26807 )
1 year ago
9d290c23d2
Remove obfuscation of reply count in web UI ( #26768 )
1 year ago
5d20733d8d
Add infinite scrolling for search results in web UI ( #26784 )
1 year ago
548c032dbb
Improve interaction modal error handling ( #26795 )
1 year ago
d6f5c27fa9
[Glitch] Fix light mode colors for advanced interface banner
...
Port a106c46478
1 year ago
e66f961e05
Merge branch 'main' into glitch-soc/merge-upstream
1 year ago
a106c46478
Fix light mode colors for advanced interface banner ( #26759 )
1 year ago
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>
1 year ago
5c7df20c13
[Glitch] Add admin notifications for new Mastodon versions
...
Port front-end changes from 16681e0f20
1 year ago
c107512fa6
Merge commit '05093266e6e3c54f9096da9cdcdafdc83703c578' into glitch-soc/merge-upstream
1 year ago
4371df7fbe
[Glitch] Add `authorized_fetch` server setting in addition to env var
...
Port SCSS changes from 9e26cd5503
1 year ago
728eb6a153
Fix wrong color on active icons with counters in web UI ( #26767 )
1 year ago
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.
1 year ago
807c0591e1
[Glitch] Fix search popout including full-text search instructions when full-text search is disabled
...
Port 6c4c72497a
1 year ago
64e661b930
[Glitch] Allow filter form in profiles directory to wrap
...
Port f1d250135c
1 year ago
6c05ac4068
[Glitch] Add an explanation banner on switching to single column mode
...
Port 40b69cc1cd
1 year ago
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.
1 year ago
f5bd2014e2
[Glitch] Fix sign up steps progress layout in right-to-left locales
...
Port 21ec596dab
1 year ago
beb5fcd0dc
[Glitch] Fix bug with reblogged view on Toots only showing latest reblogging accounts
...
Port 74eb7dbf2d
1 year ago
871ab84854
[Glitch] Fix bug with favourited view on Toots only showing latest favouriting accounts
...
Port ae6cf33321
1 year ago
ffb486648c
Merge commit 'cb9f96036cf78835e22aafb30b80717b5a8b7394' into glitch-soc/merge-upstream
1 year ago
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.
1 year ago
fbbe9f1c12
Merge commit 'a7d96e6affd4a2da65f09f3f4ffa1b9350bb9a42' into glitch-soc/merge-upstream
1 year ago
cb50d95c06
[Glitch] Add search options to search popout in web UI
...
Port bceb893159
1 year ago
c8aa3d6d06
Merge commit 'dd72a8d28b4479afdc19ac73cac83609d85b5f9e' into glitch-soc/merge-upstream
1 year ago
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.
1 year ago
023673c0d9
[Glitch] Add `data-nosnippet` attribute to remote posts and local posts with `noindex`
...
Port c3a42e1280
1 year ago
6b7c47311d
Merge commit '072112867b9a3ec090ad2c92d6363b47b2265d74' into glitch-soc/merge-upstream
1 year ago
16681e0f20
Add admin notifications for new Mastodon versions ( #26582 )
1 year ago
9e26cd5503
Add `authorized_fetch` server setting in addition to env var ( #25798 )
1 year ago
6c4c72497a
Fix search popout including full-text search instructions when full-text search is disabled ( #26755 )
1 year ago
f1d250135c
Allow filter form in profiles directory to wrap ( #26682 )
1 year ago
40b69cc1cd
Add an explanation banner on switching to single column mode ( #26019 )
1 year ago
21ec596dab
Fix sign up steps progress layout in right-to-left locales ( #26728 )
1 year ago
74eb7dbf2d
Fix bug with reblogged view on Toots only showing latest reblogging accounts ( #26574 )
1 year ago
ae6cf33321
Fix bug with favourited view on Toots only showing latest favouriting accounts ( #26577 )
1 year ago
0719216368
Remove dead code from public.jsx ( #26547 )
1 year ago
786e586686
New Crowdin translations ( #2388 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
10b06436d1
Fix colors and typography on hashtag bar in web UI ( #26666 )
1 year ago
bceb893159
Add search options to search popout in web UI ( #26662 )
1 year ago
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>
1 year ago
efb1888320
New Crowdin translations ( #2376 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
71641766f2
Fix toast saying "published" instead of "saved" after editing post in web UI ( #26664 )
1 year ago
c3a42e1280
Add `data-nosnippet` attribute to remote posts and local posts with `noindex` ( #26648 )
1 year ago
685270f3f7
[Glitch] Fix clicking “Explore” or “Live feeds” column headers to scroll in advanced mode
...
Port e90649b064
1 year ago
66e82cb8e1
[Glitch] Fix selecting domains to forward reports to not passing the information correctly
...
Port b2ac93dd73
1 year ago
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.
1 year ago
406f3942a9
[Glitch] Change opacity of the delete icon in the search field to be more visible
...
Port 9a8190da4a
1 year ago
32e67e78a3
Merge commit 'e3fd07197379f1ac7fd4a761b3ff55effa1a2a6c' into glitch-soc/merge-upstream
1 year ago
def58f8ac3
[Glitch] Fix some React warnings
...
Port 152b10b624
1 year ago
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.
1 year ago
bdce78187c
[Glitch] Fix layout of the closed registrations modal
...
Port fe31571965
1 year ago
9b094f3653
[Glitch] Fix profile picture preview
...
Port SCSS changes from bb23116e8d
1 year ago
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.
1 year ago
88ff45a3b2
Merge commit 'facfec1ba36cee27f232ebff90b990933719235a' into glitch-soc/merge-upstream
1 year ago
Claire
github-actions[bot]
Santiago Kozak
Eugen Rochko
Plastikmensch
Renaud Chaput
Stanislas Signoud
Tim Rogers
Christian Schmidt
renovate[bot]
Antonin Del Fabbro