Merging 3.10.x into develop #7277
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* [3.10.0rc1 release process] Bumped version to 3.10.0rc1 * [3.10.0rc1 release process] compilemessages * [3.10.0rc1 release process] compiling new static files * [3.10.0rc1 release process] updating latest docs
* Fix script typos (django-cms#7201) * [refactor] Typos in release scripts * This was correct. Co-authored-by: Simon Krull <simondotunix@gmail.com> * feat: Added concurrency option to github workflows (django-cms#7205) * fix: Disable workflow concurrency to bring stability back to the CI (django-cms#7209) * Upgrade Gulp and Nodejs (django-cms#7208) * feat: upgrade sass and gulp sass so that it installs on a modern node.js * fix: upgrade some packages and gulp config to 4.x series * fix: add support for icons working as well * Feat: get some tasks to work * fix: port one more tasks even if it is still erroring * wip: still broken config for webpack bundle * fix: let the new tests run * fix: issue with lint task * fix: some more issues with loaders * feat: get some tests passing atleast * fix: the frontend tests pass now * feat: generate new lock file * feat: use gulp 4.x * feat: make build use node16 as well * feat: add .nvmrc for a consistent experience * feat: Run workflows in concurrency groups (django-cms#7211) * feat: Added concurrency config using unique workflow groups * Remove whitespace to test cancellation * Remove whitespace to test cancellation 2 Co-authored-by: Vinit Kumar <mail@vinitkumar.me> Co-authored-by: Simon Krull <simondotunix@gmail.com>
* Fix script typos (django-cms#7201) * [refactor] Typos in release scripts * This was correct. Co-authored-by: Simon Krull <simondotunix@gmail.com> * feat: Added concurrency option to github workflows (django-cms#7205) * fix: Disable workflow concurrency to bring stability back to the CI (django-cms#7209) * Upgrade Gulp and Nodejs (django-cms#7208) * feat: upgrade sass and gulp sass so that it installs on a modern node.js * fix: upgrade some packages and gulp config to 4.x series * fix: add support for icons working as well * Feat: get some tasks to work * fix: port one more tasks even if it is still erroring * wip: still broken config for webpack bundle * fix: let the new tests run * fix: issue with lint task * fix: some more issues with loaders * feat: get some tests passing atleast * fix: the frontend tests pass now * feat: generate new lock file * feat: use gulp 4.x * feat: make build use node16 as well * feat: add .nvmrc for a consistent experience * feat: Run workflows in concurrency groups (django-cms#7211) * feat: Added concurrency config using unique workflow groups * Remove whitespace to test cancellation * Remove whitespace to test cancellation 2 Co-authored-by: Vinit Kumar <mail@vinitkumar.me> * fix: Toolbar bug in 3.10 (django-cms#7232) Co-authored-by: fsbraun <fsbraun@gmx.de> Co-authored-by: Mark Walker <theshow@gmail.com> Co-authored-by: Simon Krull <simondotunix@gmail.com> Co-authored-by: fsbraun <fsbraun@gmx.de>
* [3.10.0rc2 release process] Bumped version to 3.10.0rc2 * [3.10.0rc2 release process] compilemessages * [3.10.0rc2 release process] compiling new static files * [3.10.0rc2 release process] updating latest docs
marksweb
approved these changes
Mar 26, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merging the 3.10.0 release into develop
creating this PR to get all changes from 3.10.0 back into develop.
@vinitkumar please review and merge :)