Ubuntu Developer Portal

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

  1. update-components
  2. Merge into stable
Proposed by Daniel Holbach
Status: Needs review
Proposed branch: lp:~developer-ubuntu-com-dev/developer-ubuntu-com/update-components
Merge into: lp:developer-ubuntu-com
Diff against target: 105 lines (+40/-41)
2 files modified
pip-cache-revno.txt (+1/-1)
requirements.txt (+39/-40)
To merge this branch: bzr merge lp:~developer-ubuntu-com-dev/developer-ubuntu-com/update-components
Reviewer Review Type Date Requested Status
Ubuntu App Developer site developers Pending
Review via email: mp+289937@code.launchpad.net
To post a comment you must log in.
lp:~developer-ubuntu-com-dev/developer-ubuntu-com/update-components updated
203. By Daniel Holbach

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

204. By Daniel Holbach

entirely resolve conflicts

Revision history for this message
Daniel Holbach (dholbach) wrote :

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

Reply
lp:~developer-ubuntu-com-dev/developer-ubuntu-com/update-components updated
205. By Daniel Holbach

merge trunk

206. By Daniel Holbach

merge trunk

207. By Daniel Holbach

update to django cms 3.2.5

208. By Daniel Holbach

more component updates

209. By Daniel Holbach

actually make use of djangocms_admin_style

210. By Daniel Holbach

update zinnia plugin to one which works with django 1.9

211. By Daniel Holbach

update components again

212. By Daniel Holbach

merge trunk, resolve conflicts

213. By Daniel Holbach

update components

214. By Daniel Holbach

remove duplicate lines

215. By Daniel Holbach

sort -f requirements.txt

216. By David Callé

Update pip-cache-revno

217. By David Callé

Remove double requirements

218. By David Callé

Remove double requirements

219. By David Callé

Update pip-cache-revno

Unmerged revisions

219. By David Callé

Update pip-cache-revno

218. By David Callé

Remove double requirements

217. By David Callé

Remove double requirements

216. By David Callé

Update pip-cache-revno

215. By Daniel Holbach

sort -f requirements.txt

214. By Daniel Holbach

remove duplicate lines

213. By Daniel Holbach

update components

212. By Daniel Holbach

merge trunk, resolve conflicts

211. By Daniel Holbach

update components again

210. By Daniel Holbach

update zinnia plugin to one which works with django 1.9

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'pip-cache-revno.txt'
2--- pip-cache-revno.txt 2016-05-02 10:07:32 +0000
3+++ pip-cache-revno.txt 2016-05-12 10:03:45 +0000
4@@ -1,1 +1,1 @@
5-39
6+41
7
8=== modified file 'requirements.txt'
9--- requirements.txt 2016-05-02 09:38:24 +0000
10+++ requirements.txt 2016-05-12 10:03:45 +0000
11@@ -1,55 +1,54 @@
12-Django==1.8.12
13-django-template-debug==0.3.5
14-oslo.config==3.1.0
15-oslo.i18n==3.1.0
16-oslo.serialization==2.1.0
17-oslo.utils==3.2.0
18-Pillow==2.9.0
19-cmsplugin-zinnia==0.8
20-Markdown==2.6.6
21-pymdown-extensions==1.1
22 beautifulsoup4==4.4.1
23-dj-database-url==0.3.0
24+cmsplugin-zinnia==0.8.1
25+Django==1.8.13
26 django-admin-enhancer==1.0.0
27-django-appconf==1.0.1
28+django-appconf==1.0.2
29 django-blog-zinnia==0.16
30 django-ckeditor==5.0.3
31 django-ckeditor-updated==4.4.4
32-django-classy-tags==0.7.0
33+django-classy-tags==0.7.2
34 django-cms==3.2.5
35-django-contrib-comments==1.7.0
36-django-meta==0.3.1
37-django-meta-mixin==0.2.1
38-django-missing==0.1.15
39-django-parler==1.6
40-django-polymorphic==0.8.1
41-django-reversion==1.9.3
42+djangocms-admin-style==1.1.1
43+djangocms-inherit==0.1.1
44+djangocms-link==1.7.2
45+djangocms-picture==1.0.0
46+djangocms-snippet==1.8.0
47+djangocms-text-ckeditor==2.9.3
48+djangocms-utils==0.9.5
49+djangocms-video==1.0.0
50+django-contrib-comments==1.7.1
51+django-meta==1.2
52+django-meta-mixin==0.3.0
53+django-missing==0.1.18
54+django-openid-auth==0.7
55+django-parler==1.6.3
56+django-polymorphic==0.9.2
57+django-pygments==0.1
58+djangorestframework==3.3.3
59+django-reversion==1.10.2
60 django-sekizai==0.9.0
61 django-swiftstorage==1.1.0
62-django-tagging==0.4
63-django-taggit==0.17.6
64+django-tagging==0.4.3
65+django-taggit==0.18.2
66 django-taggit-autosuggest==0.2.8
67 django-taggit-templatetags==0.2.5
68+django-template-debug==0.3.5
69 django-templatetag-sugar==1.0
70 django-xmlrpc==0.1.5
71-djangocms-admin-style==1.1.0
72-djangocms-inherit==0.1.1
73-djangocms-link==1.7.1
74-djangocms-picture==0.2.0
75-djangocms-snippet==1.7.1
76-djangocms-text-ckeditor==2.9.1
77-djangocms-utils==0.9.5
78-djangocms-video==1.0.0
79-python-keystoneclient==1.3.3
80-python-swiftclient==2.6.0
81-pytz==2016.3
82+dj-database-url==0.4.1
83+Markdown==2.6.6
84+msgpack-python==0.4.7
85+oslo.config==3.9.0
86+oslo.i18n==3.6.0
87+oslo.serialization==2.6.0
88+oslo.utils==3.10.0
89+Pillow==3.2.0
90+Pygments==2.1.3
91+pymdown-extensions==1.1
92+python-openid==2.2.5
93+python-swiftclient==3.0.0
94+pytz==2016.4
95+simplejson==3.8.2
96 simple-translation==0.8.6
97-simplejson==3.8.1
98 wsgiref==0.1.2
99 zinnia-wysiwyg-ckeditor==1.3
100-Pygments==2.0.2
101-django-pygments==0.1
102-django-openid-auth==0.7
103-python-openid==2.2.5
104-djangorestframework==3.3.2
105-msgpack-python==0.4.7

Subscribers

People subscribed via source and target branches