[geary: 62/62] Merge branch 'mjog/mail-merge-plugin' into 'mainline'




commit 858487d1781ed38c10d75476b50b106e7fff6284
Merge: cb648cd83 c3c134f09
Author: Michael Gratton <mike vee net>
Date:   Tue Aug 18 07:03:05 2020 +0000

    Merge branch 'mjog/mail-merge-plugin' into 'mainline'
    
    Mail merge plugin
    
    Closes #660
    
    See merge request GNOME/geary!541

 po/POTFILES.in                                     |   3 +-
 .../application/application-account-context.vala   |   8 +-
 src/client/application/application-client.vala     |  29 +-
 src/client/application/application-controller.vala | 152 ++---
 .../application-email-plugin-context.vala          |  28 +-
 .../application-email-store-factory.vala           | 106 +++-
 .../application-folder-plugin-context.vala         |  28 +-
 .../application-folder-store-factory.vala          |  16 +-
 .../application/application-main-window.vala       | 166 ++---
 .../application-notification-plugin-context.vala   |  28 +-
 .../application/application-plugin-manager.vala    | 677 +++++++++++++++------
 .../components/components-info-bar-stack.vala      |  77 ++-
 src/client/components/components-info-bar.vala     |  79 ++-
 .../components/components-preferences-window.vala  | 121 ++--
 src/client/composer/composer-widget.vala           |  61 +-
 src/client/meson.build                             |   3 +-
 .../desktop-notifications.vala                     |   2 +-
 .../plugin/email-templates/email-templates.vala    |  30 +-
 .../plugin/folder-highlight/folder-highlight.vala  |   4 +-
 src/client/plugin/mail-merge/mail-merge-csv.vala   | 228 +++++++
 .../plugin/mail-merge/mail-merge-folder.vala       | 404 ++++++++++++
 .../plugin/mail-merge/mail-merge-processor.vala    | 271 +++++++++
 .../mail-merge/mail-merge-test-processor.vala      | 180 ++++++
 .../plugin/mail-merge/mail-merge-test-reader.vala  | 160 +++++
 src/client/plugin/mail-merge/mail-merge-test.vala  |  33 +
 .../plugin/mail-merge/mail-merge.plugin.desktop.in |   5 +
 src/client/plugin/mail-merge/mail-merge.vala       | 511 ++++++++++++++++
 src/client/plugin/mail-merge/meson.build           |  65 ++
 src/client/plugin/meson.build                      |   1 +
 .../plugin/messaging-menu/messaging-menu.vala      |   6 +-
 src/client/plugin/plugin-action-bar.vala           | 184 ++++++
 src/client/plugin/plugin-actionable.vala           |  64 ++
 src/client/plugin/plugin-application.vala          |  59 +-
 src/client/plugin/plugin-button.vala               |  36 --
 src/client/plugin/plugin-composer.vala             | 132 +++-
 src/client/plugin/plugin-email-store.vala          |   4 +-
 src/client/plugin/plugin-email.vala                |  46 +-
 src/client/plugin/plugin-folder-store.vala         |   4 +-
 src/client/plugin/plugin-folder.vala               |   2 +-
 src/client/plugin/plugin-info-bar.vala             |  13 +-
 .../plugin/special-folders/special-folders.vala    |  17 +-
 src/client/sidebar/sidebar-branch.vala             |  25 +-
 src/client/util/util-email.vala                    |  21 +-
 src/engine/api/geary-account.vala                  |  36 ++
 src/engine/api/geary-composed-email.vala           |  62 +-
 src/engine/api/geary-email-header-set.vala         |  26 +-
 src/engine/api/geary-email.vala                    | 105 ++--
 src/engine/api/geary-folder.vala                   |  14 +
 src/engine/app/app-search-folder.vala              |  12 +
 src/engine/imap-db/imap-db-folder.vala             |  49 ++
 .../imap-engine/imap-engine-generic-account.vala   | 116 +++-
 .../imap-engine/imap-engine-minimal-folder.vala    |   9 +
 src/engine/outbox/outbox-folder.vala               |  51 +-
 src/engine/rfc822/rfc822-mailbox-addresses.vala    |  55 +-
 src/engine/rfc822/rfc822-message.vala              |  81 +--
 subprojects/vala-unit/src/test-assertions.vala     |  25 +-
 .../rfc822/rfc822-mailbox-addresses-test.vala      |  15 +
 test/mock/mock-account.vala                        |  12 +
 test/mock/mock-folder.vala                         |  11 +
 ui/composer-widget.ui                              |  26 +-
 ui/conversation-message.ui                         |   1 +
 ui/geary.css                                       |   8 +
 62 files changed, 4027 insertions(+), 776 deletions(-)
---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]