lp://staging/~elachuni/ubuntu-webcatalog/celery

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/ubuntu-webcatalog at revision 156

Danny Tamez (community): Approve on 2012-07-02

Diff: 1262 lines (+551/-136)

35 files modified

django_project/config/main.cfg (+10/-1)
django_project/settings.py (+4/-1)
setup.py (+2/-0)
src/webcatalog/admin.py (+2/-4)
src/webcatalog/decorators.py (+32/-0)
src/webcatalog/department_filters.py (+1/-4)
src/webcatalog/forms.py (+1/-4)
src/webcatalog/management/commands/cleanup.py (+24/-16)
src/webcatalog/management/commands/import_all_app_install_data.py (+3/-5)
src/webcatalog/management/commands/import_all_ratings_stats.py (+3/-5)
src/webcatalog/management/commands/import_app_install_data.py (+1/-4)
src/webcatalog/management/commands/import_sca_apps.py (+1/-4)
src/webcatalog/managers.py (+1/-5)
src/webcatalog/models/applications.py (+25/-5)
src/webcatalog/preflight.py (+1/-4)
src/webcatalog/schema.py (+11/-0)
src/webcatalog/static/css/webcatalog.css (+1/-1)
src/webcatalog/tasks.py (+54/-0)
src/webcatalog/templates/forbidden.html (+23/-0)
src/webcatalog/templates/webcatalog/task_list.html (+84/-0)
src/webcatalog/templatetags/webcatalog.py (+1/-4)
src/webcatalog/tests/__init__.py (+1/-0)
src/webcatalog/tests/factory.py (+27/-6)
src/webcatalog/tests/helpers.py (+1/-4)
src/webcatalog/tests/test_commands.py (+4/-6)
src/webcatalog/tests/test_department_filters.py (+1/-5)
src/webcatalog/tests/test_forms.py (+1/-4)
src/webcatalog/tests/test_managers.py (+1/-4)
src/webcatalog/tests/test_models.py (+1/-4)
src/webcatalog/tests/test_preflight.py (+3/-16)
src/webcatalog/tests/test_tasks.py (+42/-0)
src/webcatalog/tests/test_templatetags.py (+1/-5)
src/webcatalog/tests/test_views.py (+116/-4)
src/webcatalog/urls.py (+6/-4)
src/webcatalog/views.py (+61/-7)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

157. By Anthony Lenton on 2012-07-02

Removed pointless imported with_statement

156. By Anthony Lenton on 2012-07-02

Merged in latest changes from trunk. Made all tests pass.

155. By Anthony Lenton on 2012-07-02

Pulled back config change per code review.

154. By Anthony Lenton on 2012-06-29

Query TaskState model instead of TaskMeta.

153. By Anthony Lenton on 2012-06-28

Merged in latest changes from trunk.

152. By Anthony Lenton on 2012-06-28

Added a few tasks.

151. By Anthony Lenton on 2012-06-27

Merged in latest changes from trunk.

150. By Anthony Lenton on 2012-06-27

Added a few tests, improved the TaskMeta admin UI.

149. By Anthony Lenton on 2012-06-27

Added a few tests.

148. By Anthony Lenton on 2012-06-26

Merged in latest changes from trunk.