← Back to branch summary

~launchpad-pqm/launchpad/devel

~launchpad-pqm/launchpad/devel

Viewing all changes in revision 13405.7.4.

Committer: Bryce Harrington
Date: 2011-07-13 17:11:43 UTC
mfrom: (13426 devel)
mto: This revision was merged to the branch mainline in revision 13431.
Revision ID: bryce@canonical.com-20110713171143-0inikq8fsfp3lzms

Re-merge head

files added:
database/schema/patch-2208-75-1.sql

files removed:
lib/lp/app/javascript/effects/effects-async.js

lib/lp/app/javascript/tests/test_lp_collapsibles.html

lib/lp/app/javascript/tests/test_lp_collapsibles.js

files renamed:
scripts/generate-contents-files.py => cronscripts/generate-contents-files.py

files modified:
configs/development/launchpad-lazr.conf

configs/testrunner/launchpad-lazr.conf

cronscripts/sendbranchmail.py

database/sampledata/current-dev.sql

database/sampledata/current.sql

lib/canonical/config/schema-lazr.conf

lib/canonical/launchpad/security.py

lib/canonical/launchpad/webapp/adapter.py

lib/canonical/launchpad/webapp/batching.py

lib/lp/app/browser/root.py

lib/lp/app/browser/tests/launchpad-search-pages.txt

lib/lp/app/doc/batch-navigation.txt

lib/lp/app/doc/celebrities.txt

lib/lp/app/interfaces/launchpad.py

lib/lp/app/javascript/effects/effects.js

lib/lp/app/javascript/expander.js

lib/lp/app/javascript/lp.js

lib/lp/app/javascript/picker/picker.js

lib/lp/app/javascript/picker/tests/test_personpicker.js

lib/lp/app/javascript/tests/test_expander.html

lib/lp/app/javascript/tests/test_expander.js

lib/lp/app/utilities/celebrities.py

lib/lp/archivepublisher/scripts/generate_contents_files.py

lib/lp/archivepublisher/tests/test_generate_contents_files.py

lib/lp/bugs/stories/webservice/xx-bug-tracker.txt

lib/lp/bugs/stories/webservice/xx-bug.txt

lib/lp/bugs/templates/bugtarget-macros-filebug.pt

lib/lp/bugs/templates/bugtask-tasks-and-nominations-table-row.pt

lib/lp/bugs/templates/bugtasks-and-nominations-table.pt

lib/lp/code/browser/branch.py

lib/lp/code/browser/tests/test_sourcepackagerecipebuild.py

lib/lp/code/interfaces/branch.py

lib/lp/code/interfaces/branchmergequeue.py

lib/lp/code/model/branchjob.py

lib/lp/code/model/tests/test_branch.py

lib/lp/code/model/tests/test_branchcollection.py

lib/lp/code/model/tests/test_branchmergequeuecollection.py

lib/lp/code/model/tests/test_branchnamespace.py

lib/lp/code/model/tests/test_branchsubscription.py

lib/lp/code/scripts/tests/test_sendbranchmail.py

lib/lp/code/security.py

lib/lp/code/stories/branches/xx-branch-edit.txt

lib/lp/code/stories/branches/xx-branch-mirror-failures.txt

lib/lp/code/templates/branch-register-merge.pt

lib/lp/code/templates/sourcepackagerecipe-related-branches.pt

lib/lp/code/tests/test_branch.py

lib/lp/codehosting/vfs/transport.py

lib/lp/registry/browser/distroseries.py

lib/lp/registry/browser/tests/productseries-views.txt

lib/lp/registry/browser/tests/test_distroseries.py

lib/lp/registry/doc/vocabularies.txt

lib/lp/registry/interfaces/distroseries.py

lib/lp/registry/interfaces/distroseriesdifference.py

lib/lp/registry/interfaces/role.py

lib/lp/registry/model/distroseries.py

lib/lp/registry/model/distroseriesdifference.py

lib/lp/registry/model/packagingjob.py

lib/lp/registry/templates/distroseries-index.pt

lib/lp/registry/templates/distroseries-portlet-derivation.pt

