8000 ci: Sync release/3.10.x with develop by marksweb · Pull Request #7328 · django-cms/django-cms · GitHub
[go: up one dir, main page]
Skip to content

ci: Sync release/3.10.x with develop #7328

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 21 commits into from
May 24, 2022
Merged

ci: Sync release/3.10.x with develop #7328

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
5f4814b
Release 3.10.0 RC1 (#7215)
Feb 1, 2022
c7d4e15
Update release/3.10 from develop (#7219)
marksweb Feb 8, 2022
2f8cb35
Add toolbar fix for broken CMS in the release 3.10.x (#7233)
vinitkumar Feb 10, 2022
3e5227d
fix: using .nvmrc to target teh right nvm version
Mar 5, 2022
822fbab
Release/3.10.x (#7260) Releasing 3.10.0RC2
Mar 5, 2022
d415b84
Update release script to make it compatible with BSD (macos) compatible
marksweb Mar 24, 2022
9e93ac9
Update release script to make it compatible with BSD (macos) compatible
marksweb Mar 24, 2022
7a363eb
Merge remote-tracking branch 'upstream/develop' into develop
marksweb Mar 24, 2022
0aa37dc
Merge remote-tracking branch 'upstream/develop' into develop
marksweb Mar 24, 2022
afd8def
Release/3.10.x (#7275)
Mar 26, 2022
5714a8f
Fixes #7288 by also catching AttributeError, when the current toolbar…
mbi Mar 31, 2022
40a818c
Merge branch 'django-cms:develop' into develop
marksweb Apr 2, 2022
e707f6a
Fix for django 2.2 in middleware [#7290] (#7293)
marksweb Apr 4, 2022
3531372
Update release script to make it compatible with BSD (macos) compatib…
marksweb Apr 4, 2022
5d33733
Merge branch 'django-cms:develop' into develop
marksweb Apr 4, 2022
1cb3 C462 dc5
Fix release script version commit. (#7295)
marksweb Apr 4, 2022
20cd347
Merge branch 'django-cms:develop' into develop
marksweb Apr 20, 2022
8914915
Merge branch 'django-cms:develop' into develop
marksweb May 22, 2022
00ab32c
Merge branch 'develop' of github.com:django-cms/django-cms into develop
marksweb May 23, 2022
ce8b47e
Merge branch 'release/3.10.x' into develop
marksweb May 24, 2022
ea18ce1
fix: typos in CHANGELOG.rst
marksweb May 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'develop' of github.com:django-cms/django-cms into develop
  • Loading branch information
@marksweb
marksweb committed May 23, 2022
commit 00ab32c24c1a0f5e295d03496fdfa336800d60d6

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.
0