lp:~dholbach/developer-ubuntu-com/django-cms-update

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~developer-ubuntu-com-dev/developer-ubuntu-com/django-1.8-cms-2.3 at revision 166

David Callé: Approve on 2016-01-06

Diff: 40 lines (+6/-6)

1 file modified

requirements.txt (+6/-6)

api

Superseded for merging into lp:developer-ubuntu-com

Ubuntu App Developer site developers: Pending requested 2015-11-24

Diff: 375 lines (+143/-25) (has conflicts)

6 files modified

Makefile (+16/-3)
developer_portal/blog/views.py (+15/-5)
developer_portal/management/commands/initdb.py (+29/-17)
developer_portal/settings.py (+26/-0)
pip-cache-revno.txt (+4/-0)
requirements.txt (+53/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

166. By Daniel Holbach on 2016-01-06

update to newest, resolve conflicts

165. By David Callé on 2015-12-15

Update pip cache revno

164. By David Callé on 2015-12-15

Update deps and migrations

163. By David Callé on 2015-12-11

Bug #1525202: initdb could add an 'English' and 'Chinese' category for blog posts

162. By David Callé on 2015-12-11

Blog archives fix (dholbach)

161. By David Callé on 2015-12-11

Bump pip-cache revno

160. By David Callé on 2015-12-11

Fix wrong bzr commands for pip-cache, my bad

159. By David Callé on 2015-12-11

Revert to one pip branch

158. By David Callé on 2015-12-04

Adapt for new staging deps branch

157. By David Callé on 2015-12-03

Allow iframes in ckeditor