[geary] (74 commits) Non-fast-forward update to branch mjog/mail-merge-plugin

[Michael Gratton <mjog src gnome org>]

The branch 'mjog/mail-merge-plugin' was changed in a way that was not a fast-forward update.
NOTE: This may cause problems for people pulling from the branch. For more information,
please see:

 https://wiki.gnome.org/Git/Help/NonFastForward

Commits removed from the branch:

  2d9f945... Plugins: Add initial MailMerge plugin outline
  9f8b09a... Application.PluginManager: Update plugin settings for depen
  20b0e6f... Components.PreferencesWindow: Update plugin rows when deps 
  87e5de6... Components.InfoBarStack: Support additional stack queue alg
  b47dfb9... Plugins: Actually implement info bar plugin priority
  67609f6... Trivial doc comment update
  fa46ede... Geary.EmailHeaderSet: Seal setting properties off from sub-
  6176536... Util.Email.strip_subject_prefixes: Convert param to EmailHe
  b1d787a... Plugin.Email: Mark Geary.EmailHeaderSet as a prerequisite
  f81ff96... Plugin.Email: Add load_body_as method and implement it
  c592b14... Plugin.MailMerge: Implement basic merge field parsing
  593f3e2... Plugin.MailMerge: Add simple CSV reader with unit tests
  da6a781... src/client/plugin/mail-merge/meson.build: Fix rpath on wron
  bd55244... Application.PluginManager: Rework context state management
  7c3748d... Application.Controller: Rework composer life-cycle, again
  a3f7a99... Plugins: Update to new composer lifecycle
  eac2878... Plugin.Button: Rename to Actionable
  511498a... Plugin.Composer: Support registering composer menu items
  45f624c... vala-unit: Minor test fixups
  035129f... Plugins.MailMerge: Initial composer mail merge support
  c48e36e... src/client: Misc minor build warning and doc comment update
  a834363... Plugin.ActionBar: New class added for plugins that use acti
  f0b1362... Composer.Widget: Place composer action bars into their own 
  d2d3e6e... Plugin.Composer: Support plugins for providing composer act
  a0adbf1... Plugin.MailMerge: Show a composer action bar after loading 
  55d0926... Composer.Widget: Make editor prop public
  da92cb8... Composer.Widget: Add focused_input_widget property
  2b97dba... Plugin.Composer: Add new action_group_name property
  5f0d201... Plugin.Composer: Add insert_text method
  cef1d71... Plugin.MailMerge: Add composer action bar menu for insertin
  9b65f26... Plugin.MailMerge: Add some missing comments to translators
  255a6d2... Application.AccountContext: Make folder context methods pub
  8678f11... Application, Plugin: Make object conversion methods consist
  0679ab2... Sidebar.Branch: Remove some harmless asserts
  d05819b... Plugin.MailMergeFolder: New virtual folder for displaying m
  6cec465... Plugin.MailMerge: Allow CSV chooser to be re-used
  a9306a8... Plugin.MailMerge: Show merge virtual folder when merging
  c22e684... Geary.Folder: Add new contains_identifiers method
  f24b65c... Geary.Account: Add {de}register_local_folder methods
  69a4490... Application.MainWindow: Fix custom folder path showing in w
  678fdb7... Fix valadoc warning
  096d6cb... Plugin.MailMerge: Register folder with the engine rather th
  39c8d80... Plugin.MailMergeFolder: Load messages from template into th