lib/lp/registry/templates/pillar-involvement-portlet.pt

lib/lp/registry/templates/product-files.pt

lib/lp/registry/templates/productrelease-portlet-data.pt

lib/lp/registry/tests/test_distroseries.py

lib/lp/registry/tests/test_distroseries_vocabularies.py

lib/lp/registry/tests/test_distroseriesdifference.py

lib/lp/registry/vocabularies.py

lib/lp/registry/vocabularies.zcml

lib/lp/services/features/browser/tests/test_changelog.py

lib/lp/services/job/interfaces/job.py

lib/lp/services/job/model/job.py

lib/lp/services/job/tests/test_job.py

lib/lp/services/utils.py

lib/lp/soyuz/configure.zcml

lib/lp/soyuz/interfaces/distributionjob.py

lib/lp/soyuz/interfaces/packagecopyjob.py

lib/lp/soyuz/interfaces/packageset.py

lib/lp/soyuz/model/initializedistroseriesjob.py

lib/lp/soyuz/model/packagecopyjob.py

lib/lp/soyuz/scripts/initialize_distroseries.py

lib/lp/soyuz/scripts/tests/test_initialize_distroseries.py

lib/lp/soyuz/stories/ppa/xx-ppa-navigation.txt

lib/lp/soyuz/templates/archive-index.pt

lib/lp/soyuz/templates/archive-macros.pt

lib/lp/soyuz/templates/sourcepackagepublishinghistory-listing-archive-detailed.pt

lib/lp/soyuz/tests/test_initializedistroseriesjob.py

lib/lp/soyuz/tests/test_packagecopyjob.py

lib/lp/soyuz/tests/test_packageupload.py

lib/lp/testing/factory.py

lib/lp/translations/browser/tests/pofile-views.txt

lib/lp/translations/browser/translationmessage.py

lib/lp/translations/model/translationpackagingjob.py

lib/lp/translations/stories/importqueue/xx-translation-import-queue-filtering.txt

lib/lp/translations/stories/standalone/xx-pofile-translate-empty-strings-without-validation.txt

lib/lp/translations/stories/standalone/xx-pofile-translate-html-tags-escape.txt

lib/lp/translations/stories/standalone/xx-pofile-translate-newlines-check.txt

lib/lp/translations/tests/test_translationtemplatesbuildjob.py

setup.py

utilities/make-lp-user

versions.cfg

Show diffs side-by-side

added added

removed removed

configs/development/launchpad-lazr.conf

configs/testrunner/launchpad-lazr.conf

cronscripts/sendbranchmail.py

database/sampledata/current-dev.sql

database/sampledata/current.sql

database/schema/patch-2208-75-1.sql

lib/canonical/config/schema-lazr.conf

lib/canonical/launchpad/security.py

lib/canonical/launchpad/webapp/adapter.py

lib/canonical/launchpad/webapp/batching.py

lib/lp/app/browser/root.py

lib/lp/app/browser/tests/launchpad-search-pages.txt

lib/lp/app/doc/celebrities.txt

lib/lp/app/interfaces/launchpad.py

lib/lp/app/javascript/effects/effects-async.js

lib/lp/app/javascript/effects/effects.js

lib/lp/app/javascript/expander.js

lib/lp/app/javascript/lp.js

lib/lp/app/javascript/picker/picker.js

lib/lp/app/javascript/picker/tests/test_personpicker.js

lib/lp/app/javascript/tests/test_expander.html

lib/lp/app/javascript/tests/test_expander.js

lib/lp/app/javascript/tests/test_lp_collapsibles.html

lib/lp/app/javascript/tests/test_lp_collapsibles.js

lib/lp/app/utilities/celebrities.py

lib/lp/archivepublisher/scripts/generate_contents_files.py

lib/lp/archivepublisher/tests/test_generate_contents_files.py

lib/lp/bugs/stories/webservice/xx-bug-tracker.txt

lib/lp/bugs/stories/webservice/xx-bug.txt

lib/lp/bugs/templates/bugtarget-macros-filebug.pt

