lp:~elachuni/ubuntu-webcatalog/department-icons

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu-webcatalog at revision 12

Ricardo Kirkner (community): Approve on 2011-04-20

Diff: 330 lines (+73/-21)

11 files modified

django_project/settings.py (+8/-1)
django_project/urls.py (+7/-0)
src/webcatalog/department_filters.py (+0/-1)
src/webcatalog/fixtures/initial_data.json (+9/-9)
src/webcatalog/models.py (+5/-0)
src/webcatalog/static/css/webcatalog.css (+18/-2)
src/webcatalog/templates/webcatalog/department_overview.html (+2/-4)
src/webcatalog/templates/webcatalog/department_overview_snippet.html (+8/-0)
src/webcatalog/templates/webcatalog/index.html (+1/-3)
src/webcatalog/tests/test_models.py (+14/-0)
src/webcatalog/urls.py (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

14. By Anthony Lenton on 2011-04-20

Tidied up inline style into the css file.

13. By Anthony Lenton on 2011-04-19

Moved icons around, added tests.

12. By Anthony Lenton on 2011-04-19

Added static department icons and plugged in.

11. By Michael Nelson on 2011-04-15

[r=lukasz] Determine most recent app-install-data uri for download for given distroseries.

10. By Anthony Lenton on 2011-04-14

[r=mars] Merged in lp:~elachuni/ubuntu-webcatalog/browse

9. By Anthony Lenton on 2011-04-13

[r=achuni] Merged in lp:~michael.nelson/ubuntu-webcatalog/import-icon-file

8. By Michael Nelson on 2011-04-13

[r=noodles] Adds department model to loosely group apps in the same way as USC.

7. By Anthony Lenton on 2011-04-12

[r=mars] Merged in lp:~elachuni/ubuntu-webcatalog/search

6. By Anthony Lenton on 2011-04-12

Merging in lp:~michael.nelson/ubuntu-webcatalog/form-for-import-data

5. By Anthony Lenton on 2011-04-12

Merged in lp:~elachuni/ubuntu-webcatalog/light-theme