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
d2ee5b1900
Remove dead code from public.jsx ( #26547 )
1 year ago
f8b5f05d44
Improve error messages when DeepL quota is exceeded ( #26704 )
1 year ago
9a65f28e9e
New Crowdin translations ( #2388 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
a4130c4139
Fix colors and typography on hashtag bar in web UI ( #26666 )
1 year ago
92c9bf731d
Change video compression parameters ( #26631 )
1 year ago
e1b0d6bbe5
Update dependency stoplight to v3.0.2 ( #26698 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
bafa60f5b9
Fix bad search type heuristic ( #26673 )
1 year ago
c46d297740
Fix incorrect call to `PublicStatusesIndex.import` ( #26697 )
1 year ago
9ab2c6b479
Add search options to search popout in web UI ( #26662 )
1 year ago
4ecbd5bb40
Add `from:me` syntax to search ( #26660 )
1 year ago
85c3155d14
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
4b24a994c1
Fix multiple issues with status index mappings ( #26686 )
1 year ago
c51564cc67
Update DefinitelyTyped types (non-major) ( #26693 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
62bc0e37d2
Update dependency haml_lint to v0.50.0 ( #26665 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
e50d54b91a
Fix not being able to negate prefix clauses in search ( #26672 )
1 year ago
e886929716
Update eslint (non-major) ( #26694 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
f071f72a3c
Change indexing jobs to use database replica ( #26692 )
1 year ago
4456f65da4
Fix unnecessary condition causing seqscan when indexing ( #26689 )
1 year ago
a0373d049d
Change queue of job when opting into search from `default` to `pull` ( #26688 )
1 year ago
d033fab0ed
New Crowdin translations ( #2376 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
1 year ago
2cb30c25dc
Fix nightly build version ( #26676 )
1 year ago
8784abbc4c
Fix toast saying "published" instead of "saved" after editing post in web UI ( #26664 )
1 year ago
1201da3752
Change the pre-release versioning scheme and associated environment variables ( #26653 )
1 year ago
c833282412
Fix dashboard check for Elasticsearch suggested command including incorrect names ( #26658 )
1 year ago
5a74675fce
Update ordering to use `id` from body of document instead of deprecated `_id` ( #26659 )
1 year ago
c0d98abf00
Update dependency immutable to v4.3.4 ( #26655 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
2a5c1dca2e
Fix statuses search Elasticsearch query ( #26657 )
1 year ago
11b120cb64
Add Elasticsearch/OpenSearch version to “Software” in admin dashboard ( #26652 )
1 year ago
a9a06f5ffe
Add PublicStatusesCheck to Elasticsearch index check on admin dashboard ( #26650 )
1 year ago
d8276ad1b4
Add `data-nosnippet` attribute to remote posts and local posts with `noindex` ( #26648 )
1 year ago
3a75c0fdc3
Update babel monorepo to v7.22.11 ( #26640 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
b24b345375
Merge pull request #2383 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
1 year ago
9bc91160b2
[Glitch] Fix clicking “Explore” or “Live feeds” column headers to scroll in advanced mode
...
Port b63ddc70d6
1 year ago
a7a9e2854d
[Glitch] Fix selecting domains to forward reports to not passing the information correctly
...
Port 6db702fa24
1 year ago
592a675a33
Merge commit '14de2ab8804ca9c765e99d5d22383cc9079c53f8' 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
8ed2ece44d
Merge commit '5e0894ff132ef566880604b96b45ce650a9872ab' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/layouts/admin.html.haml`:
Upstream moved `javascript_pack_tag` calls around, but we don't use them in
the same way in glitch-soc due to the different theming system.
Kept glitch-soc's files unchanged.
1 year ago
6f5721e5c9
[Glitch] Change opacity of the delete icon in the search field to be more visible
...
Port b271c3da75
1 year ago
a0c46afb82
Merge commit '87a88eefa865f80cf682a7fb45f594fab7c8242a' into glitch-soc/merge-upstream
1 year ago
63ba01fb2d
[Glitch] Fix some React warnings
...
Port 6a4160cb5f
1 year ago
2a8e55b0ee
Merge commit '032dfdfb70963ec9dbdad8f40b5056e16680ec86' 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
40ee4d55df
Merge commit 'd67c1089643a25ab617c51a0cd3787eb0d7831b7' into glitch-soc/merge-upstream
1 year ago
7c2c2918ac
[Glitch] Fix layout of the closed registrations modal
...
Port 38ec8071fa
1 year ago
2e8f2a18f9
[Glitch] Fix profile picture preview
...
Port SCSS changes from 330f7e5e7e
1 year ago
Claire
Eugen Rochko
Christian Schmidt
Lukas Martini
github-actions[bot]
renovate[bot]
jsgoldstein
Antonin Del Fabbro