lp:~noskcaj/ubuntu/utopic/geary/merge2

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:ubuntu/utopic/geary

Daniel Holbach (community): Approve on 2014-09-10

Diff: 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)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1158859: Not obvious what to do with certificates geary does not like

Undecided

Fix Released

Link a bug report

Related blueprints

27. By Jackson Doak on 2014-09-09

* 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 on 2014-09-09

Merging shared upstream rev into target branch.

25. By Jackson Doak on 2014-08-25

* Merge from debian. Remaining changes:
  - debian/control: Add build-depends on libmessaging-menu-dev and
    libunity-dev for Unity integration.

24. By Iain Lane on 2014-08-19

No-change rebuild against new vala to fix bug with previous GMutex
implementation.

23. By Vincent Cheng on 2014-07-03

* Merge from debian. Remaining changes:
  - debian/control: Add build-depends on libmessaging-menu-dev and
    libunity-dev for Unity integration.

22. By Vincent Cheng on 2014-07-01

* Merge from debian. Remaining changes:
  - debian/control: Add build-depends on libmessaging-menu-dev and
    libunity-dev for Unity integration.

21. By Sebastien Bacher on 2014-03-21

debian/control: build-depends on gnome-doc-utils

20. By Sebastien Bacher on 2014-03-21

New upstream version

19. By Sebastien Bacher on 2014-03-10

New upstream version

18. By Sebastien Bacher on 2014-02-05

New upstream version