diff --git a/.coveragerc b/.coveragerc index b6651f820..27ed61b08 100644 --- a/.coveragerc +++ b/.coveragerc @@ -1,8 +1,8 @@ [run] +branch = False source = cms menus -branch = False omit = cms/migrations/* cms/south_migrations/* diff --git a/.github/CONTRIBUTING.rst b/.github/CONTRIBUTING.rst deleted file mode 100644 index ca550ce72..000000000 --- a/.github/CONTRIBUTING.rst +++ /dev/null @@ -1,78 +0,0 @@ -########################## -Contributing to django CMS -########################## - -Like every open-source project, django CMS always welcomes contributions. - - -******************************* -GitHub issues and pull requests -******************************* - -`GitHub issues `_ should only be used to report *suspected issues* in -django CMS. - -It should **not** be used for reporting *security issues* - please use `security@django-cms.org -`_ for those. - -For *help with django CMS*, please use our `users' email list `_. - -For *feature requests*, please use our `developers' email list -`_. - - -************************** -Contribution documentation -************************** - -We maintain comprehensive `contribution documentation `_ - please -familiarise yourself with it. - - -*************** -Security issues -*************** - -Security issues should not be reported **anywhere** except via our dedicated and private `security@django-cms.org -`_ email address. - -If you think you have discovered a security issue in our code, please do not raise it on - -* IRC -* GitHub -* Twitter -* either of our email lists - -or in any other public forum until we have had a chance to deal with it. - - -*************** -Code of conduct -*************** - -django CMS is governed by a `Code of Conduct -`_. All participants in our community and its -various forums are expected to abide by it. - - -********* -Community -********* - -You can join us online: - -* in our IRC channel, #django-cms, on ``irc.freenode.net``. If you don't have an IRC client, you can - `join our IRC channel using the KiwiIRC web client - `_, which works pretty well. -* on our `django CMS users email list `_ for - **general** django CMS questions and discussion -* on our `django CMS developers email list - `_ for discussions about the - **development of django CMS** - -You can also follow: - -* the `Travis Continuous Integration build reports `_ -* the `@djangocms`_ Twitter account for general announcements - -.. _@djangocms : https://twitter.com/djangocms diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md deleted file mode 100644 index 44c2ea5f5..000000000 --- a/.github/ISSUE_TEMPLATE.md +++ /dev/null @@ -1,30 +0,0 @@ - - -### Summary - - - - -### Expected behaviour - - - -### Actual behaviour - - - -### Environment - -* Python version: -* Django version: -* django CMS version: diff --git a/.github/ISSUE_TEMPLATE/---bug-report.md b/.github/ISSUE_TEMPLATE/---bug-report.md index a2a03ea96..4e6884a1f 100644 --- a/.github/ISSUE_TEMPLATE/---bug-report.md +++ b/.github/ISSUE_TEMPLATE/---bug-report.md @@ -8,13 +8,15 @@ assignees: '' --- ## Description @@ -39,5 +41,6 @@ A clear and concise description of what is actually happening. ## Additional information diff --git a/.github/ISSUE_TEMPLATE/---feature-requests.md b/.github/ISSUE_TEMPLATE/---feature-requests.md index 03c94038b..71eed65c6 100644 --- a/.github/ISSUE_TEMPLATE/---feature-requests.md +++ b/.github/ISSUE_TEMPLATE/---feature-requests.md @@ -8,5 +8,6 @@ assignees: '' --- diff --git a/.github/ISSUE_TEMPLATE/---question.md b/.github/ISSUE_TEMPLATE/---question.md index 732e600e3..a986b7d5a 100644 --- a/.github/ISSUE_TEMPLATE/---question.md +++ b/.github/ISSUE_TEMPLATE/---question.md @@ -8,11 +8,12 @@ assignees: '' --- diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index c46885620..a9109e91f 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,23 +1,29 @@ +## Description + +## Related resources -### Summary + -Fixes # +* #... +* #... +## Checklist -### Links to related discussion + -### Proposed changes in this pull request - - -### General checklist - -* [ ] I have updated the CHANGELOG.txt -* [ ] I have created backports if necessary -* [ ] I have updated the documentation and/or amended the upgrade section - if necessary +* [ ] I have opened this pull request against ``develop`` +* [ ] I have updated the **CHANGELOG.rst** +* [ ] I have added or modified the tests when changing logic diff --git a/.tx/config b/.tx/config index dedf681e4..e5829ef66 100644 --- a/.tx/config +++ b/.tx/config @@ -1,13 +1,12 @@ +[main] +host = https://www.transifex.com + [django-cms.js] file_filter = cms/locale//LC_MESSAGES/djangojs.po source_file = cms/locale/en/LC_MESSAGES/djangojs.po source_lang = en -[main] -host = https://www.transifex.com - [django-cms.core] file_filter = cms/locale//LC_MESSAGES/django.po source_file = cms/locale/en/LC_MESSAGES/django.po source_lang = en - diff --git a/AUTHORS b/AUTHORS deleted file mode 100644 index c2678ad89..000000000 --- a/AUTHORS +++ /dev/null @@ -1,574 +0,0 @@ -Current or previous core committers: - -* Angelo Dini -* Beni Wohlwend -* Chris Glass -* Daniele Procida -* Eric Robitaille -* Iacopo Spalletti -* Jonas Obrist -* Martin Koistinen -* Patrick Lauber -* Paulo Alvarado -* Peter Ciciman -* Stefan Foulis -* Øyvind Saltvik - - -Current and previous core designers: - -* Christian Bertschy -* Matthias Nüesch - - -Contributors (based on gitlog, 543 unique authors): - -* A. Bram Neijt -* aaloy -* Aaron Fay -* Aaron Renner -* Aaron Spike -* aball -* Adam Chainz -* Adi Sieker -* Admin Adminaras -* Adrien Brunet -* Adrián Ribao Martínez -* Aidas Bendoraitis -* Alberto Paro -* Ales Kocjancic -* Ales Zabala Alava (Shagi) -* Alessandro Pasotti -* Alessandro Ronchi -* Alex Cucu -* Alex Marandon -* Alexander Paramonov -* Alexandre Leray -* Alexey Subbotin -* Aliaksei Urbanski -* alskgj -* Alvin Mites -* Anatoly Ivanov -* Andi Albrecht -* Andras Gyömrey -* Andre Bossard -* Andrea Stagi -* Andreas Elvers -* Andrei Avram -* Andrei Fokau -* Andrew Schoen -* André Cruz -* Angelo Dini -* angular_circle -* Anthony Steinhauser -* Antoine Catton -* Anton Parkhomenko -* AQNOUCH Mohammed -* Arcady Usov -* Arne Gellhaus -* Arne Schauf -* Artem Skoretskiy -* Arthur Debert -* Artis Avotins -* Aymeric Augustin -* Baptiste Darthenay -* Bartosz Płóciennik -* Basile LEGAL -* behrooz -* Behrooz Nobakht -* Belegnar -* Ben Northway -* Ben Stähli -* Benjamin -* Benjamin Liles -* Benjamin Wohlwend -* benjaoming -* benzkji -* Bernardo Cabezas Serra -* Bernd Zeimetz -* Bertrand Bordage -* beshrkayali -* Bitdeli Chef -* Bjorn Sandberg -* Bob Karreman -* Bouke Haarsma -* Brad Walker -* Braden MacDonald -* Brian Schott -* brightwhitefox -* Calvin Cheng -* Carlo Ascani -* Carlos de Paula -* casio -* centralniak -* Cezar Pendarovski -* cezar77 -* Chanita Siridechkun -* Charlie Denton -* Charpentier Johan -* Chematronix -* Cheng-Chia Tseng -* Chris Adams -* Chris Franklin -* Chris Glass -* Chris Hughes -* Chris Jones -* Chris Wesseling -* Chris Wilson -* Christian Strappazzon -* Christof Hagedorn -* Christopher Grebs -* Christos Kopanos -* Christy O'Reilly -* cip -* Claudio Bartolini -* Colin Wirz -* Conrado Buhrer -* Corey Farwell -* Craig de Stigter -* Craig Ricciuto -* creakings -* cworth-gh -* Damian Moore -* Damir Arbula -* DamirArbula -* Daniel Barden -* daniele -* Daniele Procida -* Danilo Bargen -* DaNmarner -* darbula -* Darii Denis -* Darii Denis Home -* Dario Albanesi -* Darren Pearce -* Darryl Woods -* Dave Bell -* Dave Hall -* David D Lowe -* David Grant -* David Jean Louis -* David Lam -* David Lee -* David Thompson -* Davide Setti -* derek73 -* deshack -* digi604 -* divio -* Diógenes Augusto Fernandes Hermínio -* dlamotte -* Dmitry Akinin -* Dmitry Gorelik -* Dmytro Gorelik -* Dmytro Litvinov -* Donatas -* Donatas Kučinskas -* Douwe van der Meij -* Dries Desmet -* dstufft -* Dylann CORDEL -* DylannCordel -* DZ -* eged -* Egor V. Nazarkin -* Ekrem SEREN -* Elias Probst -* Eraldo Energy -* Eric Amador -* Eric Eldredge -* Eric Robitaille -* ericr -* Erik Allik -* Erlend Dalen -* Eugene MechanisM -* Evandro Miquelito -* evildmp -* F. Gabriel Gosselin -* f4nt -* fcurella -* febsn -* Filip Kazimierczak -* Filipe Waitman -* FinalAngel -* fivethreeo -* fj -* floppya -* Florian Verdet -* Frank -* Frank Bieniek -* FrankBie -* frost-nzcr4 -* furiousdave -* Gabe Jackson -* Gabriel Hurley -* GaretJax -* Gavin Wahl -* genti94 -* Gentian Mazrekaj -* gentleShark -* Geoffrey Fairchild -* Geoffrey Hing -* George Marshall -* Gerard Świderski -* Germano Gabbianelli -* Gianluca Guarini -* Gilles Lenfant -* Gleb Chipiga -* Gokmen Gorgen -* Gourav Chawla(dotgourav) -* Gregory Klupar -* guandalino -* Hamish Downer -* Hans Andersen -* hedberg -* henning -* Henning Sprang -* heppstux -* Herbert Poul -* hjkelly -* Horst Gutmann -* hysia -* Iacopo Spalletti -* Ian Lewis -* ikudryavtsev -* indexofire -* Ionel Maries Cristian -* Ivan Vershigora -* Iván Raskovsky -* izi -* J. Cliff Dyer -* Jacob Rief -* Jakob Hedman -* Jakub Randák -* jalaziz -* Jameel Al-Aziz -* James Richards -* James Rutherford -* Jana Deutschlaender -* Jannik V -* Jannis Leidel -* Janusz Harkot -* Jared Proffitt -* Jason Brown -* Jason Davies -* Jason Jenkins -* Jason Robinson -* Jeffrey Goettsch -* Jens Diemer -* JensDiemer -* Jeroen -* Jeroen Noten -* Jeroen Peters -* Jessica Tallon -* Jimmy Lam -* Johannes Bornhold -* John Bazik -* John-Scott Atlakson -* Jon Prindiville -* Jonas Obrist -* Jonathan Liuti -* Jonathan Stoppani -* jordanjambazov -* Jorge Vargas -* Jos van Velzen -* Joseph Bergantine -* Joseph Lin -* Joseph Melettukunnel -* Josh Kalderimis -* Josh Schneier -* João Luiz Lorencetti -* Julien Poissonnier -* Julz -* Júlio R. Lucchese -* Kalle Bronsen -* kater169 -* Katie McLaughlin -* kblomqvist -* Kegan Holtzhausen -* Keryn Knight -* Kevin Burton -* Kevin Funk -* Kevin Möllering -* Kevin Richardson -* Kim Thoenen -* kochin -* Kristian Øllegaard -* Krzysztof Socha -* kunitoki -* L-A Iscla -* Lars Smit -* Lars van de Kerkhof -* Laurens Bosscher -* Leon Smith -* Leonardo -* Lio Mendonca -* Lionardo Mendonça -* littlepea -* Loriana Indelicato -* lovmat -* Lucas Vogelsang -* Lucio Asnaghi -* Ludwig Hähne -* lug -* Luis Diego Garcia -* Luke Crooks -* Luke Plant -* m000 -* Maik Lustenberger -* maiklust -* Manolis Stamatogiannakis -* Manuel Schmidt -* Marc-Olivier Titeux -* Marco Badan -* Marco Bonetti -* Marco Federighi -* Marco Paolini -* Marco Rimoldi -* marcor -* Marijn Goedegebure -* Mark -* Mark Rogers -* Mark Walker -* Markus Holtermann -* Markus Zapke-Gründemann -* Marti Raudsepp -* Martin -* Martin Bambas -* Martin Brochhaus -* Martin Koistinen -* Martin Kosír -* Martin Owens -* Martin Pajuste -* martinkosir -* Matas Dailyda -* Mateusz Dereniowski -* Mateusz Kamycki -* Mateusz Marzantowicz -* mathijs -* Matt Chisholm -* Matteo Rosati -* Matthias Cavigelli -* Mattia Larentis -* Max Shkurygin -* Maxim Bodyansky -* Maxime Haineault -* mbouchar -* mcosta -* meers -* Mel Collins -* meomap -* MerLex -* Michael P. Jung -* Michael Thornhill -* Michal Danilak -* Mike Dory -* Mike Johnson -* mikek -* Mikko Ahlroth -* Milo Price -* Mitar -* mobilepattern -* Mokys -* Morgan Wahl -* Motiejus Jakštys -* motleytech -* mrlundis -* mvaerle -* MW -* Mykhailo Kolesnyk -* Nelson Brochado -* neoprolog -* Nick Jones -* Nicolas -* Nicolas PASCAL -* nikolas -* Nina Zakharenko -* nsh -* o-zander -* ojii -* Oliver Thane -* Oliver Zander -* Olivier Larchevêque -* Olivier Le Brouster -* Orne Brocaar -* Oyvind Saltvik -* padelt -* Pankrat -* Paolo Leggio -* Paolo Romolini -* Pascal Mouret -* pascal.beyeler -* Patrick Arminio -* Patrick Lauber -* Patrick Toal -* patricklauber -* Patryk Zawadzki -* paul -* Paul van der Linden -* Paulo -* Paulo Alvarado -* Pavel Puchkin -* Pawel Markowski -* Paweł -* pbgc -* pcicman -* Pedro Gracia -* Pete Loggie -* Peter Farrell -* Peter J. Farrell -* Peter Landry -* Peter-Paul van Gemerden -* peterfarrell -* Petteri -* pgcd -* Philipp Bosch -* Philipp Zedler -* philomat -* phuihock -* Pigletto -* Piotr Jakimiak -* Piotr Kilczuk -* piquadrat -* pumalo -* Rafal Radulski -* raidsan -* Rainer Koirikivi -* Rajesh -* Rajesh K. -* Rajesh P. -* Rebecca Breu -* Remco Wendt -* René Fleschenberg -* requires.io -* Restless Being -* Richard Barran -* rizumu -* Robert Barsch -* Robert Buchholz -* Robert Clark -* Robert Feldbinder -* Robert Pogorzelski -* Robert Stein -* Roberto -* Roberto Bampi -* Robin Lewis -* robint -* Rodolfo Carvalho -* Roman Kozlovskiy -* root -* rtpm -* Ruslan Malogulko -* Russ Ferriday -* SachaMPS -* Salmanul Farzy -* Sam Manzi -* Samuel Lahti -* Samuel Luescher -* Samuel Lüscher -* saqlainsyed007 -* Sascha Marcel Schmidt -* sbussetti -* Schoen -* schwobaseggl -* scottbarnham -* sealibora -* Sean Bleier -* Sebastian Braun -* Sergey Fedoseev -* Seth Buntin -* Seyhun Akyurek -* Shahar Or -* Shatalov Vadim -* Shaun Brady -* shed -* Shinya Okano -* shulcsm -* Simon Charette -* Simon Hedberg -* Simon Meers -* sleytr -* Sophie Leroy -* spookylukey -* srj55 -* ssteinerX -* Stavros Korokithakis -* Stefan Foulis -* Stefan Wehrmeyer -* stefanfoulis -* Stefano Brentegani -* Stefano Crosta -* Stefano Morandi -* Stefano Probst -* Steffen Jasper -* Stephan -* Stephan Hepper -* Stephan Herzog -* Stephan Jaekel -* Stephan Michaud -* Stephen Muss -* Stephen Paulger -* Stephen Watkin -* Steve Steiner -* Steven Laroche -* Sylvain Fankhauser -* Tadas Dailyda -* Tanel Külaots -* tdelam -* tehfink -* Thibaud Colas -* Thomas Meitz -* Thomas Parslow -* Thomas Remmert -* Thomas Woolford -* thomas-d -* Tim Anderegg -* Tim Davies -* Tim Graham -* timesong -* Tino de Bruijn -* tiret -* Tobias von Klipstein -* Tom -* Tom Berger -* Tom de Simone -* Tom S -* Tom V -* Tom Wardill -* Ulrich Petri -* unknown -* uno -* User -* Vadim Lopatyuk -* Vadim Sikora -* Venelin Stoykov -* Viktor Nagy -* Viliam Segeda -* Vinit (Vermicelli on IRC) -* vinit kumar -* Vinod Kurup -* Vladimir Bolshakov -* Vladyslav -* vvangelovski -* wangJunjie -* Wayne Moore -* wid -* wildermesser -* WYSIATI -* Xavier Fernandez -* Xavier Ordoquy -* xie wei -* xray7224 -* Yann Malet -* yann.malet@gmail.com -* ychouinard -* yedpodtrzitko -* yohanboniface -* Yosuke Ikeda -* Yuri van der Meer -* zandeez -* zundoya -* Óscar M. Lage -* Øyvind Saltvik -* Žan Anderle -* Антон Евжаков diff --git a/CHANGELOG.txt b/CHANGELOG.rst similarity index 94% rename from CHANGELOG.txt rename to CHANGELOG.rst index 0b5eb1d53..49a003b97 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.rst @@ -1,5 +1,14 @@ -=== 3.7.1 (unreleased) === +========= +Changelog +========= + +3.7.1 (unreleased) - in development +================== + +* Added code of conduct reference file to the root directory +* Moved contributing file to the root directory +* Added better templates for new issue requests * Fixed a bug where creating a page via the ``cms.api.create_page`` ignores left/right positions. * Fixed documentation example for ``urls.py`` when using multiple languages. @@ -13,13 +22,15 @@ * Fixed the 'urls.W001' warning with custom apphook urls * Prevent non-staff users to login with the django CMS toolbar * Added missing ``{% trans %}?? to toolbar shortcuts. -* Updated branch policy. +* Updated branch and release policy. * Improved and simplified permissions documentation. * Improved apphooks documentation. * Improved CMSPluginBase documentation. * Improved documentation related to nested plugins. -=== 3.7.0 (2019-09-25) === + +3.7.0 (2019-09-25) +================== * Introduced Django 2.2 support. * Introduced Python 3.7 support. @@ -27,7 +38,8 @@ * Fixed override ``urlconf_module`` so that Django system checks don't crash. -=== 3.6.0 (2019-01-29) === +3.6.0 (2019-01-29) +================== * Removed the ``cms moderator`` command. * Dropped Django < 1.11 support. @@ -40,7 +52,8 @@ * Introduced Django 2.1 support. -=== 3.5.3 (2018-11-20) === +3.5.3 (2018-11-20) +================== * Fixed ``TreeNode.DoesNotExist`` exception raised when exporting and loading database contents via ``dumpdata`` and ``loaddata``. @@ -65,7 +78,8 @@ * Fixed a bug when deleting a modal from changelist inside a modal -=== 3.5.2 (2018-04-11) === +3.5.2 (2018-04-11) +================== * Fixed a bug where shortcuts menu entry would stop working after toolbar reload * Fixed a race condition in frontend code that could lead to sideframe being @@ -78,7 +92,8 @@ * Fixed a bug where the migration 0018 would fail under certain databases. -=== 3.5.1 (2018-03-05) === +3.5.1 (2018-03-05) +================== * Fixed a bug where editing pages with primary keys greater than 999 would throw an exception. @@ -92,7 +107,8 @@ tag with a default would raise an exception. -=== 3.5.0 (2018-01-31) === +3.5.0 (2018-01-31) +================== * Fixed a bug which prevented users from seeing the welcome screen when debug is turned off. @@ -111,7 +127,8 @@ * Prevent users from passing a public page as parent in ``create_page`` api function -=== 3.4.5 (2017-10-12) === +3.4.5 (2017-10-12) +================== * Introduced Django 1.11 compatibility * Fixed a bug where slug wouldn't be generated in the creation wizard @@ -129,7 +146,8 @@ This only affects Django >= 1.10 -=== 3.4.4 (2017-06-15) === +3.4.4 (2017-06-15) +================== * Fixed a bug in which cancelling the publishing dialog wasn't respected. * Fixed a bug causing post-login redirection to an incorrect URL on single-language sites. @@ -161,7 +179,8 @@ * Fixed a regression which prevented users from setting a redirect to the homepage. -=== 3.4.3 (2017-04-24) === +3.4.3 (2017-04-24) +================== * Fixed a security vulnerability in the page redirect field which allowed users to insert JavaScript code. @@ -169,7 +188,8 @@ was not sanitised and could point to another domain. -=== 3.4.2 (2017-01-23) === +3.4.2 (2017-01-23) +================== * Escaped strings in ``close_frame`` JS template. * Fixed a bug with `text-transform` styles on inputs affecting CMS login @@ -206,7 +226,8 @@ * Rewrote manual installation how-to documentation -=== 3.4.1 (2016-10-04) === +3.4.1 (2016-10-04) +================== * Fixed a regression when static placeholder was uneditable if it was present on the page multiple times @@ -224,7 +245,8 @@ * Fixed css reset issue with shortcuts modal -=== 3.4.0 (2016-09-14) === +3.4.0 (2016-09-14) +================== * Changed the way CMS plugins are rendered. The div with `cms-plugin` class is no longer rendered around every CMS plugin, instead a combination of `template` @@ -254,7 +276,8 @@ in ``cms.api.create_page`` and ``cms.api.create_title``. -=== 3.3.3 (unreleased) === +3.3.3 (unreleased) +================== * Fixed a bug where where the plugin picker would display the plugin names translated in the request language instead of the user's language. @@ -274,7 +297,8 @@ * Fixed a bug where a ``Page`` was created with it's languages field set to ``None``. -=== 3.3.2 (2016-08-11) === +3.3.2 (2016-08-11) +================== * Fixed a bug where it wasn't possible to scroll the toolbar menu if scroll started on the disabled menu item on small screens. @@ -286,7 +310,8 @@ under certain circumstances -=== 3.3.1 (2016-07-13) === +3.3.1 (2016-07-13) +================== * Added a warning for users who are leaving the page or closing the plugin modal by pressing ESC to prevent accidental loss of content. @@ -330,29 +355,17 @@ * Fixed error in retrieving placeholder label from configuration. -=== 3.3.0 (2016-05-26) === - -* [no changes vs. rc4] - - -=== 3.3.0.rc4 (2016-05-24) === +3.3.0 (2016-05-26) +================== * Fixed regression in management commands * Fixed documentation typo - - -=== 3.3.0.rc3 (2016-05-23) === - * Added contribution policies documentation * Corrected documentation in numerous places * Corrected an issue where someone could see and use the internal placeholder plugin in the structure board * Fixed a regression where the first page created was not automatically published * Corrected the instructions for using the ``delete-orphaned-plugins`` command * Re-pinned django-treebeard to >=4.0.1 - - -=== 3.3.0.rc2 (2016-05-19) === - * Added CMS_WIZARD_CONTENT_PLACEHOLDER setting * Renamed the CMS_WIZARD_* settings to CMS_PAGE_WIZARD_* * Deprecated the old-style wizard-related settings @@ -361,10 +374,6 @@ * Fixed toolbar placement when foundation is installed * Fixed an issue which could lead to an apphook without a slug * Fixed numerous frontend issues - - -=== 3.3.0.rc1 (2016-05-16) === - * Removed support for Django 1.6, 1.7 and python 2.6 * Changed the default value of CMSPlugin.position to 0 instead of null * Refactored the language menu to allow for better integration with many languages @@ -413,14 +422,16 @@ * Fixed a bug where clearing clipboard was closing any open modal -=== 3.2.5 (2016-04-27) === +3.2.5 (2016-04-27) +================== - Fixed regression when page couldn't be copied if CMS_PERMISSION was False - Improved handling of uninstalled apphooks - Fix packaging problem with the wheel distribution -=== 3.2.4 (2016-04-26) === +3.2.4 (2016-04-26) +================== - Fix cache settings - Fix user lookup for view restrictions/page permissions when using raw id field @@ -436,13 +447,15 @@ escalation of privileges or other security issues. -=== 3.2.3 (2016-03-09) === +3.2.3 (2016-03-09) +================== - Fix the display of hyphenated language codes in the page tree - Fix a family of issues relating to unescaped translations in the page tree -=== 3.2.2 (2016-03-02) === +3.2.2 (2016-03-02) +================== - Substantial improvements to the page tree and significant reduction of reloads - Update jsTree version to 3.2.1 with slight adaptions to the Pagetree @@ -457,7 +470,8 @@ - Numerous other improvements to overall stability and code quality -=== 3.2.1 (2016-01-29) === +3.2.1 (2016-01-29) +================== - Add support for Django 1.9 (with some deprecation warnings). - Add support for django-reversion 1.10+ (required by Django 1.9+). @@ -478,7 +492,8 @@ - Honor CMS_RAW_ID_USERS in GlobalPagePermissionAdmin. -=== 3.2.0 (2015-11-24) === +3.2.0 (2015-11-24) +================== - Added new wizard to improve content creation - Added Aldryn Apphook Reload https://github.com/aldryn/aldryn-apphook-reload/ into core @@ -533,17 +548,20 @@ - Fixed an issue where ``allow_children`` and ``disable_child_plugins`` didn't work on dragitems -=== 3.1.8 (unreleased) === +3.1.8 (unreleased) +================== - Removed html5lib from setup.py -=== 3.1.7 (2016-04-27) === +3.1.7 (2016-04-27) +================== - Fix packaging problem with the wheel distribution -=== 3.1.6 (2016-04-26) === +3.1.6 (2016-04-26) +================== - Fix cache settings - Fix user lookup for view restrictions/page permissions when using raw id field @@ -556,7 +574,8 @@ escalation of privileges or other security issues. -=== 3.1.5 (2016-01-29) === +3.1.5 (2016-01-29) +================== - Fixed a tree corruption when pasting a nested plugin under another plugin. - Improve CMSPluginBase.render documentation @@ -571,7 +590,8 @@ - Fix CMS_TOOLBAR_HIDE causes 'WSGIRequest' object has no attribute 'toolbar' -=== 3.1.4 (2015-11-24) === +3.1.4 (2015-11-24) +================== - Fixed a problem in ``0010_migrate_use_structure.py`` that broke some migration paths to Django 1.8 - Fixed ``fix_tree`` command @@ -583,7 +603,8 @@ - Fixed some treebeard corruption issues -=== 3.1.3 (2015-09-01) === +3.1.3 (2015-09-01) +================== - Add missing migration - Exclude PageUser manager from migrations @@ -617,13 +638,15 @@ - Fix extensions copy when using duplicate page/create page type -=== 3.1.2 (2015-07-02) === +3.1.2 (2015-07-02) +================== - Fix placeholder cache invalidation under some circumstances - Update translations -=== 3.1.1 (2015-06-27) === +3.1.1 (2015-06-27) +================== - Add Django 1.8 support - Tutorial updates and improvements @@ -660,7 +683,8 @@ - Fix language chooser template -=== 3.1.0 (2015-04-20) === +3.1.0 (2015-04-20) +================== - Remove django-mptt in favor of django-treebeard - Remove compatibility with Django 1.4 / 1.5 @@ -676,7 +700,8 @@ - Add "Structure mode" permission -=== 3.0.17 (unreleased) === +3.0.17 (unreleased) +================== - Addresses security vulnerabilities in the `render_model` template tag that could lead to escalation of privileges or other security issues. @@ -685,14 +710,16 @@ - Fix cache settings -=== 3.0.16 (2015-11-24) === +3.0.16 (2015-11-24) +================== - Fixed JavaScript error when using ``PageSelectWidget`` - Fixed whitespace markup issues in draft mode - Added plugin migrations layout detection in tests -=== 3.0.15 (2015-09-01) === +3.0.15 (2015-09-01) +================== - Relax html5lib versions - Fix redirect when deleting a page @@ -710,7 +737,8 @@ - Fix extensions copy when using duplicate page/create page type -=== 3.0.14 (2015-06-27) === +3.0.14 (2015-06-27) +================== - Fixed an issue where privileged users could be tricked into performing actions without their knowledge via a CSRF vulnerability - Fixed an issue related to "Empty all" Placeholder feature @@ -732,7 +760,8 @@ - Fix language chooser template -=== 3.0.13 (2015-04-15) === +3.0.13 (2015-04-15) +================== - Numerous documentation including installation and tutorial updates - Numerous improvements to translations @@ -750,12 +779,14 @@ - Prevent accidental upgrades to Django 1.8, which is not yet supported -=== 3.0.12 (2015-03-06) === +3.0.12 (2015-03-06) +================== - Fixed a typo in JavaScript which prevents page tree from working -=== 3.0.11 (2015-03-05) === +3.0.11 (2015-03-05) +================== - Core support for multiple instances of the same apphook'ed application - Fixed the template tag `render_model_add` @@ -772,7 +803,8 @@ - Documentation updates -=== 3.0.10 (2015-02-14) === +3.0.10 (2015-02-14) +================== - Improved Py3 compatibility - Improved the behavior when changing the operator's language @@ -787,14 +819,16 @@ - Fixed issues relating to the logout function -==== 3.0.9 (2015-01-11) === +3.0.9 (2015-01-11) +================== - Revert a change that caused a regression in toolbar login - Fix an error in a translated phrase - Fix error when moving items in the page tree -==== 3.0.8 (2015-01-11) === +3.0.8 (2015-01-11) +================== - Add require_parent option to CMS_PLACEHOLDER_CONF - Fix django-mptt version depenency to be PEP440 compatible @@ -810,7 +844,8 @@ - Minor code cleanups -==== 3.0.7 (2014-11-27) === +3.0.7 (2014-11-27) +================== - Complete Django 1.7 support - Numerous updates to the documentation @@ -827,7 +862,8 @@ - Added branch policy documentaion -==== 3.0.6 (2014-10-07) === +3.0.6 (2014-10-07) +================== - Experimental full Django 1.7 migrations support - Add CMSPlugin.get_render_model to get the plugin model at render time @@ -840,13 +876,15 @@ - Fix plugin table name generation fixes -==== 3.0.5 (2014-08-20) === +3.0.5 (2014-08-20) +================== - Fixes 2 regressions introduced in 3.0.4 - apphook and plugins can now be registered via decorator -==== 3.0.4 (2014-08-16) === +3.0.4 (2014-08-16) +================== - Removed file cms/utils/compat/type_checks.py, use django.utils.six module instead - Removed file cms/utils/compat/string_io.py, use django.utils.six module instead @@ -864,7 +902,8 @@ - some refactoring and simplifications -==== 3.0.3 (2014-07-07) === +3.0.3 (2014-07-07) +================== - Added an alias plugin for referencing plugins and placeholders - Added an api to change the context menus of plugins and placeholders from plugins @@ -880,21 +919,24 @@ - Added a automatic dynamic template directory for page templates -==== 3.0.2 (2014-05-21) === +3.0.2 (2014-05-21) +================== - Add 'as' form to render_placeholder templatetag to save the result in context - Added changeable strings for "?edit", "?edit_off" and "?build" urls - utils.page_resolver was optimized. get_page_from_path() api changed -==== 3.0.1 (2014-04-30) === +3.0.1 (2014-04-30) +================== - Renamed NamespaceAllreadyRegistered to NamespaceAlreadyRegistered in menus/exceptions.py - Frontend editor UI fixes - Fix in cms fix-mptt command -==== 3.0.0 (2014-04-08) === +3.0.0 (2014-04-08) +================== - Plugins are only editable in frontend - PluginEditor has been removed in backend @@ -957,7 +999,8 @@ - Added option to {% static_placeholder %} to render only on the current site. -==== 2.4.2 (2013-05-29)=== +2.4.2 (2013-05-29) +================== - Apphook edit mode bugfix - Added option to render_placeholder tag to set language @@ -971,7 +1014,8 @@ - locales updated -==== 2.4.1 (2013-04-22)=== +2.4.1 (2013-04-22) +================== - USE_I18N=False fixed - some frontend css stuff fixed @@ -979,7 +1023,8 @@ - non public frontend languages fixed -==== 2.4.0 (2013-04-17)=== +2.4.0 (2013-04-17) +================== Please see Install/2.4 release notes *before* attempting to upgrade to version 2.4. @@ -1001,7 +1046,8 @@ Please see Install/2.4 release notes *before* attempting to upgrade to version 2 - Added CMS_RAW_ID_USERS -==== 2.3.4 (2012-11-09) ==== +2.3.4 (2012-11-09) +================== - Fixed WymEditor - Fixed Norwegian translations @@ -1010,12 +1056,14 @@ Please see Install/2.4 release notes *before* attempting to upgrade to version 2 - Fixed placeholder field permission checks -==== 2.3.3 ==== +2.3.3 (2012-09-21) +================== - fixed an incompatibility with Python 2.5 -==== 2.3.2 ==== +2.3.2 (2012-09-19) +================== - MIGRATION: 0036_auto__add_field_cmsplugin_changed_date.py - new field changed_date on CMSPlugin - CMS_FRONTEND_LANGUAGES limits django languages as well during language selection @@ -1036,12 +1084,14 @@ Please see Install/2.4 release notes *before* attempting to upgrade to version 2 - JQuery namespace fixes in admin -==== 2.3.1 ==== +2.3.1 (2012-08-22) +================== - pinned version of django-mptt to 0.5.1 or 0.5.2 -==== 2.3.0 ==== +2.3.0 (2012-06-29) +================== - Compatibility with Django 1.3.1 and 1.4 (1.2 support dropped) - Lazy admin page tree loading @@ -1059,7 +1109,8 @@ Please see Install/2.4 release notes *before* attempting to upgrade to version 2 - django-mptt dependency upgraded to 0.5.1 or higher -==== 2.2.0 (2011-09-10) ==== +2.2.0 (2011-09-10) +================== - Replaced the old plugin media framework with django-sekizai. (This changed some plugin templates which might cause problems with your CSS styling). - Made django-mptt a proper dependency @@ -1068,12 +1119,14 @@ Please see Install/2.4 release notes *before* attempting to upgrade to version 2 - Google Maps Plugin now uses the version 3 of their API, no longer requiring an API Key. -==== 2.1.4 (2011-08-24) ==== +2.1.4 (2011-08-24) +================== - Fixed a XSS issue in Text Plugins -==== 2.1.3 (2011-02-22) ==== +2.1.3 (2011-02-22) +================== - Fixed a serious security issue in PlaceholderAdmin - Fixed bug with submenus showing pages that are not 'in_navigation' (#716, thanks to Iacopo Spalletti for the patch) @@ -1081,19 +1134,22 @@ Please see Install/2.4 release notes *before* attempting to upgrade to version 2 - Fixed the double-monkeypatch check for url reversing (thanks to Benjamin Wohlwend for the patch) -==== 2.1.2 (2011-02-16) ==== +2.1.2 (2011-02-16) +================== - Fixed issues with the CSRF fix from 2.1.1. - Updated translation files from transifex. -==== 2.1.1 (2011-02-09) ==== +2.1.1 (2011-02-09) +================== - Fixed CMS AJAX requests not being CSRF protected, thus not working in Django 1.2.5 - Fixed toolbar CSS issues in Chrome/Firefox -==== 2.1.0 (2011-01-26) ==== +2.1.0 (2011-01-26) +================== - language namespaces for apphooks (reverse("de:myview"), reverse("en:myview")) - video plugin switch to https://github.com/FlashJunior/OSFlashVideoPlayer @@ -1117,12 +1173,15 @@ Please see Install/2.4 release notes *before* attempting to upgrade to version 2 - placeholder has new option: or and a endpalceholder templatetag -==== 2.0.2 (2009-12-14) ==== +2.0.2 (2009-12-14) +================== - testsuite working again - changelog file added -==== 2.0.1 (2009-12-13) ==== + +2.0.1 (2009-12-13) +================== - mostly bugfixes (18 tickets closed) - docs updated diff --git a/CODE_OF_CONDUCT.rst b/CODE_OF_CONDUCT.rst new file mode 100644 index 000000000..e1e42cf10 --- /dev/null +++ b/CODE_OF_CONDUCT.rst @@ -0,0 +1,7 @@ +========================== +django CMS Code of Conduct +========================== + +django CMS is governed by a `Code of Conduct +`_. +All participants in our community and its various forums are expected to abide by it. diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst new file mode 100644 index 000000000..10c605818 --- /dev/null +++ b/CONTRIBUTING.rst @@ -0,0 +1,71 @@ +============ +CONTRIBUTING +============ + +First, thank you very much, that you would like to contribute to django CMS. +We always welcome contributions, like many other open-source projects. We are +very thankful to the many `present, past and future contributors `_. + + +Code of Conduct +=============== + +django CMS is governed by a `Code of Conduct +`_. +All participants in our community and its various forums are expected to abide by it. + + +Issues and pull requests +======================== + +* Please report **any bugs** through `GitHub issues `_. +* For *help with django CMS*, please use our `users' email list `_ + or `StackOverflow `_. +* For *feature requests*, please use our + `developers' email list `_. +* For *security issues* please see further below. + + +Contribution documentation +========================== + +We maintain comprehensive `contribution documentation `_. +Please familiarise yourself with it before submitting any issues or pull requests. + + +Security issues +=============== + +Please have a look at our security policy for +`how to deal with security issues `_. + +If you think you have discovered a security issue in our code, please do not raise it on + +* GitHub +* StackOverflow +* IRC +* Twitter +* either of our email lists + +or in any other public forum until we have had a chance to deal with it. + + +Community +========= + +You can join us online: + +* on `StackOverflow `_. +* in our IRC channel, #django-cms, on ``irc.freenode.net``. If you don't have an IRC client, you can + `join our IRC channel using the KiwiIRC web client + `_, which works pretty well. +* on our `django CMS users email list `_ for + **general** django CMS questions and discussion +* on our `django CMS developers email list + `_ for discussions about the + **development of django CMS** + +You can also follow: + +* the `Travis Continuous Integration build reports `_ +* the `@djangocms `_ Twitter account for general announcements diff --git a/MANIFEST.in b/MANIFEST.in index 8af03700f..bd0c5a616 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,7 +1,8 @@ -include AUTHORS include LICENSE include README.rst -include CHANGELOG.txt +include CHANGELOG.rst +include CODE_OF_CONDUCT.rst +include CONTRIBUTING.rst recursive-include cms/locale * recursive-include cms/templates * recursive-include cms/static * @@ -9,5 +10,5 @@ recursive-include cms/plugins * recursive-include menus/templates * recursive-include stacks/templates * recursive-include docs * -recursive-exclude * *.pyc +recursive-exclude * *.py[co] recursive-exclude * *.scssc diff --git a/README.rst b/README.rst index c99656f28..244c4504e 100644 --- a/README.rst +++ b/README.rst @@ -119,6 +119,6 @@ Credits * Python tree engine powered by `django-treebeard `_. * JavaScript tree in admin uses `jsTree `_. -* Many thanks to the - `over 515 contributors `_ - to the django CMS! +* Many thanks to + `all the contributors `_ + to django CMS! diff --git a/RELEASE_INFO b/RELEASE_INFO deleted file mode 100644 index 740b3590a..000000000 --- a/RELEASE_INFO +++ /dev/null @@ -1,32 +0,0 @@ -- Put beer in fridge for cooling (see last step) -- Create a release branch (locally) -- Bump the version in cms/__init__.py -- Build newest english translation (django-admin.py makemessages -l en) -- Build newest english JS translations (django-admin.py makemessages -l en -d djangojs) -- Pull translations (tx pull -f -a) -- Compile translations (django-admin.py compilemessages) -- Make sure icons are recreated in the new place (gulp icons) -- Make sure CSS files are compiled from latest sass source (gulp sass) -- Make sure JS files are bundled and minified propery from latest source (gulp bundle) -- Make sure to remove JS, CSS and font files from the older version of CMS -- Check CHANGELOG that all closed PRs are present. -- Prepare blog post, including "Release" tag -- update AUTHORS file (python develop.py authors) -- Make a release commit -- Tag release commit -- Merge back into develop -- Push develop to GitHub -- Merge into master -- Push master to GitHub (WITH --tags) -- Release to PyPI (ONLY FOR FINAL VERSIONS!) (python setup.py sdist upload) -- Release wheel (python setup.py bdist_wheel upload) -- Bump version in develop branch to .dev1 -- Publish blog post -- Tweet blog post -- Post notice on django-users, django-cms and django-cms-developers mailing lists -- Update IRC channel topic (/topic this is the new topic) -- Add current version to RTD versions. -- Set new version as default version on RTD -- Make sure tutorials on the website still work -- Make sure download button on homepage (website) is updated -- Have a beer! (If anyone else is around, do a release party!) diff --git a/docs/contributing/development-community.rst b/docs/contributing/development-community.rst index aaecd19d9..b8b244751 100644 --- a/docs/contributing/development-community.rst +++ b/docs/contributing/development-community.rst @@ -10,10 +10,12 @@ You can join us online: `join our IRC channel using the KiwiIRC web client `_, which works pretty well. * on our `django CMS users email list `_ for - **general** django CMS questions and discussion + **general discussion** of django CMS * on our `django CMS developers email list `_ for discussions about the **development of django CMS** +* on our `StackOverflow `_ for + general **questions** around django CMS and it's plugin ecosystem You can also follow: @@ -98,14 +100,12 @@ Current core developers * Angelo Dini https://github.com/finalangel * Daniele Procida https://github.com/evildmp -* Iacopo Spalletti https://github.com/yakky -* Paulo Alvarado https://github.com/czpython -* Stefan Foulis https://github.com/stefanfoulis -* Vadim Sikora https://github.com/vxsx * Dennis Schwertel https://github.com/kinkerl -* Serhii Sydorenko https://github.com/SydorenkoSergiy -* Krzysztof Socha https://github.com/chaosk +* Iacopo Spalletti https://github.com/yakky * Malinda Perera https://github.com/malindap92 +* Paulo Alvarado https://github.com/czpython +* Serhii Sydorenko https://github.com/SydorenkoSergiy +* Vadim Sikora https://github.com/vxsx Core designers @@ -120,12 +120,14 @@ design: Retired core developers ======================= -* Chris Glass https://github.com/chrisglass -* Øyvind Saltvik https://github.com/fivethreeo * Benjamin Wohlwend https://github.com/piquadrat -* Martin Koistinen https://github.com/mkoistinen -* Patrick Lauber https://github.com/digi604 +* Chris Glass https://github.com/chrisglass * Jonas Obrist https://github.com/ojii +* Krzysztof Socha https://github.com/chaosk +* Martin Koistinen https://github.com/mkoistinen +* Øyvind Saltvik https://github.com/fivethreeo +* Patrick Lauber https://github.com/digi604 +* Stefan Foulis https://github.com/stefanfoulis Following a year or so of inactivity, a core developer will be moved to the "Retired" list, with the understanding that they can rejoin the project in the @@ -157,7 +159,7 @@ Technical board Historically, django CMS's development has been led by members of staff from Divio. It has been (and will continue to be) a requirement of the CMS that it -meet Divio's needs. +meets the highest standards. However, as the software has matured and its user-base has dramatically expanded, it has become increasingly important also to reflect a wider range of @@ -183,7 +185,7 @@ developers who have retired, or for other reasons. Composition of the board ======================== -The the technical board will include key developers from Divio and others in the +The the technical board will include key developers from companies and others in the django CMS development community - developers who work *with* django CMS, as well as developers *of* django CMS - in order to help ensure that all perspectives are represented in important decisions about the software and the @@ -199,9 +201,6 @@ The current members of the technical board are: * Christian Bertschy * Daniele Procida (Chair) * Iacopo Spalletti -* Jonas Obrist -* Martin Koistinen -* Matteo Larghi The board will co-opt new members as appropriate. diff --git a/docs/contributing/development-policies.rst b/docs/contributing/development-policies.rst index d3b02b331..848276c74 100644 --- a/docs/contributing/development-policies.rst +++ b/docs/contributing/development-policies.rst @@ -13,14 +13,9 @@ Reporting security issues .. ATTENTION:: If you think you have discovered a security issue in our code, please report - it **privately**, by emailing us at `security@django-cms.org`_. - - Please **do not** raise it on: - - * IRC - * GitHub - * either of our email lists + it **privately**, by emailing us at `security@divio.com `_. + Please **do not** raise it on IRC, GitHub, either of our email lists, StackOverflow or in any other public forum until we have had a chance to deal with it. @@ -28,11 +23,12 @@ Reporting security issues Review ****** -All patches should be made as pull requests to `the GitHub repository `_. Patches -should never be pushed directly. +All patches should be made as pull requests **against develop** to +`the GitHub repository `_. Patches should +never be pushed directly. -**Nothing** may enter the code-base, *including the documentation*, without proper review and formal approval from the -core team. +**Nothing** may enter the code-base, *including the documentation*, without +proper review and formal approval from the core team. Reviews are welcomed by all members of the community. You don't need to be a core developer, or even an experienced programmer, to contribute usefully to code review. Even noting that you don't understand something in a pull request @@ -42,11 +38,9 @@ is valuable feedback and will be taken seriously. Formal approval =============== -Formal approval means "OK to merge" comments, following review, from at least two different members of the core team -who have expertise in the relevant areas, and excluding the author of the pull request. - -The exceptions to this are frontend code and documentation, where one "OK to merge" comment will suffice, at least -until the team has more expert developers in those areas. +Formal approval means "OK to merge" comments, following review, from at least +one member of the core team who has expertise in the relevant areas, and excluding +the author of the pull request. ********************************************** @@ -65,6 +59,10 @@ understand the decisions taken by the project. Release schedule **************** +.. versionchanged:: 3.7 + + django CMS 3.7 is the new active long term release. + The `roadmap `_ can be found on our website. We are planning releases according to **key principles and aims**. Issues within milestones are @@ -73,8 +71,10 @@ therefore subject to change. The `django CMS developers email list `_ serves as gathering point for developers. We submit ideas and proposals prior to the roadmap goals. -django CMS 3.4 was the first "LTS" ("Long-Term Support") release of the application. *Long-term support* means that -this version will continue to receive security and other critical updates for 24 months after its first release. +django CMS 3.4, surpassed by 3.7, was the first "LTS" ("Long-Term Support") +release of the application. *Long-term support* means that this version will +continue to receive security and other critical updates for 24 months after its +first release. Any updates it does receive will be backward-compatible and will not alter functional behaviour. This means that users can deploy this version confident that keeping it up-to-date requires only easily-applied security and other critical @@ -92,25 +92,32 @@ Branches Previously, we maintained a ``master`` branch (now deleted), and a set of ``support`` branches (now pruned, and renamed ``release``). -We maintain a number of branches on `our GitHub repository `_. +.. versionchanged:: 3.7 + + Simplified the description of the release branches and added additional + information for ``releases`` and ``release/4.0.x``. In general open PRs + against ``develop``. + +We maintain a number of branches on +`our GitHub repository `_: ``develop`` - The default target branch for on-going development. + The default target branch for on-going development and new pull requests. -the latest (highest-numbered) ``release/x.y.z`` - This is the branch that will become the next release on PyPI. Commits will be cherrypicked from ``develop`` - and merged into ``release/x.y.z`` during the next iterative release. +``release/x.y.z`` are the latest released versions of django CMS. Commits + are cherry-picked from ``develop`` and merged into ``release/x.y.z`` + when suitable. We **officially support** the latest, highest released version + and the latest LTS (currently 3.7). -Older ``release/x.y.z`` branches - These represent the final point of development (the highest ``y`` of older versions). Releases in the full set of - older versions have been tagged (use Git Tags to retrieve them). +``release/4.0.x`` is an experimental branch and should not be considered + as the highest released version. - These branches will only rarely be patched, with security fixes representing the main reason for a patch. +``releases`` hosts the `releases.json` file to indicate the availability of new + django CMS versions when using `djangocms-admin-style `_. -Commits in ``release/x.y.z`` will be merged forward into ``develop`` periodically by the core developers. - -If in doubt about which branch to work from, ask on the #django-cms IRC channel on `freenode`_ or the -`django-cms-developers`_ email list! +Please always open PR's against develop and indicate that they should be +backported to the latest LTS release when necessary. Older branches are not +supported any longer. .. _commit_policy: @@ -192,7 +199,7 @@ Changelog .. versionadded:: 3.3 **Every new feature, bugfix or other change of substance** must be represented in the `CHANGELOG -`_. This includes documentation, but **doesn't** extend +`_. This includes documentation, but **doesn't** extend to things like reformatting code, tidying-up, correcting typos and so on. Each line in the changelog should begin with a verb in the past tense, for example:: diff --git a/docs/contributing/management.rst b/docs/contributing/management.rst index a93a7c693..d6895b457 100644 --- a/docs/contributing/management.rst +++ b/docs/contributing/management.rst @@ -20,16 +20,12 @@ Raising an issue .. ATTENTION:: If you think you have discovered a security issue in our code, please report - it **privately**, by emailing us at `security@django-cms.org`_. - - Please **do not** raise it on: - - * IRC - * GitHub - * either of our email lists + it **privately**, by emailing us at `security@divio.com `_. + Please **do not** raise it on IRC, GitHub, either of our email lists, StackOverflow or in any other public forum until we have had a chance to deal with it. + Except in the case of security matters, of course, you're welcome to raise issues in any way that suits you - :ref:`on one of our email lists, or the IRC channel ` or in person if you happen to meet another django CMS developer. diff --git a/docs/how_to/install.rst b/docs/how_to/install.rst index 2c4264aed..1e25261f2 100644 --- a/docs/how_to/install.rst +++ b/docs/how_to/install.rst @@ -99,8 +99,10 @@ You will need to add the following to its list of ``INSTALLED_APPS``:: * `django-treebeard `_ is used to manage django CMS's page and plugin tree structures. -django CMS installs `django CMS admin style `_. This provides some styling that helps make django CMS administration components easier to work with. Technically it's an optional -component and does not need to be enabled in your project, but it's strongly recommended. +django CMS installs `django CMS admin style `_. +This provides some styling that helps make django CMS administration components easier to work with. +Technically it's an optional component and does not need to be enabled in your project, +but it's strongly recommended. In the ``INSTALLED_APPS``, **before** ``django.contrib.admin``, add:: @@ -174,7 +176,8 @@ Create an admin superuser:: Using ``cms check`` for configuration ************************************* -Once you have completed the minimum required set-up described above, you can use django CMS's built-in ``cms check`` command to help you identify and install other components. Run:: +Once you have completed the minimum required set-up described above, you can use django CMS's built-in ``cms check`` +command to help you identify and install other components. Run:: python manage.py cms check @@ -256,7 +259,8 @@ URLs ==== In the project's ``urls.py``, add ``url(r'^', include('cms.urls'))`` to the ``urlpatterns`` list. It should come after -other patterns, so that specific URLs for other applications can be detected first. Note: when using Django 2.0 or later the syntax is ``re_path(r'^', include('cms.urls'))`` +other patterns, so that specific URLs for other applications can be detected first. Note: when using Django 2.0 or +later the syntax is ``re_path(r'^', include('cms.urls'))`` You'll also need to have an import for ``django.conf.urls.include``. For example: @@ -475,7 +479,8 @@ rely on a set of well-maintained plugins that cover some general content managem To install:: - pip install djangocms-link djangocms-file djangocms-picture djangocms-video djangocms-googlemap djangocms-snippet djangocms-style djangocms-column + pip install djangocms-link djangocms-file djangocms-picture djangocms-video djangocms-googlemap djangocms-snippet + djangocms-style djangocms-column and add:: diff --git a/docs/index.rst b/docs/index.rst index b5278479b..7daac7f83 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -93,13 +93,15 @@ Our IRC channel, #django-cms, is on ``irc.freenode.net``. If you don't have an I .. rst-class:: column column3 -Our `django CMS users email list `_ is for **general** django CMS questions and discussion +Our `django CMS users email list `_ is for +**general discussions** and the `django CMS developers email list +`_ for the +**development of django CMS**. .. rst-class:: column column3 -Our `django CMS developers email list -`_ is for discussions about the -**development of django CMS** +Our `StackOverflow `_ is for +**questions** around django CMS and it's plugin ecosystem. *************** diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 94c63c367..b8630cc61 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,5 +1,5 @@ { - "name": "djangoCMS", + "name": "django-cms", "dependencies": { "abbrev": { "version": "1.1.0", diff --git a/package.json b/package.json index 96b78cf1e..bbb1333a9 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "djangoCMS", + "name": "django-cms", "private": true, "devDependencies": { "autoprefixer": "^6.3.6",