lp:~elachuni/ubuntu-webcatalog/browse

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu-webcatalog at revision 10

Michael Hall (community): Approve on 2011-04-13

Diff: 288 lines (+157/-15)

10 files modified

src/webcatalog/fixtures/initial_data.json (+0/-8)
src/webcatalog/static/css/webcatalog.css (+16/-1)
src/webcatalog/templates/webcatalog/base.html (+1/-1)
src/webcatalog/templates/webcatalog/department_overview.html (+39/-0)
src/webcatalog/templates/webcatalog/index.html (+28/-0)
src/webcatalog/templates/webcatalog/search_results.html (+1/-1)
src/webcatalog/tests/factory.py (+7/-1)
src/webcatalog/tests/test_views.py (+36/-0)
src/webcatalog/urls.py (+4/-1)
src/webcatalog/views.py (+25/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

11. By Anthony Lenton on 2011-04-13

Fixed search form action per code review.

10. By Anthony Lenton on 2011-04-13

Added tests for index and department views.

9. By Anthony Lenton on 2011-04-13

Implemented basic index and department views.

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

4. By Michael Nelson on 2011-04-11

Merged import-app-install-data.

3. By Michael Nelson on 2011-04-08

Added a few more fields, updated template link to thumbnail and added admin model.

2. By Michael Nelson on 2011-04-07

Merged add-ui-media