← Back to branch summary

~jcsackett/charmworld/bac-tag-constraints

~jcsackett/charmworld/bac-tag-constraints

Viewing all changes in revision 142.3.15.

Committer: j.c.sackett
Date: 2013-02-12 18:07:41 UTC
mfrom: (148 charmworld)
mto: This revision was merged to the branch mainline in revision 149.
Revision ID: jcsackett@canonical.com-20130212180741-vgiwt4rn6z2s5ydx

Merged in trunk, resolving conflicts.

files added:
charmworld/static/Markdown.Converter-LICENSE.TXT

charmworld/static/css/LICENSE

charmworld/static/css/bootstrap/LICENSE

charmworld/static/prettify/LICENSE

files removed:
charmworld/templates/auth_callback.pt

files modified:
charmworld/__init__.py

charmworld/forms/__init__.py

charmworld/forms/qa_assessment.py

charmworld/globals.py

charmworld/graph.py

charmworld/jobs/bzr.py

charmworld/jobs/changelog.py

charmworld/jobs/config.py

charmworld/jobs/core_review.py

charmworld/jobs/cstat.py

charmworld/jobs/index.py

charmworld/jobs/jenkins.py

charmworld/jobs/lp.py

charmworld/jobs/proof.py

charmworld/jobs/review.py

charmworld/jobs/scan.py

charmworld/jobs/store.py

charmworld/jobs/tests/test_bzr.py

charmworld/jobs/tests/test_changelog.py

charmworld/jobs/tests/test_cstat.py

charmworld/jobs/tests/test_jenkins.py

charmworld/jobs/tests/test_lp.py

charmworld/jobs/tests/test_proof.py

charmworld/jobs/tests/test_scan.py

charmworld/jobs/tests/test_store.py

charmworld/jobs/utils.py

charmworld/lib/auth.py

charmworld/lib/config.py

charmworld/models.py

charmworld/reports.py

charmworld/resources.py

charmworld/routes.py

charmworld/static/charm.js

charmworld/static/report.js

charmworld/test_models.py

charmworld/test_utils.py

charmworld/testing/__init__.py

charmworld/testing/factory.py

charmworld/ubuntusso.py

charmworld/views/__init__.py

charmworld/views/auth.py

charmworld/views/charms.py

charmworld/views/experiment.py

charmworld/views/feeds.py

charmworld/views/helpers.py

charmworld/views/misc.py

charmworld/views/reports.py

charmworld/views/search.py

charmworld/views/tests/test_auth.py

charmworld/views/tests/test_charms.py

charmworld/views/tests/test_experiment.py

charmworld/views/tests/test_misc.py

charmworld/views/tests/test_reports.py

charmworld/views/tests/test_search.py

charmworld/views/tools.py

default.ini

migrations/migrate.py

migrations/test_migrate.py

migrations/versions/001_load_qa_questions.py

migrations/versions/002_Escape_dots_dollar_signs_percent_signs_in_mongo_keys.py

migrations/versions/tests/test_migrations.py

requirements.txt

scripts/clear-cache

scripts/config

scripts/ingest

scripts/reset-db

scripts/run

scripts/stop

Show diffs side-by-side

added added

removed removed

charmworld/__init__.py

charmworld/forms/__init__.py

charmworld/forms/qa_assessment.py

charmworld/globals.py

charmworld/graph.py

charmworld/jobs/bzr.py

charmworld/jobs/changelog.py

charmworld/jobs/config.py

charmworld/jobs/core_review.py

charmworld/jobs/cstat.py

charmworld/jobs/index.py

charmworld/jobs/jenkins.py

charmworld/jobs/lp.py

charmworld/jobs/proof.py

charmworld/jobs/review.py

charmworld/jobs/scan.py

charmworld/jobs/store.py

charmworld/jobs/tests/test_bzr.py

charmworld/jobs/tests/test_changelog.py

charmworld/jobs/tests/test_cstat.py

charmworld/jobs/tests/test_jenkins.py

charmworld/jobs/tests/test_lp.py

charmworld/jobs/tests/test_proof.py

charmworld/jobs/tests/test_scan.py

charmworld/jobs/tests/test_store.py

charmworld/jobs/utils.py

charmworld/lib/auth.py

charmworld/lib/config.py

charmworld/models.py

charmworld/reports.py

charmworld/resources.py

charmworld/routes.py

charmworld/static/Markdown.Converter-LICENSE.TXT

charmworld/static/charm.js

charmworld/static/css/LICENSE

charmworld/static/css/bootstrap/LICENSE

charmworld/static/prettify/LICENSE

charmworld/static/report.js

charmworld/templates/auth_callback.pt

charmworld/test_models.py

charmworld/test_utils.py

charmworld/testing/__init__.py

charmworld/testing/factory.py

charmworld/ubuntusso.py

charmworld/views/__init__.py

charmworld/views/auth.py

charmworld/views/charms.py

charmworld/views/experiment.py

charmworld/views/feeds.py

charmworld/views/helpers.py

charmworld/views/misc.py

charmworld/views/reports.py

charmworld/views/search.py

charmworld/views/tests/test_auth.py

charmworld/views/tests/test_charms.py

charmworld/views/tests/test_experiment.py

charmworld/views/tests/test_misc.py

charmworld/views/tests/test_reports.py

charmworld/views/tests/test_search.py

charmworld/views/tools.py

migrations/migrate.py

migrations/test_migrate.py

migrations/versions/001_load_qa_questions.py

migrations/versions/002_Escape_dots_dollar_signs_percent_signs_in_mongo_keys.py

migrations/versions/tests/test_migrations.py

requirements.txt

scripts/clear-cache

scripts/reset-db

Older »