Skip to content

merge upstream#1

Closed
BlaiseOfGlory wants to merge 266 commits intoBlaiseOfGlory:feature-collab-notesfrom
GhostManager:master
Closed

merge upstream#1
BlaiseOfGlory wants to merge 266 commits intoBlaiseOfGlory:feature-collab-notesfrom
GhostManager:master

Conversation

@BlaiseOfGlory
Copy link
Copy Markdown
Owner

Merging upstream to work on fixing PR merge warnings:

GhostManager#805

Issues that need addressing: https://www.codefactor.io/repository/github/ghostmanager/ghostwriter/pull/805

chrismaddalena and others added 30 commits January 14, 2026 15:07
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Fix n+1 select issues in various views, significantly improving performance
As of Django 4.1, the cached loader is used by default. Declaring it
manually in `settings/production.py` was causing a conflict with the
`APP_DIRS` setting in the previous commit. Since what we define is the
default anyway, just remove it.
Fix django-debug-toolbar config, add example
fix: collab-server in kubernetes not working due to hardcoded graphql_engine hostname
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Bumps the npm_and_yarn group with 3 updates in the /javascript directory: [esbuild](https://github.com/evanw/esbuild), [js-yaml](https://github.com/nodeca/js-yaml) and [lodash](https://github.com/lodash/lodash).


Updates `esbuild` from 0.21.5 to 0.27.2
- [Release notes](https://github.com/evanw/esbuild/releases)
- [Changelog](https://github.com/evanw/esbuild/blob/main/CHANGELOG-2024.md)
- [Commits](evanw/esbuild@v0.21.5...v0.27.2)

Updates `js-yaml` from 4.1.0 to 4.1.1
- [Changelog](https://github.com/nodeca/js-yaml/blob/master/CHANGELOG.md)
- [Commits](nodeca/js-yaml@4.1.0...4.1.1)

Updates `lodash` from 4.17.21 to 4.17.23
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](lodash/lodash@4.17.21...4.17.23)

---
updated-dependencies:
- dependency-name: esbuild
  dependency-version: 0.27.2
  dependency-type: indirect
  dependency-group: npm_and_yarn
- dependency-name: js-yaml
  dependency-version: 4.1.1
  dependency-type: indirect
  dependency-group: npm_and_yarn
- dependency-name: lodash
  dependency-version: 4.17.23
  dependency-type: indirect
  dependency-group: npm_and_yarn
...

Signed-off-by: dependabot[bot] <support@github.com>
Now that we are publishing docker images, add a docker compose file for
Ghostwriter-CLI to download that uses those images.

Add a workflow that replaces the version in the gw-cli.yml file with the
current version and adds it as a release file, so that gw-cli can fetch
it.
…ascript/npm_and_yarn-fa06d10aec

Bump the npm_and_yarn group across 1 directory with 3 updates
chrismaddalena and others added 29 commits March 23, 2026 14:41
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Bumps the pip group with 1 update in the /requirements directory: [requests](https://github.com/psf/requests).


Updates `requests` from 2.32.5 to 2.33.0
- [Release notes](https://github.com/psf/requests/releases)
- [Changelog](https://github.com/psf/requests/blob/main/HISTORY.md)
- [Commits](psf/requests@v2.32.5...v2.33.0)

---
updated-dependencies:
- dependency-name: requests
  dependency-version: 2.33.0
  dependency-type: direct:production
  dependency-group: pip
...

Signed-off-by: dependabot[bot] <support@github.com>
…/pip-aa7cb66ac2

Bump requests from 2.32.5 to 2.33.0 in /requirements in the pip group across 1 directory
…ascript/npm_and_yarn-d1b1a1bb7d

Bump markdown-it from 14.1.0 to 14.1.1 in /javascript in the npm_and_yarn group across 1 directory
…ymce

Fixed objective result textbox not appearing as rich editor
TinyMCE will now use a dark mode skin when dark mode is enabled. This also sets a min height and addresses some timing issues to fix TinyMCE editors sometimes appearing almost fully collapsed vertically and unusable until resized by the user.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants