fbbe9f1c12
Merge commit 'a7d96e6affd4a2da65f09f3f4ffa1b9350bb9a42' into glitch-soc/merge-upstream
2023-09-02 12:20:33 +02:00
cb50d95c06
[Glitch] Add search options to search popout in web UI
...
Port bceb893159
2023-09-02 12:09:07 +02:00
c8aa3d6d06
Merge commit 'dd72a8d28b4479afdc19ac73cac83609d85b5f9e' into glitch-soc/merge-upstream
2023-09-02 12:02:23 +02:00
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
023673c0d9
[Glitch] Add `data-nosnippet` attribute to remote posts and local posts with `noindex`
...
Port c3a42e1280
2023-09-02 11:49:35 +02:00
6b7c47311d
Merge commit '072112867b9a3ec090ad2c92d6363b47b2265d74' into glitch-soc/merge-upstream
2023-09-02 11:41:40 +02:00
a7d96e6aff
Improve error messages when DeepL quota is exceeded ( #26704 )
2023-08-29 09:14:44 +02:00
786e586686
New Crowdin translations ( #2388 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-08-29 08:28:45 +02:00
10b06436d1
Fix colors and typography on hashtag bar in web UI ( #26666 )
2023-08-28 19:49:38 +02:00
01b87a1632
Change video compression parameters ( #26631 )
2023-08-28 19:40:08 +02:00
dd72a8d28b
Update dependency stoplight to v3.0.2 ( #26698 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-08-28 17:10:58 +02:00
2304cc6456
Fix bad search type heuristic ( #26673 )
2023-08-28 17:08:37 +02:00
0cce7fb617
Fix incorrect call to `PublicStatusesIndex.import` ( #26697 )
2023-08-28 15:04:57 +02:00
bceb893159
Add search options to search popout in web UI ( #26662 )
2023-08-28 13:18:39 +02:00
67166de865
Add `from:me` syntax to search ( #26660 )
2023-08-28 12:43:00 +02:00
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
7bd5ebb0c5
Fix multiple issues with status index mappings ( #26686 )
2023-08-28 11:36:17 +02:00
4ea5db90da
Update DefinitelyTyped types (non-major) ( #26693 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-08-28 11:04:06 +02:00
b42fe5e338
Update dependency haml_lint to v0.50.0 ( #26665 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-08-28 10:32:13 +02:00
822a35b9d5
Fix not being able to negate prefix clauses in search ( #26672 )
2023-08-28 10:31:51 +02:00
fc14d1f3b0
Update eslint (non-major) ( #26694 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-08-28 10:20:02 +02:00
e263db276f
Change indexing jobs to use database replica ( #26692 )
2023-08-27 22:38:01 +02:00
5694e24bbf
Fix unnecessary condition causing seqscan when indexing ( #26689 )
2023-08-27 22:37:35 +02:00
f8d2fea2e6
Change queue of job when opting into search from `default` to `pull` ( #26688 )
2023-08-27 18:58:20 +02:00
efb1888320
New Crowdin translations ( #2376 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-08-26 22:53:46 +02:00
925c16adea
Fix nightly build version ( #26676 )
2023-08-26 17:34:36 +02:00
71641766f2
Fix toast saying "published" instead of "saved" after editing post in web UI ( #26664 )
2023-08-25 22:03:04 +02:00
f39847476c
Change the pre-release versioning scheme and associated environment variables ( #26653 )
2023-08-25 18:26:44 +02:00
072112867b
Fix dashboard check for Elasticsearch suggested command including incorrect names ( #26658 )
2023-08-25 18:17:22 +02:00
8e8747c564
Update ordering to use `id` from body of document instead of deprecated `_id` ( #26659 )
2023-08-25 18:16:08 +02:00
e4c0ce18a3
Update dependency immutable to v4.3.4 ( #26655 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-08-25 17:02:33 +02:00
82ec6f162b
Fix statuses search Elasticsearch query ( #26657 )
2023-08-25 17:01:56 +02:00
f2ec2876a4
Add Elasticsearch/OpenSearch version to “Software” in admin dashboard ( #26652 )
2023-08-25 12:02:09 +02:00
e3825a13c1
Add PublicStatusesCheck to Elasticsearch index check on admin dashboard ( #26650 )
2023-08-25 12:01:55 +02:00
c3a42e1280
Add `data-nosnippet` attribute to remote posts and local posts with `noindex` ( #26648 )
2023-08-25 11:31:20 +02:00
c66f756522
Update babel monorepo to v7.22.11 ( #26640 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-08-25 10:08:44 +02:00
d847c2060e
Merge pull request #2383 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2023-08-25 08:42:16 +02:00
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
66e82cb8e1
[Glitch] Fix selecting domains to forward reports to not passing the information correctly
...
Port b2ac93dd73
2023-08-24 22:00:00 +02:00
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
80f89f9cf2
Merge commit '9974163776b3e65e7cfa41e6293876909a1635b7' 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.
2023-08-24 21:52:19 +02:00
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
32e67e78a3
Merge commit 'e3fd07197379f1ac7fd4a761b3ff55effa1a2a6c' into glitch-soc/merge-upstream
2023-08-24 21:50:14 +02:00
def58f8ac3
[Glitch] Fix some React warnings
...
Port 152b10b624
2023-08-24 21:49:26 +02:00
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
d65aa507ca
Merge commit 'bd023a2637ce4df2102c4f760ca1d05ff2302d9f' into glitch-soc/merge-upstream
2023-08-24 21:38:59 +02:00
bdce78187c
[Glitch] Fix layout of the closed registrations modal
...
Port fe31571965
2023-08-24 21:38:08 +02:00
9b094f3653
[Glitch] Fix profile picture preview
...
Port SCSS changes from bb23116e8d
2023-08-24 21:36:42 +02:00
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
389b7d23db
Fix changelog wording and missing items ( #26638 )
2023-08-24 21:07:39 +02:00
Claire