lp:~canonical-ca-hackers/ubuntu-webcatalog/938226-multiple-screenshots

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu-webcatalog at revision 84

Anthony Lenton (community): Approve on 2012-03-20

Diff: 1207 lines (+873/-28)

16 files modified

src/webcatalog/forms.py (+47/-2)
src/webcatalog/management/commands/import_for_purchase_apps.py (+1/-0)
src/webcatalog/migrations/0015_add_applicationmedia.py (+169/-0)
src/webcatalog/migrations/0016_populate_application_media.py (+168/-0)
src/webcatalog/migrations/0017_delete_screenshot_url.py (+158/-0)
src/webcatalog/migrations/0018_add_unique_together_to_application_media.py (+157/-0)
src/webcatalog/models/__init__.py (+2/-0)
src/webcatalog/models/applications.py (+30/-2)
src/webcatalog/static/css/carousel.css (+37/-0)
src/webcatalog/templates/webcatalog/application_detail.html (+4/-3)
src/webcatalog/templates/webcatalog/screenshot_widget.html (+28/-0)
src/webcatalog/tests/factory.py (+10/-2)
src/webcatalog/tests/test_commands.py (+9/-1)
src/webcatalog/tests/test_data/sca_apps.txt (+4/-0)
src/webcatalog/tests/test_forms.py (+21/-1)
src/webcatalog/tests/test_views.py (+28/-17)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #938226: Support multiple screenshots and video demos

Low

Fix Released

Link a bug report

Related blueprints

93. By Łukasz Czyżykowski on 2012-03-20

Merged from trunk.

92. By Łukasz Czyżykowski on 2012-03-20

Added unique_together index to the ApplicationMedia to restrict possibility of multiple same urls for the same application.

91. By Łukasz Czyżykowski on 2012-03-20

Added tests for checking that carousel is only displayed when there's more than one screenshot.

90. By Łukasz Czyżykowski on 2012-03-20

Added carousel to the screenshots.

89. By Łukasz Czyżykowski on 2012-03-20

Added caching for Application.screenshots attribute.

88. By Łukasz Czyżykowski on 2012-03-19

Added code to property pull screenshot_urls from imported json.

87. By Łukasz Czyżykowski on 2012-03-19

Added failing test for importing screenshot urls.

86. By Łukasz Czyżykowski on 2012-03-19

Added code to properly handle saving screenshot_url from .desktop file.

85. By Łukasz Czyżykowski on 2012-03-19

Quick fix for making test pass.

84. By Łukasz Czyżykowski on 2012-03-19

Fixed small error (missing return) from factory method.