Skip to content
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.

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

Port remaining Django 1.11, 2.0, 2.1 and 2.2 changes from master #529

Conversation

Aiky30
Copy link

@Aiky30 Aiky30 commented May 12, 2020

Implements the latest test configuration for Travis and Tox

Removes recently added jquery js files that should not have been added in the plugin Media definition, this made the addon use the wrong jquery.

Ported any missed changes from master regarding Django 2.x support from:

  • Added support for Django versions 1.11/2.0/2.1 and dropped for 1.8/1.… 62a134b
  • Added support for CMS 3.7 and Django 2.2 61699a3

@coveralls
Copy link

coveralls commented May 12, 2020

Coverage Status

Coverage remained the same at 77.791% when pulling e3ba608 on Aiky30:bugfix/remove-incorrect-jquery-inclusion into 660e605 on divio:support/4.0.x.

@Aiky30 Aiky30 changed the title Removed incorrect js inclusion Port remaining Django 1.11, 2.0, 2.1 and 2.2 changes from master May 12, 2020
@FinalAngel
Copy link
Member

Looks good so far :)

@Aiky30
Copy link
Author

Aiky30 commented May 13, 2020

Looks good so far :)

Cool thanks @FinalAngel. Can this PR be merged so that I can continue to port the addon alignment changes from Master in a new PR?

@FinalAngel FinalAngel merged commit be8cfb0 into django-cms:support/4.0.x May 13, 2020
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.

None yet

3 participants