Merge lp://qastaging/~noskcaj/ubuntu/utopic/geary/merge2 into lp://qastaging/ubuntu/utopic/geary
Proposed by
Jackson Doak
| Status: | Needs review | ||||
|---|---|---|---|---|---|
| Proposed branch: | lp://qastaging/~noskcaj/ubuntu/utopic/geary/merge2 | ||||
| Merge into: | lp://qastaging/ubuntu/utopic/geary | ||||
| Diff against target: |
3454 lines (+1483/-393) 33 files modified
CMakeLists.txt (+1/-1) NEWS (+8/-0) debian/changelog (+17/-0) debian/control (+2/-1) po/POTFILES.in (+3/-0) po/he.po (+184/-78) po/pl.po (+209/-97) src/CMakeLists.txt (+5/-1) src/client/accounts/account-dialog.vala (+26/-15) src/client/application/geary-args.vala (+2/-0) src/client/application/geary-controller.vala (+238/-3) src/client/application/secret-mediator.vala (+7/-7) src/client/components/main-window.vala (+4/-1) src/client/dialogs/certificate-warning-dialog.vala (+114/-0) src/client/dialogs/password-dialog.vala (+1/-1) src/engine/api/geary-account-information.vala (+151/-55) src/engine/api/geary-credentials-mediator.vala (+0/-19) src/engine/api/geary-endpoint.vala (+89/-12) src/engine/api/geary-engine.vala (+27/-2) src/engine/api/geary-service.vala (+47/-0) src/engine/imap-db/outbox/smtp-outbox-folder.vala (+36/-17) src/engine/imap-engine/gmail/imap-engine-gmail-account.vala (+14/-24) src/engine/imap-engine/imap-engine-generic-account.vala (+2/-2) src/engine/imap-engine/outlook/imap-engine-outlook-account.vala (+14/-24) src/engine/imap-engine/yahoo/imap-engine-yahoo-account.vala (+14/-24) src/engine/imap/transport/imap-client-session-manager.vala (+30/-1) src/engine/rfc822/rfc822-message-data.vala (+5/-1) src/engine/rfc822/rfc822-message.vala (+1/-2) src/engine/smtp/smtp-client-connection.vala (+11/-2) src/engine/smtp/smtp-client-session.vala (+3/-2) src/mailer/main.vala (+1/-1) ui/CMakeLists.txt (+1/-0) ui/certificate_warning_dialog.glade (+216/-0) |
||||
| To merge this branch: | bzr merge lp://qastaging/~noskcaj/ubuntu/utopic/geary/merge2 | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Daniel Holbach (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
New upstream bugfix release
To post a comment you must log in.
Unmerged revisions
- 27. By Jackson Doak
-
* Merge from debian. Remaining changes:
- debian/control: Add build-depends on libmessaging-menu-dev and
libunity-dev for Unity integration.
* New upstream release.
- Warn user of TLS certificate issues when connecting.
(Closes: #703975; LP: #1158859)
* Add build-depends on libgcr-3-dev. - 26. By Jackson Doak
-
Merging shared upstream rev into target branch.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Thanks. Uploaded.