Commits added to the branch:

  403fee4... ci: flatpak: remove meson-args variable (*)
  0aeb5b1... ci: move the bundle var inline the flatpak jbo (*)
  895321d... ci: make deps of nightly job explicit (*)
  683cb33... Update Turkish translation (*)
  48e4dbf... Merge branch 'alatiera/flatpak-fixups' into 'mainline' (*)
  fe61902... Update Brazilian Portuguese translation (*)
  d280bcb... Geary.ImapDB: Use RFC822 strings for Message-Id values in t (*)
  33801f2... sql: Add migration for bad message-id data in the database (*)
  175c7dc... Geary.RFC822.MessageIDList: Add unit tests for parsing RFC8 (*)
  3e15652... Merge branch 'mjog/message-id-db' into 'mainline' (*)
  2030b2d... test: Break out engine mock objects into their own name-spa (*)
  35683dd... build: Reduce verbosity of meson vars by removing `geary_`  (*)
  6e0aa31... build: Generate client internal VAPI and build client tests (*)
  8608293... Application.AccountInterface: New interface for accessing a (*)
  2957f15... Geary.RFC822.MailboxAddresses: Update equality semantics (*)
  c41515a... Geary.RFC822.MessageIDList: Replace append with concatenate (*)
  c73888b... Geary.RFC822.MessageIDList: Support merging message id list (*)
  ea5c95b... Trivial code formatting fixup (*)
  691a239... Composer.ApplicationInterface: New composer app interface (*)
  a781e0e... Composer.WebView: Rework HTML consts so that IDs have inter (*)
  1ed1f82... Composer.Widget: Rename `get_composed_email` to `to_compose (*)
  44654e3... Composer.Widget: Rework context email loading (*)
  29ba931... Composer.Widget: Handle non-Geary HTML and plain text draft (*)
  e5bfd72... test-client: Fix test failure for new composer widget tests (*)
  e5247a2... Merge branch 'mjog/composer-context-loading-fixes' into 'ma (*)
  7be73a3... Plugins: Add initial MailMerge plugin outline
  850fe15... Application.PluginManager: Update plugin settings for depen
  6e92246... Components.PreferencesWindow: Update plugin rows when deps 
  93c1ce2... Components.InfoBarStack: Support additional stack queue alg
  c36b1d7... Plugins: Actually implement info bar plugin priority
  963c088... Trivial doc comment update
  e3e1c56... Geary.EmailHeaderSet: Seal setting properties off from sub-
  bb836ff... Util.Email.strip_subject_prefixes: Convert param to EmailHe
  1980828... Plugin.Email: Mark Geary.EmailHeaderSet as a prerequisite
  ce2bfbc... Plugin.Email: Add load_body_as method and implement it
  62d1f4e... Plugin.MailMerge: Implement basic merge field parsing
  6ca890c... Plugin.MailMerge: Add simple CSV reader with unit tests
  b32b4d8... src/client/plugin/mail-merge/meson.build: Fix rpath on wron
  81916d5... Application.PluginManager: Rework context state management
  7e5bd9c... Application.Controller: Rework composer life-cycle, again
  1bdba27... Plugins: Update to new composer lifecycle
  44c9d7c... Plugin.Button: Rename to Actionable
  dc546e9... Plugin.Composer: Support registering composer menu items
  7c308c0... vala-unit: Minor test fixups
  8e7024d... Plugins.MailMerge: Initial composer mail merge support
  08a8ea6... src/client: Misc minor build warning and doc comment update
  4c36b2a... Plugin.ActionBar: New class added for plugins that use acti
  1ad4e98... Composer.Widget: Place composer action bars into their own 
  72846b4... Plugin.Composer: Support plugins for providing composer act
  28da73f... Plugin.MailMerge: Show a composer action bar after loading 
  51e5775... Composer.Widget: Make editor prop public
  102a640... Composer.Widget: Add focused_input_widget property
  97f629c... Plugin.Composer: Add new action_group_name property
  2de4b46... Plugin.Composer: Add insert_text method
  866025d... Plugin.MailMerge: Add composer action bar menu for insertin
  27281b7... Plugin.MailMerge: Add some missing comments to translators
  96c4a07... Application.AccountContext: Make folder context methods pub
  a2614b7... Application, Plugin: Make object conversion methods consist
  ef51a1b... Sidebar.Branch: Remove some harmless asserts
  0c2e454... Plugin.MailMergeFolder: New virtual folder for displaying m
  3f30ebc... Plugin.MailMerge: Allow CSV chooser to be re-used
  5cbb1ce... Plugin.MailMerge: Show merge virtual folder when merging
  1f84b0c... Geary.Folder: Add new contains_identifiers method
  2f7d620... Geary.Account: Add {de}register_local_folder methods
  31c5909... Application.MainWindow: Fix custom folder path showing in w
  7bb1010... Fix valadoc warning
  e65298c... Geary.RFC822.MailboxAddresses: Update append methods
  02c93b8... Plugin.MailMerge: Register folder with the engine rather th
  4d0d3ee... Plugin.MailMergeFolder: Load messages from template into th
  fac5e7a... Plugin.MailMerge: Move merge field code from plugin to stan
  803302c... MailMerge: Break test source file into separate driver and 
  afe53f4... MailMerge: Put non-plugin classes in own namespace, rename 
  644506d... MailMerge.Processor: Add field parser object, use in `conta
  73be92c... MailMerge: Implement initial email merging

(*) This commit already existed in another branch; no separate mail sent