lp:~michael.nelson/ubuntu-webcatalog/import-icon-file

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu-webcatalog at revision 9

Anthony Lenton (community): Approve on 2011-04-13

Diff: 1131 lines (+983/-20)

10 files modified

.bzrignore (+1/-0)
django_project/settings.py (+1/-1)
requirements.txt (+1/-0)
src/webcatalog/forms.py (+1/-0)
src/webcatalog/management/commands/import_app_install_data.py (+63/-16)
src/webcatalog/models.py (+3/-1)
src/webcatalog/tests/factory.py (+4/-2)
src/webcatalog/tests/test_commands.py (+17/-0)
src/webcatalog/tests/test_data/firefox.xpm (+294/-0)
src/webcatalog/tests/test_data/scribus.xpm (+598/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

12. By Michael Nelson on 2011-04-13

Updated create_application to set blank icon/icon_names.

11. By Michael Nelson on 2011-04-13

Added support for multiple extensions (xpm, png, svg, tiff).

10. By Michael Nelson on 2011-04-13

Updated to extract all files and process, to ease pain of getting icons.

9. By Michael Nelson on 2011-04-13

RED: Tests fail as icon is required but not yet imported.

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.