…ext-plugin-xss-develop-premerge Conflicts: CHANGELOG.txt cms/__init__.py cms/tests/security.py setup.py tests/buildout.cfg
…ts for it
Many thanks to everyone who helped with the 2.2 release so far. Special thanks to Chris Glass, who kept reviewing code until a few hours before getting married today. Congratulations to him and his wife.
…ease, just a fix of our versioning policy
fixing some https issues and use https whenever possible
…tively to address some issues in 0.3.1 and 0.4.1
…kizai Conflicts: cms/tests/__init__.py cms/tests/plugins.py setup.py
Conflicts: cms/test_utils/testcases.py cms/tests/menu.py cms/tests/multilingual.py cms/tests/placeholder.py cms/tests/plugins.py cms/tests/toolbar.py
…ango-mptt 0.4.2. Removed the shipped mptt
Fixed menu tests not actually testing the tags properly
Conflicts: docs/Makefile docs/conf.py docs/static/basic.css docs/static/default.css docs/static/doctools.js docs/static/jquery.js docs/static/pygments.css docs/static/searchtools.js docs/templates/defindex.html docs/templates/genindex-single.html docs/templates/genindex-split.html docs/templates/genindex.html docs/templates/layout.html docs/templates/modindex.html docs/templates/page.html docs/templates/search.html
Updated setup.py and MANIFEST.in accordingly
…ge_data file to be copied when installing.