lib/lp/bugs/templates/bugtask-tasks-and-nominations-table-row.pt

lib/lp/bugs/templates/bugtasks-and-nominations-table.pt

lib/lp/code/browser/branch.py

lib/lp/code/browser/tests/test_sourcepackagerecipebuild.py

lib/lp/code/interfaces/branch.py

lib/lp/code/interfaces/branchmergequeue.py

lib/lp/code/model/branchjob.py

lib/lp/code/model/tests/test_branch.py

lib/lp/code/model/tests/test_branchcollection.py

lib/lp/code/model/tests/test_branchmergequeuecollection.py

lib/lp/code/model/tests/test_branchnamespace.py

lib/lp/code/model/tests/test_branchsubscription.py

lib/lp/code/scripts/tests/test_sendbranchmail.py

lib/lp/code/security.py

lib/lp/code/stories/branches/xx-branch-edit.txt

lib/lp/code/stories/branches/xx-branch-mirror-failures.txt

lib/lp/code/templates/branch-register-merge.pt

lib/lp/code/tests/test_branch.py

lib/lp/codehosting/vfs/transport.py

lib/lp/registry/browser/distroseries.py

lib/lp/registry/browser/tests/productseries-views.txt

lib/lp/registry/browser/tests/test_distroseries.py

lib/lp/registry/doc/vocabularies.txt

lib/lp/registry/interfaces/distroseries.py

lib/lp/registry/interfaces/distroseriesdifference.py

lib/lp/registry/interfaces/role.py

lib/lp/registry/model/distroseries.py

lib/lp/registry/model/distroseriesdifference.py

lib/lp/registry/model/packagingjob.py

lib/lp/registry/templates/distroseries-index.pt

lib/lp/registry/templates/distroseries-portlet-derivation.pt

lib/lp/registry/templates/pillar-involvement-portlet.pt

lib/lp/registry/templates/product-files.pt

lib/lp/registry/templates/productrelease-portlet-data.pt

lib/lp/registry/tests/test_distroseries.py

lib/lp/registry/tests/test_distroseries_vocabularies.py

lib/lp/registry/tests/test_distroseriesdifference.py

lib/lp/registry/vocabularies.py

lib/lp/registry/vocabularies.zcml

lib/lp/services/features/browser/tests/test_changelog.py

lib/lp/services/job/interfaces/job.py

lib/lp/services/job/model/job.py

lib/lp/services/job/tests/test_job.py

lib/lp/services/utils.py

lib/lp/soyuz/configure.zcml

lib/lp/soyuz/interfaces/distributionjob.py

lib/lp/soyuz/interfaces/packagecopyjob.py

lib/lp/soyuz/interfaces/packageset.py

lib/lp/soyuz/model/initializedistroseriesjob.py

lib/lp/soyuz/model/packagecopyjob.py

lib/lp/soyuz/scripts/initialize_distroseries.py

lib/lp/soyuz/scripts/tests/test_initialize_distroseries.py

lib/lp/soyuz/templates/archive-index.pt

lib/lp/soyuz/templates/archive-macros.pt

lib/lp/soyuz/templates/sourcepackagepublishinghistory-listing-archive-detailed.pt

lib/lp/soyuz/tests/test_initializedistroseriesjob.py

lib/lp/soyuz/tests/test_packagecopyjob.py

lib/lp/soyuz/tests/test_packageupload.py

lib/lp/testing/factory.py

lib/lp/translations/browser/tests/pofile-views.txt

lib/lp/translations/browser/translationmessage.py

lib/lp/translations/model/translationpackagingjob.py

lib/lp/translations/stories/importqueue/xx-translation-import-queue-filtering.txt

lib/lp/translations/stories/standalone/xx-pofile-translate-empty-strings-without-validation.txt

lib/lp/translations/stories/standalone/xx-pofile-translate-html-tags-escape.txt

lib/lp/translations/stories/standalone/xx-pofile-translate-newlines-check.txt

lib/lp/translations/tests/test_translationtemplatesbuildjob.py

utilities/make-lp-user

Older »