lp:~jonas-drange/ubuntu-webcatalog/tos-redirect

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu-webcatalog at revision 190

Martin Albisetti (community): Approve on 2013-09-04

Diff: 198 lines (+24/-98)

7 files modified

django_project/config/main.cfg (+2/-0)
src/webcatalog/schema.py (+2/-0)
src/webcatalog/templates/webcatalog/tos.html (+0/-5)
src/webcatalog/templates/webcatalog/tos_plain.html (+0/-35)
src/webcatalog/templates/webcatalog/tos_snippet.html (+0/-47)
src/webcatalog/tests/test_views.py (+13/-6)
src/webcatalog/urls.py (+7/-5)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

193. By Jonas G. Drange on 2013-09-04

pep8 conform

192. By Jonas G. Drange on 2013-09-04

bringing it all together

191. By Jonas G. Drange on 2013-09-04

nuking deprecated templates

190. By Jonas G. Drange on 2013-09-04

url and settings

189. By Stephen Stewart on 2013-09-03

[r=jonas-drange,michael.nelson] move js to end of document

188. By Michael Nelson on 2013-09-03

[r=lukasz-czyzykowski] Separate logging configs for webapp and import command.

187. By Michael Nelson on 2013-08-29

[r=michael.nelson,mfoord] Use a console logging handler for import-sca-apps.

186. By Michael Nelson on 2013-08-28

[r=james-w] Update logging dictConfig for use in deployments and add a specific logger for import_sca_apps.

185. By Stephen Stewart on 2013-06-26

[r=beuno,jonas-drange] add ubuntu global nav to apps.ubuntu.com

184. By Michael Nelson on 2013-05-21

[r=beuno] Invalid desktop files are handled (skipped) rather than erroring.