Permalink
Browse files

Merged divio/master

  • Loading branch information...
2 parents b36a7c8 + 3fff03a commit 4ce53398d9ef374af29c4e2e5d2f3d80332d551d @CharString CharString committed May 10, 2011
Showing 471 changed files with 27,961 additions and 23,388 deletions.
View
@@ -6,11 +6,14 @@ cms/django
*.DS_Store
*.svn
.*
+*.xml
+cms.sqlite
cms/media/cms_page_media/
cms/docs/build
example/run
example/local_settings.py
reversion/
+htmlcov
build
dist
.ropeproject
@@ -24,3 +27,10 @@ eggs
parts
bin
/dist
+*.rst~
+/docs/*.html
+distribute-*.tar.gz
+include/
+lib/
+man/
+share/
View
168 AUTHORS
@@ -1,17 +1,161 @@
-Django CMS
-==========
+Current or previous core committers:
+
+* Chris Glass
+* Eric Robitaille
+* Jonas Obrist
* Patrick Lauber
-* Jason Zylks
-* Simon Meers
-* Peter Cicman
-* limpbrains :P
+* Peter Ciciman
+* Stefan Foulis
+* Øyvind Saltvik
-Django Page CMS
-===============
-* Batiste Bieler
-* Jannis Leidel
+Contributors (in alphabetical order):
+
+* A. Bram Neijt
+* aaloy
+* Aaron Renner
+* aball
+* Adi Sieker
+* Alberto Paro
+* Alessandro Ronchi
+* Angelo Dini
+* angular_circle
* Antoni Aloy López
+* Arne Gellhaus
+* Artem Skoretskiy
+* Arthur Debert
+* Batiste Bieler
+* behrooz
+* Behrooz Nobakht
* Benjamin Wohlwend
-* poweredbypenguins
+* Bernd Zeimetz
+* beshrkayali
+* Bob Karreman
+* brightwhitefox
+* Chanita Siridechkun
+* Charpentier Johan
+* Cheng-Chia Tseng
+* Chris Adams
+* Chris Hughes
+* Christof Hagedorn
+* daniele
+* DaNmarner
+* Darryl Woods
+* David Jean Louis
+* David Thompson
+* Diógenes Augusto Fernandes Hermínio
+* dstufft
+* DZ
+* eged
+* Egor V. Nazarkin
+* Ekrem Seren
+* Evandro Miquelito
+* f4nt
+* fcurella
+* Filip Kazimierczak
+* GaretJax
+* George Marshall
+* Gerard Świderski
* homebrew79
-
+* hysia
+* Iacopo Spalletti
+* Ian Lewis
+* indexofire
+* Ionel Maries Cristian
+* Ivan Vershigora
+* izi
+* Jameel Al-Aziz
+* James Richards
+* Jannis Leidel
+* Janusz Harkot
+* Jason Davies
+* Jason Jenkins
+* Jason Zylks
+* Javi Nievas
+* Johannes Bornhold
+* John-Scott Atlakson
+* Jonathan Stoppani
+* jordanjambazov
+* kar1m
+* kochin
+* Krzysztof Bandurski
+* kunitoki
+* Lars Smit
+* Lars van de Kerkhof
+* limpbrains :P
+* Lucas Vogelsang
+* Lucio Asnaghi
+* Luke Plant
+* m000
+* Maik Lustenberger
+* Manolis Stamatogiannakis
+* Manuel Schmidt
+* Marco Rimoldi
+* Mark Rogers
+* Martin Bommeli
+* Martin Kosír
+* martinkosir
+* mathijs
+* Maxim Bodyansky
+* Maxime Haineault
+* mbouchar
+* mcosta
+* meers
+* MerLex
+* Mokys
+* mrlundis
+* MW
+* neoprolog
+* Orne Brocaar
+* padelt
+* Patrick Toal
+* Paul van der Linden
+* pbgc
+* Pedro Gracia
+* Pete Loggie
+* Peter-Paul van Gemerden
+* Petteri
+* Philipp Bosch
+* philomat
+* phuihock
+* Pigletto
+* pigletto
+* Piotr Kilczuk
+* poweredbypenguins
+* Remco Wendt
+* Restless Being
+* Robert Pogorzelski
+* Rodolfo Carvalho
+* rtpm
+* Samuel Lüscher
+* sealibora
+* Sean Bleier
+* Seyhun Akyurek
+* Shatalov Vadim
+* shed
+* Shinya Okano
+* Simon Hedberg
+* Simon Meers
+* sleytr
+* spookylukey
+* ssteinerX
+* Stavros Korokithakis
+* Steve R. Jones
+* Steve Steiner
+* Tanel Külaots
+* Thomas Parslow
+* timesong
+* Tino de Bruijn
+* tiret
+* Ulrich Petri
+* wangJunjie
+* Wayne Moore
+* wid
+* wildermesser
+* Yann Malet
+* Yann Malet
+* yedpodtrzitko
+* yohanboniface
+* Yosuke Ikeda
+* Yuri van der Meer
+* zundoya
+* Антон Евжаков
View
@@ -12,7 +12,7 @@
- testsuite working again
- changelog file added
-==== 2.1.0 (2010-XX-XX) ====
+==== 2.1.0 (2011-01-26) ====
- language namespaces for apphooks (reverse("de:myview"), reverse("en:myview"))
- video plugin switch to http://github.com/FlashJunior/OSFlashVideoPlayer
@@ -33,5 +33,21 @@
- a lot of bugfixes
- the cms now depends on the cms.middleware.media.PlaceholderMediaMiddleware middleware
- templatetags refactored: see cms/docs/templatetags.txt for new signatures.
-- placeholder has new option: or and a endbpalceholder templatetag
+- placeholder has new option: or and a endpalceholder templatetag
+==== 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.2 (2011-02-16) ====
+
+- Fixed issues with the CSRF fix from 2.1.1.
+- Updated translation files from transifex.
+
+==== 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)
+- Fixed PlaceholderField not respecting limits in CMS_PLACEHOLDER_CONF (thanks to Ben Hockey for reporting this)
+- Fixed the double-monkeypatch check for url reversing (thanks to Benjamin Wohlwend for the patch)
View
@@ -1,11 +1,11 @@
include AUTHORS
include LICENSE
-include README.md
+include README.rst
include CHANGELOG.txt
recursive-include cms/locale *
recursive-include cms/templates *
recursive-include cms/media *
-recursive-include cms/docs *.txt *.png
recursive-include cms/plugins *
recursive-include menus/templates *
recursive-include mptt/tests/fixtures *.json
+recursive-include docs *
View
@@ -1,66 +0,0 @@
-Django CMS 2.0
-==============
-
-A Django app for managing hierarchical pages of content in multiple languages, on different sites.
-
-Django CMS handles the navigation rendering for you in multiple languages with internationalization (i18n) slugs,
-and the navigation can be extended by your own models.
-
-Pages are rendered with a template that has placeholders which get filled via plugins.
-Plugins included at the moment include the following:
-
-* File
-* Flash
-* Google Map
-* Link
-* Picture
-* HTML Snippet
-* Teaser
-* Text
-* Video
-* Twitter
-
-
-Many more are in the works. Plugins are very easy to write and integrate with your own models.
-For a list of 3rd party plugins have a look [here](http://www.django-cms.org/en/extensions/).
-
-Tour & Screenshots
-------------------
-
-Can be found [here](http://www.django-cms.org/en/tour/).
-Some Sites done with django-cms can be found [here](http://www.django-cms.org/en/sites/)
-
-
-
-Documentation
--------------
-
-Can be found [here](http://www.django-cms.org/en/documentation/).
-
-Installation instructions can be found [here](http://www.django-cms.org/en/documentation/2.0/installation/).
-
-
-Sourcecode
-----------
-
-Can be found [here](http://github.com/digi604/django-cms-2.0/) on github.
-
-Help
-----
-
-There is a [google group mailinglist](http://groups.google.com/group/django-cms)
-You can also visit the project website at [django-cms.org](http://www.django-cms.org/)
-or #django-cms on freenet IRC for more info.
-
-For a feature comparison of all the CMS apps available for django see
-[CMSComparison](http://code.djangoproject.com/wiki/CMSAppsComparison).
-
-Kudos
------
-
-- This is a fork of django-page-cms.
-- Some icons are from [http://www.famfamfam.com](http://www.famfamfam.com/)
-- Video plugin uses [OSFlashVideoPlayer](http://github.com/FlashJunior/OSFlashVideoPlayer)
-- Includes [Wymeditor](http://www.wymeditor.org/)
-- Tree Component from [jstree.com](http://www.jstree.com/)
-
View
@@ -0,0 +1,61 @@
+##########
+django CMS
+##########
+
+A Django application for managing hierarchical pages of content, possibly in
+multiple languages and/or on multiple sites.
+
+Django CMS handles the navigation rendering for you with clean, slug based URLs,
+and this navigation can be extended by custom Django applications
+
+You can define editable areas, called placeholders, in your templates which you
+can fill with CMS plugins, by default we ship the following plugins:
+
+* File
+* Flash
+* Google Map
+* Link
+* Picture
+* HTML Snippet
+* Teaser
+* Text
+* Video
+* Twitter
+
+However this is not the end of the list, there are many
+`3rd party plugins <http://www.djangopackages.com/grids/g/django-cms/>`_
+already available for you to use. Should you be unable to find a suitable plugin
+for you needs, writing your own is very simple.
+
+More information on `our website <http://www.django-cms.org>`_.
+
+*************
+Documentation
+*************
+
+Please head over to our `documentation <http://docs.django-cms.org/>`_ for all
+the details on how to install, extend and use the django CMS.
+
+************
+Getting Help
+************
+
+Please head over to our IRC channel, #django-cms, on irc.freenode.net or write
+to our `mailing list <https://groups.google.com/forum/#!forum/django-cms>`_.
+
+*******
+Credits
+*******
+
+* This is a fork of the
+ `django-page-cms <https://github.com/batiste/django-page-cms>`_.
+* Includes icons from `FamFamFam <http://www.famfamfam.com>`_.
+* Video plugin uses the
+ `OSFlashVideoPlayer <https://github.com/FlashJunior/OSFlashVideoPlayer/>`_.
+* Includes the `Wymeditor <http://www.wymeditor.org/>`_.
+* Python tree engine powered by
+ `django-mptt <https://github.com/django-mptt/django-mptt>`_.
+* Javascript tree in admin uses `jsTree <http://www.jstree.com>`_.
+* Many thanks to the
+ `over 150 contributors <https://github.com/divio/django-cms/blob/master/AUTHORS>`_
+ to the django CMS!
View
@@ -1,7 +1,8 @@
-VERSION = (2, 1, 0, 'beta3')
-if VERSION[-1] != "final":
+# -*- coding: utf-8 -*-
+VERSION = (2, 1, 3, 'final')
+if VERSION[-1] != "final": # pragma: no cover
__version__ = '.'.join(map(str, VERSION))
-else:
+else: # pragma: no cover
__version__ = '.'.join(map(str, VERSION[:-1]))
@@ -11,7 +12,7 @@
if 'cms' in settings.INSTALLED_APPS:
from conf import patch_settings
patch_settings()
-except ImportError:
+except ImportError: # pragma: no cover
"""
This exception means that either the application is being built, or is
otherwise installed improperly. Both make running patch_settings
Oops, something went wrong.

0 comments on commit 4ce5339

Please sign in to comment.