Claire
925c16adea
Fix nightly build version ( #26676 )
2023-08-26 17:34:36 +02:00
Eugen Rochko
71641766f2
Fix toast saying "published" instead of "saved" after editing post in web UI ( #26664 )
2023-08-25 22:03:04 +02:00
Claire
9b958a707f
Fix interaction between CWs and hashtag bars
2023-08-25 21:54:15 +02:00
Claire
27812cb158
Fix hashtag bar styling
2023-08-25 21:46:43 +02:00
Claire
f5b0cca7d0
[Glitch] Change hashtag bar tags to be de-emphasized
...
Port 613cfd625c
2023-08-25 21:42:04 +02:00
Renaud Chaput
5485c87def
[Glitch] Better hashtag normalization when processing a post
...
Port 58acaa9ae6
2023-08-25 21:40:52 +02:00
Renaud Chaput
7402adf6e2
[Glitch] Remove hashtags from the last line of a status if it only contains hashtags
...
Port 061fd66ee6
2023-08-25 21:38:24 +02:00
Claire
bd02fbcbcc
[Glitch] Fix case-insensitive comparison of hashtags to do case-folding
...
Port 3ed2bf92d0
2023-08-25 21:25:04 +02:00
Claire
d11b6dcbfc
[Glitch] Fix hashtag bar sometimes including tags that appear in the post's body
...
Port f0862bcf98
2023-08-25 21:24:37 +02:00
Claire
f5a557a4b9
[Glitch] Add display of out-of-band hashtags in the web interface
...
Port df6e719898
2023-08-25 21:18:48 +02:00
Claire
f39847476c
Change the pre-release versioning scheme and associated environment variables ( #26653 )
2023-08-25 18:26:44 +02:00
Claire
072112867b
Fix dashboard check for Elasticsearch suggested command including incorrect names ( #26658 )
2023-08-25 18:17:22 +02:00
jsgoldstein
8e8747c564
Update ordering to use id from body of document instead of deprecated _id ( #26659 )
2023-08-25 18:16:08 +02:00
renovate[bot]
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
Claire
82ec6f162b
Fix statuses search Elasticsearch query ( #26657 )
2023-08-25 17:01:56 +02:00
Claire
f2ec2876a4
Add Elasticsearch/OpenSearch version to “Software” in admin dashboard ( #26652 )
2023-08-25 12:02:09 +02:00
Claire
e3825a13c1
Add PublicStatusesCheck to Elasticsearch index check on admin dashboard ( #26650 )
2023-08-25 12:01:55 +02:00
Claire
c3a42e1280
Add data-nosnippet attribute to remote posts and local posts with noindex ( #26648 )
2023-08-25 11:31:20 +02:00
renovate[bot]
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
Claire
d847c2060e
Merge pull request #2383 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2023-08-25 08:42:16 +02:00
Claire
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
Claire
66e82cb8e1
[Glitch] Fix selecting domains to forward reports to not passing the information correctly
...
Port b2ac93dd73
2023-08-24 22:00:00 +02:00
Claire
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
Claire
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
Antonin Del Fabbro
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
Claire
32e67e78a3
Merge commit 'e3fd07197379f1ac7fd4a761b3ff55effa1a2a6c' into glitch-soc/merge-upstream
2023-08-24 21:50:14 +02:00
Christian Schmidt
def58f8ac3
[Glitch] Fix some React warnings
...
Port 152b10b624
2023-08-24 21:49:26 +02:00
Claire
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
Claire
d65aa507ca
Merge commit 'bd023a2637ce4df2102c4f760ca1d05ff2302d9f' into glitch-soc/merge-upstream
2023-08-24 21:38:59 +02:00
Claire
bdce78187c
[Glitch] Fix layout of the closed registrations modal
...
Port fe31571965
2023-08-24 21:38:08 +02:00
Christian Schmidt
9b094f3653
[Glitch] Fix profile picture preview
...
Port SCSS changes from bb23116e8d
2023-08-24 21:36:42 +02:00
Claire
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
Claire
389b7d23db
Fix changelog wording and missing items ( #26638 )
2023-08-24 21:07:39 +02:00
Claire
88ff45a3b2
Merge commit 'facfec1ba36cee27f232ebff90b990933719235a' into glitch-soc/merge-upstream
2023-08-24 21:03:56 +02:00
Claire
fbfc4145fd
Merge commit '1cdcd9dc08c91321f80ffe4822f6a3da15abeb2c' 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.
2023-08-24 21:01:19 +02:00
Claire
1b5d3fdc5e
Merge commit 'ee702e36e58d638bcf75b2eae2ca86499693465e' into glitch-soc/merge-upstream
2023-08-24 20:55:28 +02:00
Essem
b153bf8eda
yeah
2023-08-24 13:54:16 -05:00
Essem
0451c28535
Merge remote-tracking branch 'upstream/main'
2023-08-24 13:51:53 -05:00
Christian Schmidt
e67c28a5fe
[Glitch] Remove redundant ready() wrapper
...
Port bb51c0676d
2023-08-24 20:35:22 +02:00
Claire
7b09f585fa
Merge commit 'bb51c0676d0cf27babc2c01ee337ca5fd24ae37c' 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.
2023-08-24 20:34:14 +02:00
jsgoldstein
30c191aaa0
Add new public status index ( #26344 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-08-24 16:40:04 +02:00
Claire
96bcee66fb
Change nightlies versioning from v4.2.0+2023-08-23 to v4.2.0-nightly.2023-08-23 ( #26626 )
2023-08-24 14:43:44 +02:00
Claire
163b004bb1
Change admin e-mail notification settins to be their own settings group ( #26596 )
2023-08-24 14:43:00 +02:00
Claire
e90649b064
Fix clicking “Explore” or “Live feeds” column headers to scroll in advanced mode ( #26633 )
...
Co-authored-by: Plastikmensch <Plastikmensch@users.noreply.github.com>
2023-08-24 14:10:48 +02:00
Claire
b2ac93dd73
Fix selecting domains to forward reports to not passing the information correctly ( #26636 )
2023-08-24 14:06:27 +02:00
Jaehong Kang
2dbbeedc94
Fix: Workaround to load MASTODON_VERSION_* in Docker. ( #26591 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-08-24 13:07:27 +02:00
renovate[bot]
24ea6f851f
Update dependency redis to v4.6.8 ( #26630 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-08-24 09:59:13 +02:00
Matt Jankowski
9974163776
Consolidate inclusion of admin js pack link ( #26628 )
2023-08-24 09:56:23 +02:00
renovate[bot]
e3fd071973
Update dependency rspec-sidekiq to v4 ( #26627 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-08-24 09:03:40 +02:00
Claire
8eb09466aa
Merge pull request #2380 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 1cb978bcc3
2023-08-23 16:56:19 +02:00
