Skip to content

Commit

Permalink
Merge complete
Browse files Browse the repository at this point in the history
  • Loading branch information
tanderegg committed Jan 30, 2014
2 parents 16840f7 + 591fe9f commit 4179b3b
Show file tree
Hide file tree
Showing 549 changed files with 75,508 additions and 24,415 deletions.
21 changes: 21 additions & 0 deletions .coverage.rc
@@ -0,0 +1,21 @@
[run]
source =
cms
menus
branch = True
omit =
cms/migrations/*
cms/plugins/*/migrations/*
cms/stacks/migrations/*
cms/tests/*
cms/test_utils/*
menus/migrations/*
docs

[report]
exclude_lines =
pragma: no cover
def __repr__
raise AssertionError
raise NotImplementedError
if __name__ == .__main__.:
2 changes: 2 additions & 0 deletions .coveralls.yml
@@ -0,0 +1,2 @@
repo_token: ZcjJm7xDsaD7FCFvDHEOBE5IdHKWqvf5y
service_name: travis-ci
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -39,3 +39,4 @@ lib/
man/
share/
.editorconfig
cms/static/cms/compass_app_log.txt
123 changes: 85 additions & 38 deletions .travis.yml
@@ -1,47 +1,94 @@
language: python
python:
- 2.6
- 2.7
- 3.3
- 2.6
- 2.7
- 3.3
env:
- DJANGO=1.4 DB='sqlite://localhost/:memory:'
- DJANGO=1.4 DB='mysql://root@127.0.0.1/djangocms_test'
- DJANGO=1.4 DB='postgres://postgres@127.0.0.1/djangocms_test'
- DJANGO=1.5 DB='sqlite://localhost/:memory:'
- DJANGO=1.5 DB='mysql://root@127.0.0.1/djangocms_test'
- DJANGO=1.5 DB='postgres://postgres@127.0.0.1/djangocms_test'

global:
- SAUCE_USERNAME=digi604
- secure: NWiSBCHFB6LbTMget2qLIdqZlx0zeu3j+Y7Lsqb8kuYXyT2IUBGFVedcGWuGv/9Mzypb80EQWtVTokA3/3QIbesqr29uG95pMPHiYWLdnTO6UHcLMcNXiSzhBGdRDZ40iHSVv2dDHs4GNwGOH5+UCA0z3j7SWmChuFbNXh+Vsqw=
matrix:
- DJANGO=1.4 DATABASE_URL='sqlite://localhost/:memory:' SELENIUM=0
- DJANGO=1.4 DATABASE_URL='mysql://root@127.0.0.1/djangocms_test' SELENIUM=1
- DJANGO=1.4 DATABASE_URL='mysql://root@127.0.0.1/djangocms_test' SELENIUM=0
- DJANGO=1.4 DATABASE_URL='postgres://postgres@127.0.0.1/djangocms_test' SELENIUM=0
- DJANGO=1.5 DATABASE_URL='sqlite://localhost/:memory:' SELENIUM=0
- DJANGO=1.5 DATABASE_URL='mysql://root@127.0.0.1/djangocms_test' SELENIUM=0
- DJANGO=1.5 DATABASE_URL='postgres://postgres@127.0.0.1/djangocms_test' SELENIUM=0
- DJANGO=1.6 DATABASE_URL='sqlite://localhost/:memory:' SELENIUM=0
- DJANGO=1.6 DATABASE_URL='mysql://root@127.0.0.1/djangocms_test' SELENIUM=0
- DJANGO=1.6 DATABASE_URL='postgres://postgres@127.0.0.1/djangocms_test' SELENIUM=0
- DJANGO=trunk DATABASE_URL='sqlite://localhost/:memory:' SELENIUM=0
- DJANGO=trunk DATABASE_URL='mysql://root@127.0.0.1/djangocms_test' SELENIUM=0
- DJANGO=trunk DATABASE_URL='postgres://postgres@127.0.0.1/djangocms_test' SELENIUM=0
before_script:
- sh -c "if [ '$DB' = 'postgres://postgres@127.0.0.1/djangocms_test' ]; then psql -c 'DROP DATABASE IF EXISTS djangocms_test;' -U postgres; fi"
- sh -c "if [ '$DB' = 'postgres://postgres@127.0.0.1/djangocms_test' ]; then psql -c 'create database djangocms_test;' -U postgres; fi"
- sh -c "if [ '$DB' = 'mysql://root@127.0.0.1/djangocms_test' ]; then mysql -e 'create database IF NOT EXISTS djangocms_test CHARACTER SET utf8 COLLATE utf8_general_ci;'; fi"

- sh -c "if [ '$DATABASE_URL' = 'postgres://postgres@127.0.0.1/djangocms_test' ];
then psql -c 'DROP DATABASE IF EXISTS djangocms_test;' -U postgres; fi"
- sh -c "if [ '$DATABASE_URL' = 'postgres://postgres@127.0.0.1/djangocms_test' ];
then psql -c 'create database djangocms_test;' -U postgres; fi"
- sh -c "if [ '$DATABASE_URL' = 'mysql://root@127.0.0.1/djangocms_test' ]; then mysql
-e 'create database IF NOT EXISTS djangocms_test CHARACTER SET utf8 COLLATE utf8_general_ci;';
fi"
install:
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
- pip install -q -r "test_requirements/django-$DJANGO.txt" --use-mirrors
- if [ $DB == 'mysql://root@127.0.0.1/djangocms_test' ]; then pip install -q mysql-python --use-mirrors; fi
script:
python runtests.py --db $DB
- pip install -q -r "test_requirements/django-$DJANGO.txt"
- if [ $DATABASE_URL == 'postgres://postgres@127.0.0.1/djangocms_test' ]; then pip
install -q psycopg2 ; fi
- if [ $DATABASE_URL == 'mysql://root@127.0.0.1/djangocms_test' ]; then pip install
-q mysql-python ; fi
script: coverage run --rcfile=.coverage.rc develop.py test --migrate
after_success: coveralls --config_file=.coverage.rc --coveralls_yaml=.coveralls.yml
notifications:
email:
recipients:
- digi@treepy.com
on_success: never
on_failure: always
irc:
- "irc.freenode.org#django-cms"
- "irc.freenode.org#django-cms-sprint"


email:
recipients:
- digi@treepy.com
on_success: never
on_failure: always
irc:
- irc.freenode.org#django-cms
- irc.freenode.org#django-cms-sprint
matrix:
exclude:
- python: 3.3
env: DJANGO=1.4 DB='sqlite://localhost/:memory:'
- python: 3.3
env: DJANGO=1.4 DB='mysql://root@127.0.0.1/djangocms_test'
- python: 3.3
env: DJANGO=1.4 DB='postgres://postgres@127.0.0.1/djangocms_test'
- python: 3.3
env: DJANGO=1.5 DB='mysql://root@127.0.0.1/djangocms_test'
- python: 3.3
env: DJANGO=1.4 DATABASE_URL='sqlite://localhost/:memory:' SELENIUM=0
- python: 3.3
env: DJANGO=1.4 DATABASE_URL='mysql://root@127.0.0.1/djangocms_test' SELENIUM=0
- python: 3.3
env: DJANGO=1.4 DATABASE_URL='postgres://postgres@127.0.0.1/djangocms_test' SELENIUM=0

- python: 3.3
env: DJANGO=1.5 DATABASE_URL='mysql://root@127.0.0.1/djangocms_test' SELENIUM=0
- python: 3.3
env: DJANGO=1.6 DATABASE_URL='mysql://root@127.0.0.1/djangocms_test' SELENIUM=0
- python: 3.3
env: DJANGO=trunk DATABASE_URL='mysql://root@127.0.0.1/djangocms_test' SELENIUM=0

- python: 2.6
env: DJANGO=trunk DATABASE_URL='sqlite://localhost/:memory:' SELENIUM=0
- python: 2.6
env: DJANGO=trunk DATABASE_URL='postgres://postgres@127.0.0.1/djangocms_test' SELENIUM=0
- python: 2.6
env: DJANGO=trunk DATABASE_URL='mysql://root@127.0.0.1/djangocms_test' SELENIUM=0


- python: 2.6
env: DJANGO=1.4 DATABASE_URL='mysql://root@127.0.0.1/djangocms_test' SELENIUM=1
- python: 2.7
env: DJANGO=1.4 DATABASE_URL='mysql://root@127.0.0.1/djangocms_test' SELENIUM=0
- python: 3.3
env: DJANGO=1.4 DATABASE_URL='mysql://root@127.0.0.1/djangocms_test' SELENIUM=1


allow_failures:
- python: 3.3
env: DJANGO=trunk DATABASE_URL='sqlite://localhost/:memory:' SELENIUM=0
- python: 3.3
env: DJANGO=trunk DATABASE_URL='mysql://root@127.0.0.1/djangocms_test' SELENIUM=0
- python: 3.3
env: DJANGO=trunk DATABASE_URL='postgres://postgres@127.0.0.1/djangocms_test' SELENIUM=0
- python: 2.7
env: DJANGO=trunk DATABASE_URL='sqlite://localhost/:memory:' SELENIUM=0
- python: 2.7
env: DJANGO=trunk DATABASE_URL='mysql://root@127.0.0.1/djangocms_test' SELENIUM=0
- python: 2.7
env: DJANGO=trunk DATABASE_URL='postgres://postgres@127.0.0.1/djangocms_test' SELENIUM=0
fast_finish: true
36 changes: 35 additions & 1 deletion AUTHORS
Expand Up @@ -22,6 +22,7 @@ Contributors (in alphabetical order):

* A. Bram Neijt
* aaloy
* Aaron Fay
* Aaron Renner
* aball
* Adi Sieker
Expand All @@ -34,13 +35,18 @@ Contributors (in alphabetical order):
* Alexandre Leray
* Alexey Subbotin
* Alvin Mites
* Andre Bossard
* Andrei Avram
* Andrei Fokau
* Andrew Cassidy
* Andrew Schoen
* angular_circle
* Anton Parkhomenko
* Antoni Aloy López
* Arne Gellhaus
* Arne Schauf
* Artem Skoretskiy
* Artis Avotins
* Arthur Debert
* Aymeric Augustin
* Batiste Bieler
Expand All @@ -58,15 +64,22 @@ Contributors (in alphabetical order):
* brightwhitefox
* Calvin Cheng
* Chanita Siridechkun
* Charlie Denton
* Charpentier Johan
* Cheng-Chia Tseng
* Chris Adams
* Chris Franklin
* Chris Hughes
* Chris Jones
* Chris Wesseling
* Christof Hagedorn
* Christos Kopanos
* Conrado Bührer
* Craig de Stigter
* Damir Arbula
* DaNmarner
* Daniel Barden
* Danilo Bargen
* Darryl Woods
* David Jean Louis
* David Thompson
Expand All @@ -93,11 +106,15 @@ Contributors (in alphabetical order):
* GaretJax
* Geoffrey Hing
* George Marshall
* Gerard Świderski
* Gerard Świdersk
* Germano Gabbianellii
* Gilles Lenfant
* guandalino
* Hamish Downer
* Henning Spran
* hedberg
* Herbert Poul
* hjkelly
* homebrew79
* hysia
* Ian Lewis
Expand All @@ -108,6 +125,7 @@ Contributors (in alphabetical order):
* izi
* J. Cliff Dyer
* Jacob Rief
* Jakob Hedman
* Jameel Al-Aziz
* James Richards
* Jannis Leidel
Expand All @@ -119,13 +137,16 @@ Contributors (in alphabetical order):
* Javi Nievas
* Johannes Bornhold
* John-Scott Atlakson
* Jon Prindiville
* Jonathan Stoppani
* jordanjambazov
* Jorge Vargas (elpargo)
* Joseph Bergantine
* kar1m
* Kegan Holtzhausen
* Keryn Knight
* Kim Blomqvist
* Kim Thoenen
* kochin
* Kristian Øllegaard
* Krzysztof Bandurski
Expand All @@ -144,6 +165,7 @@ Contributors (in alphabetical order):
* Manuel Schmidt
* Marc-Olivier Titeux
* Marco Bonetti
* Marco Paolini
* Marco Rimoldi
* Mark Rogers
* Markus Holtermann
Expand All @@ -162,13 +184,17 @@ Contributors (in alphabetical order):
* meers
* MerLex
* Michael P. Jung
* Michael Thornhill
* Mike Dory
* Mike Johnson
* Mitar
* Mokys
* mrlundis
* MW
* neoprolog
* Nickolay V. Shmyrev
* Oliver Zander
* Olivier Le Brouster
* Orne Brocaar
* padelt
* Paolo
Expand Down Expand Up @@ -200,15 +226,19 @@ Contributors (in alphabetical order):
* Robert Buchholz
* Robert Clark
* Robert Pogorzelski
* Roberto Lopez
* Robin Lewis
* robint
* Rodolfo Carvalho
* rtpm
* Samuel Lüscher
* sbussetti
* Scott Barnham
* sealibora
* Sean Bleier
* Seth Buntin
* Seyhun Akyurek
* Shahar Or
* Shatalov Vadim
* shed
* Shinya Okano
Expand All @@ -220,14 +250,17 @@ Contributors (in alphabetical order):
* spookylukey
* ssteinerX
* Stavros Korokithakis
* Stefano Crosta
* Stephan Jaekel
* Stephen Muss
* Steve R. Jones
* Steve Steiner
* Tanel Külaots
* Thomas Parslow
* Thomas Woolford
* timesong
* Tim Davies
* Tim Graham
* Tino de Bruijn
* tiret
* Tom de Simone
Expand All @@ -238,6 +271,7 @@ Contributors (in alphabetical order):
* Wayne Moore
* wid
* wildermesser
* Xavier Ordoquy
* Yann Malet
* yedpodtrzitko
* yohanboniface
Expand Down
10 changes: 8 additions & 2 deletions CHANGELOG.txt
Expand Up @@ -192,7 +192,13 @@ Please see Install/2.4 release notes *before* attempting to upgrade to version 2
- PageAdmin uses the same Plugin API as PlaceholderAdmin
- Toolbar API for your own apps added
- twitter plugin removed
- New stacks application
- Object level permission support for Placeholder
- Configuration for plugin custom modules and labels in the toolbar UI
- Added copy-lang subcommand to copy content between languages
- Added copy-lang subcommand to copy content between languages
- Added static_placeholder templatetag
- Moved render_placeholder from placeholder_tags to cms_tags
- django 1.6 support added
- Frontedit editor for Django models
- Extending the page & title model API
- Placeholders can be configured to have plugins automagically added.
- Publishing is now language independent and the tree-view has been updated to reflect this

0 comments on commit 4179b3b

Please sign in to comment.