~ubuntu-touch-coreapps-drivers/trojita/git-kde : changes

~ubuntu-touch-coreapps-drivers/trojita/git-kde » Changes from revision 5115

From Revision 4899 to 4880

Rev	Summary	Authors	Date
4899	Fix build with Qt 5.15.0 Fix build with Qt 5.15.0 QPainterPath is no longer included via qtransform.h (since 5.15.0-beta2, 50d2acdc93b4de2ba56eb67787e2bdcb21dd4bea in qtbase.git). Change-Id: Ibb59e769bba8514d86aa886afee26a2395d458ef	Heiko Becker	4 years ago
4898	Merge "Fix possible crash when downloading attachments" Merge "Fix possible crash when downloading attachments"	Jan Kundrát	4 years ago
4897	SVN_SILENT made messages (.desktop file) - always resolve ou... SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"	l10n daemon script	4 years ago
4896	GIT_SILENT made messages (after extraction) GIT_SILENT made messages (after extraction)	l10n daemon script	4 years ago
4895	SVN_SILENT made messages (.desktop file) - always resolve ou... SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"	l10n daemon script	4 years ago
4894	SVN_SILENT made messages (.desktop file) - always resolve ou... SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"	l10n daemon script	4 years ago
4893	GIT_SILENT made messages (after extraction) GIT_SILENT made messages (after extraction)	l10n daemon script	4 years ago
4892	SVN_SILENT made messages (.desktop file) - always resolve ou... SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"	l10n daemon script	4 years ago
4891	GIT_SILENT made messages (after extraction) GIT_SILENT made messages (after extraction)	l10n daemon script	4 years ago
4890	Merge branch 'qt-5.13-deprecations' Merge branch 'qt-5.13-deprecations' Change-Id: Icf4fda94b111a68dd9643492eb14814409a58f82	Jan Kundrát	4 years ago
4889	Merge "SMTP: Store correct password into the password manage... Merge "SMTP: Store correct password into the password manager"	Jan Kundrát	4 years ago
4888	Add credits for Lyn Perrine Add credits for Lyn Perrine Change-Id: Ic5cb7bcd8af370ad77673bbeb11abb6811ee7069	Jan Kundrát	4 years ago
4887	Fix Engrish in the layout menu Fix Engrish in the layout menu BUG: 406055 Change-Id: Icfe04b5b4a923477635abc9de04e15953e7b666f Signed-off-by: Jan Kundrát <jkt@kde.org>	Lyn Perrine	4 years ago
4886	Merge "Create a new IMAP Server Info dialog." Merge "Create a new IMAP Server Info dialog."	Jan Kundrát	4 years ago
4885	Merge "Minimize right padding in About Trojitá dialog" Merge "Minimize right padding in About Trojitá dialog"	Jan Kundrát	4 years ago
4884	Merge changes from topic 'calendar' Merge changes from topic 'calendar' * changes: GUI: detect some calendaring events Fix a typo	Jan Kundrát	4 years ago
4883	SVN_SILENT made messages (.desktop file) - always resolve ou... SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"	l10n daemon script	5 years ago
4882	GIT_SILENT made messages (after extraction) GIT_SILENT made messages (after extraction)	l10n daemon script	5 years ago
4881	Update credits with this year's contributors Update credits with this year's contributors Change-Id: I6938f555e2659ca66e5b1284f5d7167fbb74286b	Jan Kundrát	5 years ago
4880	Rename Application->Debug->Show Imap Protocol Log Rename Application->Debug->Show Imap Protocol Log Since revision 48981ed478ff51133d9498c70a4a2664610983c3 the SMTP traffic is logged when using the setting SMTP method "NETWORK", in addition to the IMAP traffic. Future proof this by renaming the menu item to Show protocol log. Change-Id: Ide80d202969ae80d05775ff787bbe563087b2ae8 GUI:	Espen Sandøy Hustad	5 years ago