2514c0efa1
Merge pull request #2392 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes into glitch-soc
1 year ago
f15e8e3e0d
[Glitch] Add admin notifications for new Mastodon versions
...
Port front-end changes from 97238e3496
1 year ago
78a851ae0a
Merge commit '1b7b338d0a8fd34824aed80327d62526da9c5eac' into glitch-soc/merge-upstream
1 year ago
fa329286d0
[Glitch] Add `authorized_fetch` server setting in addition to env var
...
Port SCSS changes from 7d3930a520
1 year ago
63969b15b3
Merge commit '8bffce5f015ace5b73d5a8aa746c02e374d927bb' 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
f3f3294db5
Fix test failures due to different default settings in glitch-soc
1 year ago
e070644a5d
[Glitch] Fix search popout including full-text search instructions when full-text search is disabled
...
Port 20913b52bb
1 year ago
64e558cbbf
[Glitch] Allow filter form in profiles directory to wrap
...
Port 1b9fe4882f
1 year ago
f7e8c8033f
[Glitch] Add an explanation banner on switching to single column mode
...
Port 2c0eaf50f6
1 year ago
432bd89f72
Merge commit '20913b52bb192a9525b3da53a1d25c816a4a177d' 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
513d22e1d6
[Glitch] Fix sign up steps progress layout in right-to-left locales
...
Port 4452d8dad5
1 year ago
e21ef86a9b
[Glitch] Fix bug with reblogged view on Toots only showing latest reblogging accounts
...
Port 378b3dcddf
1 year ago
97d464e5d3
[Glitch] Fix bug with favourited view on Toots only showing latest favouriting accounts
...
Port 1b52b02c1c
1 year ago
d38116d584
Merge commit 'e26e4702acadc05fca8bb550f98b4186b04d335d' into glitch-soc/merge-upstream
1 year ago
5d5d0c06d8
Merge commit 'dec7a90989c823dba7f6322c3359c3cd861812e9' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream has updated their README, we have a completely different one.
Kept ours.
- `config/initializers/content_security_policy.rb`:
Upstream has updated their development CSPs, while we disable CSPs in
the development environment.
Kept our version.
1 year ago
c499c4a019
Merge commit 'd2ee5b19004995d385e344c5b3216e29c8337094' 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
1ef0758cf0
Merge commit 'f8b5f05d440796970b761dafb4bfea1784884ecf' into glitch-soc/merge-upstream
1 year ago
dab6bbdd54
[Glitch] Add search options to search popout in web UI
...
Port 9ab2c6b479
1 year ago
a9fb03b6c0
Merge commit 'e1b0d6bbe590b1d4f7bc90a528eeb20d89c499b7' into glitch-soc/merge-upstream
1 year ago
ed5d57dac3
Merge commit '4456f65da4da07b37132130d9049c6684d379085' 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
f188aa636c
[Glitch] Add `data-nosnippet` attribute to remote posts and local posts with `noindex`
...
Port d8276ad1b4
1 year ago
52ce0a1c1d
Merge commit 'c833282412b5dec6999fa76ac74cd8ba8a0394c5' into glitch-soc/merge-upstream
1 year ago
1b7b338d0a
Fix some video encoding failing due to uneven dimensions ( #26766 )
1 year ago
97238e3496
Add admin notifications for new Mastodon versions ( #26582 )
1 year ago
8bffce5f01
Move to ioredis for streaming ( #26581 )
...
Co-authored-by: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
1 year ago
7d3930a520
Add `authorized_fetch` server setting in addition to env var ( #25798 )
1 year ago
20913b52bb
Fix search popout including full-text search instructions when full-text search is disabled ( #26755 )
1 year ago
5cf3e206bb
Revert to using primary database in IndexingScheduler ( #26754 )
1 year ago
8e34673487
Update dependency pg to v1.5.4 ( #26750 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
50423eec75
Update dependency oj to v3.16.1 ( #26749 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
1f57ff8dd1
Fix unmatched quotes and prefixes causing search to fail ( #26701 )
1 year ago
340e86a137
Fix not being able to invoke phrase search using unicode quotation marks ( #26687 )
1 year ago
a189771256
Fix search queries with slash causing or-condition ( #26699 )
1 year ago
dcd8d25ac1
Change importers to avoid a few inefficiencies ( #26721 )
1 year ago
703178c117
Fix videos not playing in some browsers due to unsupported color space ( #26745 )
1 year ago
3f1b38932b
Fix `AddUniqueIndexOnPreviewCardsStatuses` migration requiring PostgreSQL 12+ in some cases ( #26737 )
1 year ago
76033c02ff
Fix searching by username by reverting account verbatim tokenizer to `standard` ( #26739 )
1 year ago
df241f222b
Fix comment in build image workflow ( #26740 )
1 year ago
1b9fe4882f
Allow filter form in profiles directory to wrap ( #26682 )
1 year ago
8ad87eeb93
Fix `/api/v1/timelines/tag/:hashtag` allowing for unauthenticated access when public preview is disabled ( #26237 )
1 year ago
a50d3d877f
Add avatar image to webfinger responses ( #26558 )
1 year ago
2c0eaf50f6
Add an explanation banner on switching to single column mode ( #26019 )
1 year ago
e26e4702ac
Add suggestion for secure cyphers to nginx.conf ( #26349 )
1 year ago
9c5bcaf188
Update dependency @babel/preset-env to v7.22.14 ( #26732 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
a76a99b2bb
Update dependency webpack-bundle-analyzer to v4.9.1 ( #26733 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
1097ca5377
Update dependency glob to v10.3.4 ( #26734 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
4d9dbcc5f0
Change text extraction in `PlainTextFormatter` to be faster ( #26727 )
1 year ago
4452d8dad5
Fix sign up steps progress layout in right-to-left locales ( #26728 )
1 year ago
d525fd6d87
Change `language:` to attempt to match to a known value in search ( #26663 )
1 year ago
3c1ef9b548
Update dependency chewy to v7.3.4 ( #26717 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
Claire
Santiago Kozak
Stanislas Signoud
Tim Rogers
Eugen Rochko
Gabriel Simmer
renovate[bot]
Renaud Chaput
Daniel M Brasil
Tyler Deitz
gunchleoc