Diffusion GpgOL 1cefdea05092

Merge branch 'STABLE-BRANCH-2-3'
1cefdea05092
Actions

Tags

None

Subscribers

None

Description

Merge branch 'STABLE-BRANCH-2-3'

Conflicts:
src/common.h
src/mail.cpp
src/windowmessages.cpp

Details

Provenance

Authored on Sep 6 2018, 5:35 PM

Parents

rO2da40322c261: Thou shalt not push before compiling
rO8fb352426228: Fallback to MAPI SubmitMessage if OOM Send fails

Branches

Unknown

Tags

Unknown

Event Timeline

• aheinecke committed rO1cefdea05092: Merge branch 'STABLE-BRANCH-2-3' (authored by • aheinecke).Sep 6 2018, 5:35 PM

Merged Changes

2da40322c261 Thou shalt not push before compiling
Author
• aheinecke
Browse Repository
No Audits
907943aec81b Try to fix crashes in MAPI SubmitMessage path
Author
• aheinecke
Browse Repository
No Audits
84fed74d4b44 Add some safeguards against NULL base msg
Author
• aheinecke
Browse Repository
No Audits
fd901436fbf9 Fix minor mem leak in format error
Author
• aheinecke
Browse Repository
No Audits
8d140cb78c79 Do not release old ref in refCurrentItem
Author
• aheinecke
Browse Repository
No Audits
7ac02373ee79 Post release version bump
Author
• aheinecke
Browse Repository
No Audits
f36a658429d7 Keep strong ref after submit message
Author
• aheinecke
Browse Repository
No Audits
4b84e078d28e Fallback to MAPI SubmitMessage if OOM Send fails
Author
• aheinecke
Browse Repository
No Audits
5853c8e2fb99 Ignore temporary recipient resolve errors
Author
• aheinecke
Browse Repository
No Audits
3db0bc6fb947 Rename autoresolveCheck to autosecureCheck
Author
• aheinecke
Browse Repository
No Audits
aec234ee13ba Fix Mail::needs_crypto_m
Author
• aheinecke
Browse Repository
No Audits

Changes (6)

Path

Size

src/

mailitem-events.cpp

parsecontroller.cpp

ribbon-callbacks.cpp

windowmessages.cpp

rO1cefdea05092

src/common.h

Loading...

src/mail.cpp

Loading...

src/mailitem-events.cpp

Loading...

src/parsecontroller.cpp

Loading...

src/ribbon-callbacks.cpp

Loading...

src/windowmessages.cpp

Loading...