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
17e93dbce5
Merge commit 'b085dcc921497f08e72cb29cf0b5cb07699d9d74' 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
4a7afb8e59
Fix changelog wording and missing items ( #26638 )
1 year ago
d0a26a2a16
Merge commit 'd4eef922aa794489a027575a560e4b09c68c153e' into glitch-soc/merge-upstream
1 year ago
1f30778ec6
Merge commit 'd38310bed22bdf2be6ef0e49f325715685b74400' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/packs/public.jsx`:
Upstream updated code that we actually moved to `app/javascript/core/settings.js`.
Applied the changes there.
1 year ago
6fba17f6f3
Merge commit 'b4a95b46cd4399420670c8edf1807ad3a6e979ec' into glitch-soc/merge-upstream
1 year ago
1c86cabf4b
[Glitch] Remove redundant ready() wrapper
...
Port fa6b30b2f9
1 year ago
481a54ffdf
Merge commit 'fa6b30b2f9bd6cc12ec0a0278d27d748091208cd' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/packs/public.jsx`:
Upstream refactored slightly (but touching almost all the lines in the code),
glitch-soc had moved a few of the code to another file.
Refactored as upstream did.
1 year ago
e82d84469e
Add new public status index ( #26344 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
14de2ab880
Change nightlies versioning from `v4.2.0+2023-08-23` to `v4.2.0-nightly.2023-08-23` ( #26626 )
1 year ago
a4f3a67bd8
Change admin e-mail notification settins to be their own settings group ( #26596 )
1 year ago
b63ddc70d6
Fix clicking “Explore” or “Live feeds” column headers to scroll in advanced mode ( #26633 )
...
Co-authored-by: Plastikmensch <Plastikmensch@users.noreply.github.com>
1 year ago
6db702fa24
Fix selecting domains to forward reports to not passing the information correctly ( #26636 )
1 year ago
3cd79c570f
Fix: Workaround to load MASTODON_VERSION_* in Docker. ( #26591 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
deccd70910
Update dependency redis to v4.6.8 ( #26630 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
5e0894ff13
Consolidate inclusion of `admin` js pack link ( #26628 )
1 year ago
87a88eefa8
Update dependency rspec-sidekiq to v4 ( #26627 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
972c8ab3de
Merge pull request #2380 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 8f40a96f28
1 year ago
b271c3da75
Change opacity of the delete icon in the search field to be more visible ( #26449 )
1 year ago
2e58f75da6
Fix timeout on invalid set of exclusionary parameters in `/api/v1/timelines/public` ( #26239 )
1 year ago
032dfdfb70
Add elastic search installation into Vagrantfile ( #26512 )
1 year ago
d0181fc9e6
Update dependency sass to v1.66.1 ( #26534 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
97b2bf351d
Update dependency oj to v3.16.0 ( #26520 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
f6ce219c9d
Update dependency immutable to v4.3.3 ( #26622 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
77280a5b1d
Change hashtag bar tags to be de-emphasized ( #26606 )
1 year ago
6a4160cb5f
Fix some React warnings ( #26609 )
1 year ago
3fa794b94b
Change the hashtag bar to be hidden when there is a CW and the post is not expanded ( #26615 )
1 year ago
dca16db19d
Update Account Search to prioritize username over display name ( #26623 )
1 year ago
09dbff98df
Fix unexpected audio stream transcoding when uploaded video is eligible to passthrough ( #26608 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
Eugen Rochko
Claire
jsgoldstein
renovate[bot]
Antonin Del Fabbro
Christian Schmidt
Jaehong Kang
Matt Jankowski
Daniel M Brasil
Renaud Chaput
yufushiro