← Back to branch summary

~linaro-infrastructure/linaro-ci-dashboard/admin-app-openid

~linaro-infrastructure/linaro-ci-dashboard/admin-app-openid

Viewing all changes in revision 21.

Committer: Stevan Radakovic
Date: 2012-07-09 10:53:05 UTC
mfrom: (3.1.2 trunk)
Revision ID: stevan.radakovic@linaro.org-20120709105305-bkr7mjilgg1c4vvi

Merging trunk and resolving conflicts.

files added:
.bzrignore

LICENSE

dashboard/frontend/fixtures

dashboard/frontend/fixtures/initial_data.json

files removed:
dashboard/templates/frontend

files renamed:
dashboard/README => README

dashboard/templates/ => dashboard/frontend/templates/

dashboard/templates/frontend/home.html => dashboard/frontend/templates/home.html

dashboard/templates/frontend/index.html => dashboard/frontend/templates/index.html

files modified:
dashboard/frontend/models.py

dashboard/frontend/tests.py

dashboard/frontend/urls.py

dashboard/frontend/views/home_page_view.py

dashboard/frontend/views/index_view.py

dashboard/manage.py

dashboard/settings.py

dashboard/urls.py

Show diffs side-by-side

added added

removed removed

dashboard/frontend/fixtures/

dashboard/frontend/fixtures/initial_data.json

dashboard/frontend/models.py

dashboard/frontend/tests.py

dashboard/frontend/urls.py

dashboard/frontend/views/home_page_view.py

dashboard/frontend/views/index_view.py

dashboard/manage.py

dashboard/settings.py

dashboard/templates/frontend/

dashboard/urls.py

Older »