Merge branch '2.4'

Author: digi604

.travis.yml

@@ -1,15 +1,14 @@
 language: python
 python:
-    - "2.5"
     - "2.6"
     - "2.7"
 env:
-    - DJANGO=test_requirements/django-1.3.txt DB='sqlite://localhost/:memory:'
-    - DJANGO=test_requirements/django-1.3.txt DB='mysql://[email protected]/djangocms_test'
-    - DJANGO=test_requirements/django-1.3.txt DB='postgres://[email protected]/djangocms_test'
     - DJANGO=test_requirements/django-1.4.txt DB='sqlite://localhost/:memory:'
     - DJANGO=test_requirements/django-1.4.txt DB='mysql://[email protected]/djangocms_test'
     - DJANGO=test_requirements/django-1.4.txt DB='postgres://[email protected]/djangocms_test'
+    - DJANGO=test_requirements/django-1.5.txt DB='sqlite://localhost/:memory:'
+    - DJANGO=test_requirements/django-1.5.txt DB='mysql://[email protected]/djangocms_test'
+    - DJANGO=test_requirements/django-1.5.txt DB='postgres://[email protected]/djangocms_test'
 
 before_script:
   - sh -c "if [ '$DB' = 'postgres://[email protected]/djangocms_test' ]; then psql -c 'DROP DATABASE IF EXISTS djangocms_test;' -U postgres; fi"

AUTHORS

@@ -25,6 +25,7 @@ Contributors (in alphabetical order):
 * Adrián Ribao
 * Alberto Paro
 * Alessandro Ronchi
+* Ales Zabala Alava (Shagi)
 * Aleš Kocjančič
 * Alex Cucu
 * Alexandre Leray
@@ -100,6 +101,7 @@ Contributors (in alphabetical order):
 * Iván Raskovsky
 * Ivan Vershigora
 * izi
+* J. Cliff Dyer
 * Jacob Rief
 * Jameel Al-Aziz
 * James Richards
@@ -126,6 +128,7 @@ Contributors (in alphabetical order):
 * Lars Smit
 * Lars van de Kerkhof
 * limpbrains :P
+* littlepea
 * Lucas Vogelsang
 * Lucio Asnaghi
 * Luke Crooks
@@ -134,6 +137,7 @@ Contributors (in alphabetical order):
 * Maik Lustenberger
 * Manolis Stamatogiannakis
 * Manuel Schmidt
+* Marc-Olivier Titeux
 * Marco Bonetti
 * Marco Rimoldi
 * Mark Rogers
@@ -150,9 +154,10 @@ Contributors (in alphabetical order):
 * Mel Collins
 * meers
 * MerLex
-* Mokys
+* Michael P. Jung
 * Mike Johnson
 * Mitar
+* Mokys
 * mrlundis
 * MW
 * neoprolog
@@ -163,6 +168,8 @@ Contributors (in alphabetical order):
 * Pascal Mouret
 * Patrick Toal
 * Paul van der Linden
+* Paulo
+* Paulo Alvarado
 * Pavel Puchkin
 * pbgc
 * Pedro Gracia
@@ -197,6 +204,7 @@ Contributors (in alphabetical order):
 * Shatalov Vadim
 * shed
 * Shinya Okano
+* shulcsm
 * Simon Hedberg
 * Simon Meers
 * Simon Charette
@@ -214,6 +222,7 @@ Contributors (in alphabetical order):
 * Tim Davies
 * Tino de Bruijn
 * tiret
+* Tom de Simone
 * Ulrich Petri
 * Vasil Vangelovski
 * Viliam Segeda

CHANGELOG.txt

@@ -122,6 +122,10 @@
 
 Please see Install/2.4 release notes *before* attempting to upgrade to version 2.4.
 
+- Compatibility with Django 1.4 and 1.5 (1.3 support dropped)
+- Support for Python 2.5 dropped
+- CMS_MAX_PAGE_PUBLISH_REVERSIONS has been added
+- Reversion integration has changed to limit DB size
 - CMS_LANGUAGE setting has changed
 - CMS_HIDE_UNTRANSLATED setting removed
 - CMS_LANGUAGE_FALLBACK setting removed
@@ -130,6 +134,5 @@ Please see Install/2.4 release notes *before* attempting to upgrade to version 2
 - CMS_FRONTEND_LANGUAGES setting removed
 - MultilingualMiddleware has been removed
 - CMS_FLAT_URLS has been removed
+- PlaceholderAdmin has now language tabs and has support for django-hvad
 
-==== NEXT ====
-- Fixed #1543: Nasty empty line in cms/plugins/link.html

cms/__init__.py

@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
-__version__ = '2.4.0.beta'
+__version__ = '2.4.0.RC1'
 

cms/admin/forms.py

@@ -3,7 +3,7 @@
 from cms.apphook_pool import apphook_pool
 from cms.forms.widgets import UserSelectAdminWidget
 from cms.models import (Page, PagePermission, PageUser, ACCESS_PAGE, 
-    PageUserGroup)
+    PageUserGroup, titlemodels)
 from cms.utils.conf import get_cms_setting
 from cms.utils.i18n import get_language_tuple, get_language_list
 from cms.utils.mail import mail_page_user_change
@@ -116,8 +116,11 @@ def clean(self):
             #Check for titles attached to the page makes sense only because
             #AdminFormsTests.test_clean_overwrite_url validates the form with when no page instance available
             #Looks like just a theoretical corner case
-            title = page.get_title_obj(lang)
-            if title and slug:
+            try:
+                title = page.get_title_obj(lang, fallback=False)
+            except titlemodels.Title.DoesNotExist:
+                title = None
+            if title and not isinstance(title, titlemodels.EmptyTitle) and slug:
                 oldslug = title.slug
                 title.slug = slug
                 title.save()