Merge lp:~developer-ubuntu-com-dev/developer-ubuntu-com/update-components into lp:developer-ubuntu-com

[Daniel Holbach]

[lp:~developer-ubuntu-com-dev/developer-ubuntu-com/update-components]

203. By Daniel Holbach on 2016-04-18

merge ~dholbach/developer-ubuntu-com/small-update - resolve conflicts

204. By Daniel Holbach on 2016-04-18

entirely resolve conflicts

[Daniel Holbach (dholbach)]

First let's do https://code.launchpad.net/~dholbach/developer-ubuntu-com/small-update/+merge/292106

[lp:~developer-ubuntu-com-dev/developer-ubuntu-com/update-components]

205. By Daniel Holbach on 2016-04-19

merge trunk

206. By Daniel Holbach on 2016-05-02

merge trunk

207. By Daniel Holbach on 2016-05-02

update to django cms 3.2.5

208. By Daniel Holbach on 2016-05-02

more component updates

209. By Daniel Holbach on 2016-05-02

actually make use of djangocms_admin_style

210. By Daniel Holbach on 2016-05-02

update zinnia plugin to one which works with django 1.9

211. By Daniel Holbach on 2016-05-09

update components again

212. By Daniel Holbach on 2016-05-12

merge trunk, resolve conflicts

213. By Daniel Holbach on 2016-05-12

update components

214. By Daniel Holbach on 2016-05-12

remove duplicate lines

215. By Daniel Holbach on 2016-05-12

sort -f requirements.txt

216. By David Callé on 2016-05-12

Update pip-cache-revno

217. By David Callé on 2016-05-12

Remove double requirements

218. By David Callé on 2016-05-12

Remove double requirements

219. By David Callé on 2016-05-12

Update pip-cache-revno

Unmerged revisions

219. By David Callé on 2016-05-12

Update pip-cache-revno

218. By David Callé on 2016-05-12

Remove double requirements

217. By David Callé on 2016-05-12

Remove double requirements

216. By David Callé on 2016-05-12

Update pip-cache-revno

215. By Daniel Holbach on 2016-05-12

sort -f requirements.txt

214. By Daniel Holbach on 2016-05-12

remove duplicate lines

213. By Daniel Holbach on 2016-05-12

update components

212. By Daniel Holbach on 2016-05-12

merge trunk, resolve conflicts

211. By Daniel Holbach on 2016-05-09

update components again

210. By Daniel Holbach on 2016-05-02

update zinnia plugin to one which works with django 1.9

=== modified file 'pip-cache-revno.txt'
--- pip-cache-revno.txt	2016-05-02 10:07:32 +0000
+++ pip-cache-revno.txt	2016-05-12 10:03:45 +0000
@@ -1,1 +1,1 @@
-39
+41

=== modified file 'requirements.txt'
--- requirements.txt	2016-05-02 09:38:24 +0000
+++ requirements.txt	2016-05-12 10:03:45 +0000
@@ -1,55 +1,54 @@
-Django==1.8.12
-django-template-debug==0.3.5
-oslo.config==3.1.0
-oslo.i18n==3.1.0
-oslo.serialization==2.1.0
-oslo.utils==3.2.0
-Pillow==2.9.0
-cmsplugin-zinnia==0.8
-Markdown==2.6.6
-pymdown-extensions==1.1
 beautifulsoup4==4.4.1
-dj-database-url==0.3.0
+cmsplugin-zinnia==0.8.1
+Django==1.8.13
 django-admin-enhancer==1.0.0
-django-appconf==1.0.1
+django-appconf==1.0.2
 django-blog-zinnia==0.16
 django-ckeditor==5.0.3
 django-ckeditor-updated==4.4.4
-django-classy-tags==0.7.0
+django-classy-tags==0.7.2
 django-cms==3.2.5
-django-contrib-comments==1.7.0
-django-meta==0.3.1
-django-meta-mixin==0.2.1
-django-missing==0.1.15
-django-parler==1.6
-django-polymorphic==0.8.1
-django-reversion==1.9.3
+djangocms-admin-style==1.1.1
+djangocms-inherit==0.1.1
+djangocms-link==1.7.2
+djangocms-picture==1.0.0
+djangocms-snippet==1.8.0
+djangocms-text-ckeditor==2.9.3
+djangocms-utils==0.9.5
+djangocms-video==1.0.0
+django-contrib-comments==1.7.1
+django-meta==1.2
+django-meta-mixin==0.3.0
+django-missing==0.1.18
+django-openid-auth==0.7
+django-parler==1.6.3
+django-polymorphic==0.9.2
+django-pygments==0.1
+djangorestframework==3.3.3
+django-reversion==1.10.2
 django-sekizai==0.9.0
 django-swiftstorage==1.1.0
-django-tagging==0.4
-django-taggit==0.17.6
+django-tagging==0.4.3
+django-taggit==0.18.2
 django-taggit-autosuggest==0.2.8
 django-taggit-templatetags==0.2.5
+django-template-debug==0.3.5
 django-templatetag-sugar==1.0
 django-xmlrpc==0.1.5
-djangocms-admin-style==1.1.0
-djangocms-inherit==0.1.1
-djangocms-link==1.7.1
-djangocms-picture==0.2.0
-djangocms-snippet==1.7.1
-djangocms-text-ckeditor==2.9.1
-djangocms-utils==0.9.5
-djangocms-video==1.0.0
-python-keystoneclient==1.3.3
-python-swiftclient==2.6.0
-pytz==2016.3
+dj-database-url==0.4.1
+Markdown==2.6.6
+msgpack-python==0.4.7
+oslo.config==3.9.0
+oslo.i18n==3.6.0
+oslo.serialization==2.6.0
+oslo.utils==3.10.0
+Pillow==3.2.0
+Pygments==2.1.3
+pymdown-extensions==1.1
+python-openid==2.2.5
+python-swiftclient==3.0.0
+pytz==2016.4
+simplejson==3.8.2
 simple-translation==0.8.6
-simplejson==3.8.1
 wsgiref==0.1.2
 zinnia-wysiwyg-ckeditor==1.3
-Pygments==2.0.2
-django-pygments==0.1
-django-openid-auth==0.7
-python-openid==2.2.5
-djangorestframework==3.3.2
-msgpack-python==0.4.7