← Back to branch summary

~launchpad-pqm/launchpad/devel

~launchpad-pqm/launchpad/devel

Viewing all changes in revision 6973.1.3.

Committer: Leonard Richardson
Date: 2008-09-09 14:24:25 UTC
mfrom: (6980 launchpad)
mto: This revision was merged to the branch mainline in revision 6986.
Revision ID: leonard.richardson@canonical.com-20080909142425-8exclqp6gvp0zsrr

Merge with trunk.

files added:
database/schema/patch-121-82-0.sql

database/schema/patch-121-83-0.sql

lib/canonical/launchpad/icing/translations-add-more-lines.gif

lib/canonical/launchpad/interfaces/_schema_circular_imports.py

files renamed:
database-frozen.txt => database-not-frozen.txt

lib/canonical/launchpad/mailman/doc/decorations.txt => lib/canonical/launchpad/mailman/doc/decorations.txt.disabled

files modified:
database/sampledata/current.sql

database/schema/comments.sql

database/schema/security.cfg

database/schema/trusted.sql

lib/canonical/authserver/tests/test_database.py

lib/canonical/codehosting/scanner/tests/test_bug_links.py

lib/canonical/codehosting/scanner/tests/test_bzrsync.py

lib/canonical/codehosting/sftp.py

lib/canonical/codehosting/tests/test_plugin_transport.py

lib/canonical/codehosting/tests/test_sftp.py

lib/canonical/codehosting/transport.py

lib/canonical/launchpad/browser/branch.py

lib/canonical/launchpad/browser/team.py

lib/canonical/launchpad/database/person.py

lib/canonical/launchpad/doc/bugnotificationrecipients.txt

lib/canonical/launchpad/doc/convert-person-to-team.txt

lib/canonical/launchpad/doc/emailaddress.txt

lib/canonical/launchpad/doc/logintoken-pages.txt

lib/canonical/launchpad/doc/notification-recipient-set.txt

lib/canonical/launchpad/doc/person-account.txt

lib/canonical/launchpad/doc/tales.txt

lib/canonical/launchpad/doc/team-pages.txt

lib/canonical/launchpad/doc/teammembership-email-notification.txt

lib/canonical/launchpad/doc/vocabularies.txt

lib/canonical/launchpad/icing/launchpad.js

lib/canonical/launchpad/icing/style.css

lib/canonical/launchpad/interfaces/__init__.py

lib/canonical/launchpad/interfaces/branch.py

lib/canonical/launchpad/pagetests/branches/xx-branch-index.txt

lib/canonical/launchpad/pagetests/foaf/07-reg-with-existing-email.txt

lib/canonical/launchpad/pagetests/foaf/xx-person-claim.txt

lib/canonical/launchpad/pagetests/foaf/xx-person-home.txt

lib/canonical/launchpad/pagetests/foaf/xx-setpreferredemail.txt

lib/canonical/launchpad/pagetests/foaf/xx-team-claim.txt

lib/canonical/launchpad/pagetests/openid/discovery.txt

lib/canonical/launchpad/pagetests/standalone/xx-reassign-distributionmirror.txt

lib/canonical/launchpad/pagetests/translations/xx-pofile-translate.txt

lib/canonical/launchpad/pagetests/webservice/xx-branch.txt

lib/canonical/launchpad/scripts/ftests/test_keyringtrustanalyser.py

lib/canonical/launchpad/scripts/tests/test_listteammembers.py

lib/canonical/launchpad/templates/branch-index.pt

lib/canonical/launchpad/templates/currenttranslationmessage-translate-one.pt

lib/canonical/launchpad/templates/pofile-translate.pt

lib/canonical/launchpad/templates/team-map.pt

lib/canonical/launchpad/testing/pages.py

lib/canonical/lazr/testing/webservice.py

Show diffs side-by-side

added added

removed removed

database/sampledata/current.sql

database/schema/comments.sql

database/schema/patch-121-82-0.sql

database/schema/patch-121-83-0.sql

database/schema/security.cfg

database/schema/trusted.sql

lib/canonical/authserver/tests/test_database.py

lib/canonical/codehosting/scanner/tests/test_bug_links.py

lib/canonical/codehosting/scanner/tests/test_bzrsync.py

lib/canonical/codehosting/sftp.py

lib/canonical/codehosting/tests/test_plugin_transport.py

lib/canonical/codehosting/tests/test_sftp.py

lib/canonical/codehosting/transport.py

lib/canonical/launchpad/browser/branch.py

lib/canonical/launchpad/browser/team.py

lib/canonical/launchpad/database/person.py

lib/canonical/launchpad/doc/bugnotificationrecipients.txt

lib/canonical/launchpad/doc/convert-person-to-team.txt

lib/canonical/launchpad/doc/emailaddress.txt

lib/canonical/launchpad/doc/logintoken-pages.txt

lib/canonical/launchpad/doc/notification-recipient-set.txt

lib/canonical/launchpad/doc/person-account.txt

lib/canonical/launchpad/doc/tales.txt

lib/canonical/launchpad/doc/team-pages.txt

lib/canonical/launchpad/doc/teammembership-email-notification.txt

lib/canonical/launchpad/doc/vocabularies.txt

lib/canonical/launchpad/icing/launchpad.js

lib/canonical/launchpad/icing/style.css

lib/canonical/launchpad/icing/translations-add-more-lines.gif

lib/canonical/launchpad/interfaces/__init__.py

lib/canonical/launchpad/interfaces/_schema_circular_imports.py

lib/canonical/launchpad/interfaces/branch.py

lib/canonical/launchpad/pagetests/branches/xx-branch-index.txt

lib/canonical/launchpad/pagetests/foaf/07-reg-with-existing-email.txt

lib/canonical/launchpad/pagetests/foaf/xx-person-claim.txt

lib/canonical/launchpad/pagetests/foaf/xx-person-home.txt

lib/canonical/launchpad/pagetests/foaf/xx-setpreferredemail.txt

lib/canonical/launchpad/pagetests/foaf/xx-team-claim.txt

lib/canonical/launchpad/pagetests/openid/discovery.txt

lib/canonical/launchpad/pagetests/standalone/xx-reassign-distributionmirror.txt

lib/canonical/launchpad/pagetests/translations/xx-pofile-translate.txt

lib/canonical/launchpad/pagetests/webservice/xx-branch.txt

lib/canonical/launchpad/scripts/ftests/test_keyringtrustanalyser.py

lib/canonical/launchpad/scripts/tests/test_listteammembers.py

lib/canonical/launchpad/templates/branch-index.pt

lib/canonical/launchpad/templates/currenttranslationmessage-translate-one.pt

lib/canonical/launchpad/templates/pofile-translate.pt

lib/canonical/launchpad/templates/team-map.pt

lib/canonical/launchpad/testing/pages.py

lib/canonical/lazr/testing/webservice.py

Older »