treehouse
/
mastodon
19
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
19,328 Commits
11 Branches
15 Tags
736 MiB
Commit Graph

19328 Commits (9d32bdbcde0ed24a4f92f8c1031ecdfc058ef414)

Author SHA1 Message Date
Claire c833282412 Fix dashboard check for Elasticsearch suggested command including incorrect names (#26658) 2023-08-25 18:17:22 +02:00
jsgoldstein 5a74675fce Update ordering to use `id` from body of document instead of deprecated `_id` (#26659) 2023-08-25 18:16:08 +02:00
renovate[bot] c0d98abf00 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 2a5c1dca2e Fix statuses search Elasticsearch query (#26657) 2023-08-25 17:01:56 +02:00
Claire 11b120cb64 Add Elasticsearch/OpenSearch version to “Software” in admin dashboard (#26652) 2023-08-25 12:02:09 +02:00
Claire a9a06f5ffe Add PublicStatusesCheck to Elasticsearch index check on admin dashboard (#26650) 2023-08-25 12:01:55 +02:00
Claire d8276ad1b4 Add `data-nosnippet` attribute to remote posts and local posts with `noindex` (#26648) 2023-08-25 11:31:20 +02:00
renovate[bot] 3a75c0fdc3 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 b24b345375 Merge pull request #2383 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2023-08-25 08:42:16 +02:00
Claire 9bc91160b2 [Glitch] Fix clicking “Explore” or “Live feeds” column headers to scroll in advanced mode 
Port b63ddc70d6 to glitch-soc

Co-authored-by: Plastikmensch <Plastikmensch@users.noreply.github.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-24 22:00:27 +02:00
Claire a7a9e2854d [Glitch] Fix selecting domains to forward reports to not passing the information correctly 
Port 6db702fa24 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-24 22:00:00 +02:00
Claire 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.
 2023-08-24 21:56:00 +02:00
Claire 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.
 2023-08-24 21:52:19 +02:00
Antonin Del Fabbro 6f5721e5c9 [Glitch] Change opacity of the delete icon in the search field to be more visible 
Port b271c3da75 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-24 21:51:13 +02:00
Claire a0c46afb82 Merge commit '87a88eefa865f80cf682a7fb45f594fab7c8242a' into glitch-soc/merge-upstream 2023-08-24 21:50:14 +02:00
Christian Schmidt 63ba01fb2d [Glitch] Fix some React warnings 
Port 6a4160cb5f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-24 21:49:26 +02:00
Claire 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.
 2023-08-24 21:46:17 +02:00
Claire 40ee4d55df Merge commit 'd67c1089643a25ab617c51a0cd3787eb0d7831b7' into glitch-soc/merge-upstream 2023-08-24 21:38:59 +02:00
Claire 7c2c2918ac [Glitch] Fix layout of the closed registrations modal 
Port 38ec8071fa to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-24 21:38:08 +02:00
Christian Schmidt 2e8f2a18f9 [Glitch] Fix profile picture preview 
Port SCSS changes from 330f7e5e7e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-24 21:36:42 +02:00
Claire 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.
 2023-08-24 21:26:27 +02:00
Claire 4a7afb8e59 Fix changelog wording and missing items (#26638) 2023-08-24 21:07:39 +02:00
Claire d0a26a2a16 Merge commit 'd4eef922aa794489a027575a560e4b09c68c153e' into glitch-soc/merge-upstream 2023-08-24 21:03:56 +02:00
Claire 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.
 2023-08-24 21:01:19 +02:00
Claire 6fba17f6f3 Merge commit 'b4a95b46cd4399420670c8edf1807ad3a6e979ec' into glitch-soc/merge-upstream 2023-08-24 20:55:28 +02:00
Christian Schmidt 1c86cabf4b [Glitch] Remove redundant ready() wrapper 
Port fa6b30b2f9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-24 20:35:22 +02:00
Claire 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.
 2023-08-24 20:34:14 +02:00
jsgoldstein e82d84469e 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 14de2ab880 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 a4f3a67bd8 Change admin e-mail notification settins to be their own settings group (#26596) 2023-08-24 14:43:00 +02:00
Claire b63ddc70d6 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 6db702fa24 Fix selecting domains to forward reports to not passing the information correctly (#26636) 2023-08-24 14:06:27 +02:00
Jaehong Kang 3cd79c570f 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] deccd70910 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 5e0894ff13 Consolidate inclusion of `admin` js pack link (#26628) 2023-08-24 09:56:23 +02:00
renovate[bot] 87a88eefa8 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 972c8ab3de Merge pull request #2380 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 8f40a96f28
 2023-08-23 16:56:19 +02:00
Antonin Del Fabbro b271c3da75 Change opacity of the delete icon in the search field to be more visible (#26449) 2023-08-23 15:51:07 +02:00
Daniel M Brasil 2e58f75da6 Fix timeout on invalid set of exclusionary parameters in `/api/v1/timelines/public` (#26239) 2023-08-23 15:50:23 +02:00
jsgoldstein 032dfdfb70 Add elastic search installation into Vagrantfile (#26512) 2023-08-23 15:46:14 +02:00
renovate[bot] d0181fc9e6 Update dependency sass to v1.66.1 (#26534) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-23 15:45:56 +02:00
renovate[bot] 97b2bf351d Update dependency oj to v3.16.0 (#26520) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-23 15:45:38 +02:00
renovate[bot] f6ce219c9d Update dependency immutable to v4.3.3 (#26622) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-23 15:45:21 +02:00
Claire 77280a5b1d Change hashtag bar tags to be de-emphasized (#26606) 2023-08-23 15:44:52 +02:00
Christian Schmidt 6a4160cb5f Fix some React warnings (#26609) 2023-08-23 15:43:41 +02:00
Renaud Chaput 3fa794b94b Change the hashtag bar to be hidden when there is a CW and the post is not expanded (#26615) 2023-08-23 15:40:31 +02:00
jsgoldstein dca16db19d Update Account Search to prioritize username over display name (#26623) 2023-08-23 15:40:09 +02:00
yufushiro 09dbff98df Fix unexpected audio stream transcoding when uploaded video is eligible to passthrough (#26608) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-23 08:44:56 +02:00
Robert R George a4bc8b58f9 Add support for federating `memorial` attribute (#26583) 2023-08-23 08:27:24 +02:00
renovate[bot] 7c4e4be3c6 Update dependency react-textarea-autosize to v8.5.3 (#26607) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-23 08:26:30 +02:00