[geary] (71 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:

  4c1531a... Plugins: Add initial MailMerge plugin outline
  84a9188... Application.PluginManager: Update plugin settings for depen
  213d1d9... Components.PreferencesWindow: Update plugin rows when deps 
  cf3c77d... Components.InfoBarStack: Support additional stack queue alg
  5fe0fbc... Plugins: Actually implement info bar plugin priority
  4152b78... Trivial doc comment update
  84fd9cb... Geary.EmailHeaderSet: Seal setting properties off from sub-
  9b275b3... Util.Email.strip_subject_prefixes: Convert param to EmailHe
  872de2d... Plugin.Email: Mark Geary.EmailHeaderSet as a prerequisite
  4348d23... Plugin.Email: Add load_body_as method and implement it
  3fb1281... Plugin.MailMerge: Implement basic merge field parsing
  f08fa06... Plugin.MailMerge: Add simple CSV reader with unit tests
  fbfc484... src/client/plugin/mail-merge/meson.build: Fix rpath on wron
  64e6627... Application.PluginManager: Rework context state management
  89c1e3f... Application.Controller: Rework composer life-cycle, again
  c00c7c3... Plugins: Update to new composer lifecycle
  a330344... Plugin.Button: Rename to Actionable
  65509e2... Plugin.Composer: Support registering composer menu items
  c90a6f5... vala-unit: Minor test fixups
  026039d... Plugins.MailMerge: Initial composer mail merge support
  342cb7c... src/client: Misc minor build warning and doc comment update
  0bd1943... Plugin.ActionBar: New class added for plugins that use acti
  b68807e... Composer.Widget: Place composer action bars into their own 
  5db1a99... Plugin.Composer: Support plugins for providing composer act
  b2eb583... Plugin.MailMerge: Show a composer action bar after loading 
  97e2176... Composer.Widget: Make editor prop public
  61d0b1b... Composer.Widget: Add focused_input_widget property
  ebd07bd... Plugin.Composer: Add new action_group_name property
  b7fa380... Plugin.Composer: Add insert_text method
  2a7e184... Plugin.MailMerge: Add composer action bar menu for insertin
  c45d5a1... Plugin.MailMerge: Add some missing comments to translators
  5115e34... Application.AccountContext: Make folder context methods pub
  cab388b... Application, Plugin: Make object conversion methods consist
  5e02de2... Sidebar.Branch: Remove some harmless asserts
  ce6080c... Plugin.MailMergeFolder: New virtual folder for displaying m
  8ff1ff1... Plugin.MailMerge: Allow CSV chooser to be re-used
  24343c8... Plugin.MailMerge: Show merge virtual folder when merging

Commits added to the branch:

  e6b5beb... preferences: Set default_width to omit back button (*)
  4ca4a91... Added detach composer shortcut to UI (*)
  49f3f17... Fix broken markup in Italian help translation (*)
  1f24530... Update Catalan translation (*)
  fbef657... geary-list mailing list is obsolete (*)
  7a0b4fb... Update Catalan translations (*)
  7f63270... Update Brazilian Portuguese translation (*)
  b78dfe7... Composer.Widget: Convert references to a MessageIdList inst (*)
  537410f... Geary.RFC822.{MessageID,MessageIdList}: Throw error parsing (*)
  26f5fde... Geary.RFC822.Message: Suppress message id errors in ctors (*)
  0b8bf73... Geary.Imap.EnvelopeDecoder: Suppress message id errors (*)
  e2f2b6c... Geary.RFC822.Message: Add accessors for message headers and (*)
  6af5b2f... Geary.Email: Rework RFC822.Message.get_email into an Email  (*)
  784bac5... Geary.Imap.FolderSession: Tighten up preview generation err (*)
  c2a1bae... Geary.Memory.OffsetBuffer: Remove now unused class (*)
  53ddf81... Geary.Imap.FolderSession: Ensure Email fields updated for n (*)
  1319120... Merge branch 'mainline' into 'mainline' (*)
  75ec2fe... Merge branch 'nomailinglist' into 'mainline' (*)
  223ecd1... Update Ukrainian translation (*)
  5df1c6e... Update Swedish translation (*)
  8e33f8f... Merge branch 'diegoe_prefs-window-size' into 'mainline' (*)
  e89a5ca... Merge branch 'mjog/rfc822-cleanup-part-n' into 'mainline' (*)
  202ae88... Update Indonesian translation (*)
  3ce81ed... Update Polish translation (*)
  27a9404... .gitlab-ci.yml: Remove CI jobs after they were removed from (*)
  6424b66... Merge branch 'mjog/flatpak-ci-failure' into 'mainline' (*)
  ec4c6d3... Geary.RFC822.Message: Fix `get_body()` critical with multip (*)
  1753331... Merge branch 'mjog/crash-sending-multipart' into 'mainline' (*)
  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

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