commit 7b5b5d7332409b116c9621e088490f4449a57ac2 Author: Thomas Baumgart Date: Sun Jun 14 11:34:25 2020 +0200 Bumped version to 5.1.0 commit 9a104e1be3617b5ecfda9753ffa8d71c9d5458d8 Author: Thomas Baumgart Date: Sat Jun 13 08:25:03 2020 +0200 Fix crash in CSV importer Make sure to always use an up-to-date pointer to the profile object and update the current memo selection whenever the wizard page is entered. BUG: 422200 FIXED-IN: 5.1.0 (cherry picked from commit 1bcad05dcab4b1389b2ee86a2d81660df20e7cd2) commit 73665ac91fe9a57a64174e21fcd532a4b20ac374 Author: l10n daemon script Date: Sat Jun 13 06:52:42 2020 +0200 GIT_SILENT made messages (after extraction) commit ab64742861fb347411f0d377da4e476e074e164e Author: Dawid Wróbel Date: Fri Jun 12 09:52:37 2020 -0400 macOS: fix missing app version - define RELEASE_SERVICE_VERSION variable and respective segments - remove obsolete CFBundleLongVersionString usage commit 91256156b28c64f6023b442ef6e7a24d202e2453 Author: Dawid Wróbel Date: Fri Jun 12 01:53:55 2020 -0400 macOS: Add an UTI declaration for .kmy file commit f4a58029dbca32626c732e6740c8ad366ed18bd1 Author: Dawid Wróbel Date: Fri Jun 12 01:52:44 2020 -0400 macOS: set current copyright year automatically commit 6cdd74241d83351088a5d7b29bea4de2f5fea883 Author: Dawid Wróbel Date: Fri Jun 12 01:51:30 2020 -0400 macos: associate app with supported file types commit a44579f623488f80ca0b234ac31d582fbee544cf Author: Dawid Wróbel Date: Thu Jun 11 23:01:54 2020 -0400 Enforce Light macOS appearance until Dark is fixed Related to: #1 commit 3b0127d9abc7d458f0d04cb24fb3daacc8217a9d Author: Thomas Baumgart Date: Thu Jun 11 10:09:24 2020 +0200 Update 3rdparty/README.md with new git location (cherry picked from commit 5a9badd6b5c1b5073db00422c5021934c77f3c53) commit 721259359ac24d770fa43b76c8ab4f33af5da17d Merge: d5fd976a8 373f00f64 Author: Dawid Wróbel Date: Wed Jun 10 10:14:59 2020 -0400 Merge branch '2-improve-icons-consistency' into 5.1 commit 373f00f64cab5005bc40e72605b4c12a5cc58820 Author: Dawid Wróbel Date: Wed Jun 10 10:12:35 2020 -0400 Revert the QIcon::fallbackSearchPath() usage We're still supporting QT 5.9 for the time being commit d5fd976a8e53b0e01881949a557a26e1d03d1c51 Author: l10n daemon script Date: Wed Jun 10 08:05:08 2020 +0200 GIT_SILENT made messages (after extraction) commit c58fb4a2d3b28b194ab0bea02dacdbc9809619dd Merge: b92412cd7 3a41ffed3 Author: Dawid Wróbel Date: Tue Jun 9 23:35:30 2020 -0400 Merge branch '5.1' into 2-improve-icons-consistency commit b92412cd70e70273590fc8d7cb3978f18931b8db Author: Dawid Wróbel Date: Tue Jun 9 23:34:08 2020 -0400 Fix: system icon choice was being ignored commit 3a41ffed334ab547af1f3e16c3d4d9a19b225dd1 Author: l10n daemon script Date: Tue Jun 9 07:56:54 2020 +0200 GIT_SILENT made messages (after extraction) commit 932175d47e0d0561fd458fc0bd8ed35d5abfeb2a Author: l10n daemon script Date: Mon Jun 8 07:49:28 2020 +0200 GIT_SILENT made messages (after extraction) commit dff28d59cd766cae174551d117b3b0c1f59f7a59 Author: l10n daemon script Date: Sun Jun 7 07:41:46 2020 +0200 GIT_SILENT made messages (after extraction) commit aca92f87dab37473a4da9c42e6725719bd27ffcf Author: Thiago Sueto Date: Sat Jun 6 21:15:14 2020 +0000 Apply suggestion to kmymoney/org.kde.kmymoney.appdata.xml (cherry picked from commit 10e57dccb037799a975fc42385d42ff34cc7ff6c) commit 8af9177f6f2968c77c476940c225f82b2ab87b2d Author: Thiago Sueto Date: Sat Jun 6 20:01:30 2020 +0000 Update org.kde.kmymoney.appdata.xml (cherry picked from commit 40b2bd251abaa0a52664ca40503dfa7400e28b78) commit d58c994bceebe0a03f8355d6f96c0a97e150fd95 Author: Thiago Sueto Date: Sat Jun 6 19:33:57 2020 +0000 Update org.kde.kmymoney.appdata.xml (cherry picked from commit 0dbce93f180e4c0362a2752462861bb0be74a385) commit 402c82a329bb9cd2872dc32f7e716a3bbd5ac315 Author: Thomas Baumgart Date: Sat Jun 6 08:47:39 2020 +0200 Fix ui version information New xmlgui menu item entries have been added with commit 78c03decc0296d6464fbb74718992919a13952d4 but the version of the file was not increased. This causes the new menu items to remain hidden when a user has a modified local version of the file as a result of local setting modifications (toolbar, shortcuts, etc.). Increasing the version number should solves the problem. (cherry picked from commit cf22aec49f73064f7bfffeb452cb76122efefb4b) commit c26e73b1b51b3e3cd6b6470c3efae440aaa84761 Author: Thomas Baumgart Date: Fri Jun 5 19:48:44 2020 +0200 Fix search widget in the Budgets view ignoring user input All Income and Expense categories were displayed in the Budgets view, irrespective of what the user entered in the search widget. This commit fixes budget category filtering. BUG: 422480 FIXED-IN: 5.1.0 Signed-off-by: Robert Szczesiak (cherry picked from commit a6fd92a8c05d10a8f3c2790bbfbd6cee62683186) commit ff2c37b7b9a94bcdd082359a42fd3578d58893b1 Author: Thomas Baumgart Date: Fri Jun 5 14:09:48 2020 +0200 Bump version as preparation for release commit c307ad6eea06dace6bec38712831453b5d8e1f5e Author: l10n daemon script Date: Mon Jun 1 09:51:59 2020 +0200 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" commit a0cac219f56cda6e53d4278ead3853f30c5c14cf Author: l10n daemon script Date: Mon Jun 1 08:25:43 2020 +0200 GIT_SILENT made messages (after extraction) commit b344027ff46eed9cff6aab3466d815b852cbe5d1 Merge: bb40d86dd d0ad2084c Author: Thomas Baumgart Date: Sun May 31 11:59:21 2020 +0200 Merge remote-tracking branch 'origin/5.0' commit bb40d86dd4e2af94c616b3587358d19bd69d29ec Author: Yuri Chornoivan Date: Fri May 29 20:38:05 2020 +0300 Fix minor typos, minor formatting fix commit d2d353546d5e65b6019c89dd2e1ceb36e0896d1a Author: Jack Ostroff Date: Fri May 29 14:39:24 2020 +0000 Update currencies and tags chapters of handbook for 5.0 commit d0ad2084cf150daa3d86acc1080f5b093b72dba7 Merge: a25f99a75 3da0a4556 Author: Dawid Wróbel Date: Fri May 29 10:08:10 2020 -0400 Merge remote-tracking branch 'origin/5.0' into 2-improve-icons-consistency commit 3da0a455682e0a7e747f8659a3437473a34431e0 Author: Dawid Wróbel Date: Thu May 28 20:28:10 2020 -0400 Remove unused and obsolete KIconLoader include commit ec9fed94aa4a09c33ff12915ee2e8a4afcdbd2e9 Author: Dawid Wróbel Date: Thu May 28 20:27:04 2020 -0400 Remove explicit icon usage from kmymoneyui.rc commit 99d68604a51e60672697bf12e7c247bd26f3b40e Author: Dawid Wróbel Date: Thu May 28 20:26:18 2020 -0400 Better icon for Performance Test commit 9c4f2544ecc4225d64e8eb46aef7ec09624743c2 Author: Dawid Wróbel Date: Wed May 27 18:09:48 2020 -0400 Stock "Find" icon will do for finding transactions commit 96d4a5b50ab53a98ab0e82a4b28364811fdb576f Author: Dawid Wróbel Date: Wed May 27 17:35:25 2020 -0400 Continue refactoring for saner Icon names - remove "View" prefix from icon names - remove duplicate icons - add plural/singular icon names where applicable - rename icons where applicable (Transfer -> Transaction, etc.) commit ea455c7caae535c5fcae1deb91aa659cca6dea2d Author: Dawid Wróbel Date: Wed May 27 16:24:36 2020 -0400 Better OpenDatabase icon commit 3b6f970866abea8e6f7a2fd18fee6fece862bf53 Author: Dawid Wróbel Date: Wed May 27 16:18:24 2020 -0400 Add th "Select All" action icon commit baa5213127ccd62a4520dde07bc95152062709ff Author: Dawid Wróbel Date: Wed May 27 11:27:16 2020 -0400 Rename Icon::TaskAttention to Warning - we don't have a "task-attention" icon at all - there is an "attention" icon, but let's use the standard freedesktop "dialog-warning" instead commit 6f3830f065c55fb850b6b6f60786607ef695bb20 Author: Dawid Wróbel Date: Wed May 27 11:05:23 2020 -0400 Remove unused and redundant Icon::AccountUpdateMenu commit ba277d882d66b126095c86a89cebe67cd4a4e1c0 Author: Dawid Wróbel Date: Wed May 27 11:01:09 2020 -0400 Oxygen Payee-rename icon exists, so use it commit 4dd414d838b2de4250266d60824985e17354bfc8 Author: Dawid Wróbel Date: Wed May 27 11:00:40 2020 -0400 Rename Icon::ToolUpdatePrices to InvestmentOnlinePriceAll For consistency with InvestmentOnlinePrice commit e95789eb358b1e1ed5c0646aa89b979262f038cd Author: Dawid Wróbel Date: Wed May 27 10:10:54 2020 -0400 Fix a typo in filename commit 9321e2f3435b2056845549c3b8c1ac4525e403da Author: Dawid Wróbel Date: Sun May 24 14:19:31 2020 -0400 Use Icons::get() in PasswordToggle passwordtoggle.cpp class uses QIcon::fromTheme() directly. Make it use our own Icons::get() wrapper instead. commit 8f5bd971184f809e7717378028210dbded7aa168 Author: Dawid Wróbel Date: Sun May 17 15:41:09 2020 -0400 Fix a typo commit a065642c6971711c3da4089b2852b4d32e5664d5 Author: Dawid Wróbel Date: Sun May 17 15:39:27 2020 -0400 Fix the underscores in filenames commit ecfcaf4349eefbc26674c7961268acb136d72635 Author: Dawid Wróbel Date: Sat May 16 21:37:37 2020 -0400 Use saner Icon names. commit 702d8cc8d4bf28035f0786c5e8e30c6c0f4574ed Author: Dawid Wróbel Date: Sat May 16 20:44:09 2020 -0400 Simplify icon mapping code - Breeze is the mandatory theme on macOS and Windows, so make it explicit - setThemeName() is only supported on non macOS/Windows platforms - Add a single iconMappings container for all Icons::Icon enums to theme mappings - remove the KDE icons distinction – keep things simple and replace it with Oxygen and Breeze seperate mappings. - simplify the convoluted setIconThemeNames() mapping logic commit 58ef131ea94ebb8d3b64ec7246e172609bd4f6d3 Author: Robert Szczesiak Date: Thu May 28 21:41:07 2020 +0200 Add copyright commit 8ae14acc9e894f07bffd1532d67be497ef7a9493 Author: Robert Szczesiak Date: Thu May 28 21:39:34 2020 +0200 Fix budget view displaying all account types In the Budgets view all account types, including Asset, Liability, and Equity, were displayed. This commit solves the issue so that only Income and Exponse catergories are displayed in the Budgets view. BUG: 422196 Signed-off-by: Robert Szczesiak commit a25f99a75ce9aa4d02aa24fb6ceba4fe8035ba36 Author: Dawid Wróbel Date: Thu May 28 20:28:10 2020 -0400 Remove unused and obsolete KIconLoader include commit ad138a266161a4b00ed194b125f59c3711aeb016 Author: Dawid Wróbel Date: Thu May 28 20:27:04 2020 -0400 Remove explicit icon usage from kmymoneyui.rc commit a9c7db16fd6d59285b4a9a6f3fbd29f699ff235d Author: Dawid Wróbel Date: Thu May 28 20:26:18 2020 -0400 Better icon for Performance Test commit 9870e864fbd713b3c75f24fe461dca1b17ea2d5c Author: Robert Szczesiak Date: Tue May 26 12:37:19 2020 +0000 Fix report's chart cluttered with overlapping data labels When there was too many data labels on a report's chart, some texts were overlapping resulting in cluttered and unreadable graph. This commit fixes the issue so that in regions crowded with labels only one data label text is displayed. BUG: 399261 Signed-off-by: Robert Szczesiak (cherry picked from commit 3bf120d2b2ae461c02d20e7f84b1f87a680f61dd) commit 5890262ec7a1f1a63415087b0e3a84a839ec3708 Author: Dawid Wróbel Date: Wed May 27 18:09:48 2020 -0400 Stock "Find" icon will do for finding transactions commit f8b1b5541903e669ecd95034efac6495b5a2fc24 Author: Dawid Wróbel Date: Wed May 27 17:35:25 2020 -0400 Continue refactoring for saner Icon names - remove "View" prefix from icon names - remove duplicate icons - add plural/singular icon names where applicable - rename icons where applicable (Transfer -> Transaction, etc.) commit 37ff6967f882a2adde4d11def6c85c2f5cf70e54 Author: Dawid Wróbel Date: Wed May 27 16:24:36 2020 -0400 Better OpenDatabase icon commit 5d58b2dc7042eea3227e8ab7c58f9432811a479b Author: Dawid Wróbel Date: Wed May 27 16:18:24 2020 -0400 Add th "Select All" action icon commit cd6001c4b16e2a992597fe20a8a381cd3f81d7a1 Author: Dawid Wróbel Date: Wed May 27 11:27:16 2020 -0400 Rename Icon::TaskAttention to Warning - we don't have a "task-attention" icon at all - there is an "attention" icon, but let's use the standard freedesktop "dialog-warning" instead commit 453f311f79a76ea5f4d5ecc54f3a75c0383923c5 Author: Dawid Wróbel Date: Wed May 27 11:05:23 2020 -0400 Remove unused and redundant Icon::AccountUpdateMenu commit d03ccbc8c785bc32c1c2cdcfe6f561d0706a7ecb Author: Dawid Wróbel Date: Wed May 27 11:01:09 2020 -0400 Oxygen Payee-rename icon exists, so use it commit 1e169a2cac73104ec33e726081db1b4c0f6433fd Author: Dawid Wróbel Date: Wed May 27 11:00:40 2020 -0400 Rename Icon::ToolUpdatePrices to InvestmentOnlinePriceAll For consistency with InvestmentOnlinePrice commit 5deeaf3ab5d54ca3817eb4343c296fc2077f20fe Author: Dawid Wróbel Date: Wed May 27 10:10:54 2020 -0400 Fix a typo in filename commit 3bf120d2b2ae461c02d20e7f84b1f87a680f61dd Author: Robert Szczesiak Date: Tue May 26 14:37:19 2020 +0200 Fix report's chart cluttered with overlapping data labels When there was too many data labels on a report's chart, some texts were overlapping resulting in cluttered and unreadable graph. This commit fixes the issue so that in regions crowded with labels only one data label text is displayed. BUG: 399261 Signed-off-by: Robert Szczesiak commit 1579c7de6023725b67e1ec0acb741f9ef7d939d4 Merge: 6500fa8cc 5c3505f00 Author: Dawid Wróbel Date: Sun May 24 16:44:29 2020 -0400 Merge branch '5.0' into 2-improve-icons-consistency commit 6500fa8cc23df3529e494e811e697a60e8a7def8 Merge: a6db556dc 7d54d8f0c Author: Dawid Wróbel Date: Sun May 24 15:55:51 2020 -0400 Merge branch '5.0' into 2-improve-icons-consistency commit a6db556dc0a052c59103657d93d54412b554b4e3 Author: Dawid Wróbel Date: Sun May 24 14:19:31 2020 -0400 Use Icons::get() in PasswordToggle passwordtoggle.cpp class uses QIcon::fromTheme() directly. Make it use our own Icons::get() wrapper instead. commit 5c3505f00cecb57ae89316ec7930990dc85ad400 Author: Thomas Baumgart Date: Sun May 24 19:38:05 2020 +0200 Set the minimum unit of KRW into 1 Although the subdivision of South Korean Won exists de jure, it is de facto not used in bank statements and stock price tickers. Only in foreign exchange markets the subdivision is used but they are rounded down when it becomes to accounting. Thus adjust the precision of South Korean Won to 1. BUG: 420683 FIXED-IN: 5.0.9 (cherry picked from commit 8025e549001ebbdbe3f2aa09074dd5a23ed06836) commit d65ae5a6dd8d7e4050a04e2dcea1fe63ffb66782 Author: Thomas Baumgart Date: Sun May 24 19:37:41 2020 +0200 Fix incorrect account hierarchy if the account is marked as preferred When an account was marked as preferred and the user edited it, the account was moved in the hierarchy tree even though the user did not enter the Hierarchy tab to change anything. When the user opened the Hierarchy tab, there was Favorites category displayed but it should not. This commit solves the issue so that a preferred account is not moved when the user does not want it to. The Favorites catergory is now not displayed in the Hierarchy tab. BUG: 422012 FIXED-IN: 5.0.9 Signed-off-by: Robert Szczesiak (cherry picked from commit 5412d8e32c85485f047127fb2b0e2edfff53ddb4) commit 8025e549001ebbdbe3f2aa09074dd5a23ed06836 Author: Shinjo Park Date: Sun May 24 16:51:48 2020 +0200 Set the minimum unit of KRW into 1 Although the subdivision of South Korean Won exists de jure, it is de facto not used in bank statements and stock price tickers. Only in foreign exchange markets the subdivision is used but they are rounded down when it becomes to accounting. Thus adjust the precision of South Korean Won to 1. BUG: 420683 commit 5412d8e32c85485f047127fb2b0e2edfff53ddb4 Author: Robert Szczesiak Date: Sun May 24 17:36:26 2020 +0000 Fix incorrect account hierarchy if the account is marked as preferred When an account was marked as preferred and the user edited it, the account was moved in the hierarchy tree even though the user did not enter the Hierarchy tab to change anything. When the user opened the Hierarchy tab, there was Favorites category displayed but it should not. This commit solves the issue so that a preferred account is not moved when the user does not want it to. The Favorites catergory is now not displayed in the Hierarchy tab. BUG: 422012 Signed-off-by: Robert Szczesiak commit 70b48c8da2499f33665574ad7b47fdb8d270893a Author: Thomas Baumgart Date: Fri May 22 20:18:27 2020 +0200 Fix SEGFAULT occurring when marking an account as preferred Segmentation fault occurred when the user added or edited an account with "Preferred Account" checkbox checked. This commit solves the issue so that the user can add/remove preferred accounts from Favorites without encountering SEGFAULT. BUG: 421900 FIXED-IN: 5.0.9 Signed-off-by: Robert Szczesiak (cherry picked from commit 13f50ceebd72bf4e23a633f3c6e052a26e44581d) commit 13f50ceebd72bf4e23a633f3c6e052a26e44581d Author: Robert Szczesiak Date: Fri May 22 18:10:37 2020 +0000 Fix SEGFAULT occurring when marking an account as preferred Segmentation fault occurred when the user added or edited an account with "Preferred Account" checkbox checked. This commit solves the issue so that the user can add/remove preferred accounts from Favorites without encountering SEGFAULT. BUG: 421900 Signed-off-by: Robert Szczesiak commit 1500f2638f71b4164f36f05eed5c145c14bca65f Author: Thomas Baumgart Date: Thu May 21 14:58:09 2020 +0200 Resolve compiler warnings commit 9e1e074d0a2232d6528b64567e7424956da70aee Author: Thomas Baumgart Date: Thu May 21 13:32:21 2020 +0200 Fix transaction filter due to compiler issue with g++ 10 g++ version 10 seems to have a problem with our ancient union and struct based bitmap handling. Changing it to be based on QFlags solves the problem. BUG: 420761 FIXED-IN: 5.0.9 (cherry picked from commit a8386dc173f51fd56c5c9e42fef5fa5f2df477b7) commit a8386dc173f51fd56c5c9e42fef5fa5f2df477b7 Author: Thomas Baumgart Date: Thu May 21 13:31:00 2020 +0200 Fix transaction filter due to compiler issue with g++ 10 g++ version 10 seems to have a problem with our ancient union and struct based bitmap handling. Changing it to be based on QFlags solves the problem. BUG: 420761 commit 28a366b94ebdcbe73c302bf5f73b60771ef39959 Author: Yuri Chornoivan Date: Wed May 20 19:37:53 2020 +0300 GIT_SILENT: move icon commit 4b5cae3061d0dc4db201efe64b26df07c49357f9 Author: Yuri Chornoivan Date: Wed May 20 19:36:48 2020 +0300 GIT_SILENT: add KMyMoney icon as repository logo commit 7d54d8f0c96e11a9d36545fa3ee1a89b1eb3c3bb Author: Thomas Baumgart Date: Tue May 19 22:06:38 2020 +0200 Update start date of scheduled transactions In case an end date was specified for a scheduled transaction and the next due date was changed by the user after the scheduled transaction was created, the date of the following transactions was not updated. This change makes sure that the following transactions are also shown and executed based on the updated date information. BUG: 421750 FIXED-IN: 5.0.9 (cherry picked from commit fdb3b3ba1b47ca8345c04fd24a79af6ee9c8cdd0) commit cc39e19fe91d7c118b0ce9d7e7b57d5c6e806c6f Author: Thomas Baumgart Date: Tue May 19 22:04:43 2020 +0200 Fix setup of default file extension in Save as dialog The default file extension was not setup correctly in all circumstances. This change makes sure to extract the filetype from all known formats. BUG: 421757 FIXED-IN: 5.0.9 (cherry picked from commit 5f7b325274c0535b68aca58819273e13e6a8d2b5) commit f2d298cb295637f9be21f9df2c89365e7c1311cf Merge: 5f7b32527 fdb3b3ba1 Author: Thomas Baumgart Date: Tue May 19 20:43:27 2020 +0200 Merge branch 'fix-421750' commit fdb3b3ba1b47ca8345c04fd24a79af6ee9c8cdd0 Author: Thomas Baumgart Date: Tue May 19 18:26:00 2020 +0200 Update start date of scheduled transactions In case an end date was specified for a scheduled transaction and the next due date was changed by the user after the scheduled transaction was created, the date of the following transactions was not updated. This change makes sure that the following transactions are also shown and executed based on the updated date information. commit 5f7b325274c0535b68aca58819273e13e6a8d2b5 Author: Thomas Baumgart Date: Tue May 19 17:23:49 2020 +0200 Fix setup of default file extension in Save as dialog The default file extension was not setup correctly in all circumstances. This change makes sure to extract the filetype from all known formats. BUG: 421757 FIXED-IN: 5.0.9 commit 98a4274229cf4621e29be040cba50988538a1095 Merge: 6e1746e3d 509ab4e82 Author: Thomas Baumgart Date: Mon May 18 20:58:20 2020 +0200 Merge remote-tracking branch 'origin/5.0' commit 509ab4e82ceea3da029c64de64fa7147781953a5 Author: Thomas Baumgart Date: Mon May 18 20:41:09 2020 +0200 Fix new account wizard not asking if the user wants to add a new payee When the user entered a new payee name in the New Account Wizard and then changed focus to another form field by clicking the mouse, the user was not asked if he or she wanted to add the new payee. The pop-up question window appeared correctly if focus was changed by keyboard (e.g. by pressing the Tab key). This commit fixes the issue so that the user is asked about adding the new payee when focus is lost due to a mouse click event. BUG: 421691 FIXED-IN: 5.0.9 (cherry picked from commit 6e1746e3d6ea238b435490881c6241c2a5bcfe18) commit 6e1746e3d6ea238b435490881c6241c2a5bcfe18 Author: Robert Szczesiak Date: Sun May 17 22:28:29 2020 +0200 Fix new account wizard not asking if the user wants to add a new payee When the user entered a new payee name in the New Account Wizard and then changed focus to another form field by clicking the mouse, the user was not asked if he or she wanted to add the new payee. The pop-up question window appeared correctly if focus was changed by keyboard (e.g. by pressing the Tab key). This commit fixes the issue so that the user is asked about adding the new payee when focus is lost due to a mouse click event. BUG: 421691 commit 25300bce41442139af6914f0340163aa00fc72c1 Author: Dawid Wróbel Date: Sun May 17 15:41:09 2020 -0400 Fix a typo commit 75a247e1f98f27c15e10ebcb1fd62d0bd260c9d2 Author: Dawid Wróbel Date: Sun May 17 15:39:27 2020 -0400 Fix the underscores in filenames commit 4b1201af1533da0372a6c96eb66bc93125e756f9 Author: Dawid Wróbel Date: Sat May 16 21:37:37 2020 -0400 Use saner Icon names. commit 87602453015d3f152881a62c3c2e09fb155eca0c Author: Dawid Wróbel Date: Sat May 16 20:44:09 2020 -0400 Simplify icon mapping code - Breeze is the mandatory theme on macOS and Windows, so make it explicit - setThemeName() is only supported on non macOS/Windows platforms - Add a single iconMappings container for all Icons::Icon enums to theme mappings - remove the KDE icons distinction – keep things simple and replace it with Oxygen and Breeze seperate mappings. - simplify the convoluted setIconThemeNames() mapping logic commit c66fbc048b73037c19aede29ee56b8c564c9b3ac Author: Robert Szczesiak Date: Sat May 16 09:06:04 2020 +0200 Fix New Account Wizard throws exception on empty payment method selected Summary: "Invalid payment type for schedule" was thrown when the user proceeded through Credit Card Schedule Page leaving empty payment method (default). This commit: * sets default credit card payment method to "Direct debit", * fixes incorrect Next button tooltip messages on the Schedule page. BUG: 421569 FIXED-IN: 5.0.9 Reviewers: tbaumgart Reviewed By: tbaumgart Subscribers: ostroffjh Tags: #kmymoney Differential Revision: https://phabricator.kde.org/D29776 commit 607f2bb6f5c4e255c0e5a5ec144cde8a6bbbfb01 Merge: 58e7dfa7b 3f623b353 Author: Thomas Baumgart Date: Thu May 14 19:53:40 2020 +0200 Merge remote-tracking branch 'origin/5.0' commit 3f623b353c7c18f5ef673842389161374d1e97d5 Author: Robert Szczesiak Date: Thu May 14 19:28:32 2020 +0200 Fix Account context menu's Reconcile option opens incorrect ledger Summary: Selecting the 'Reconcile...' option from account's context menu in the Accounts view would open ledger of the last account viewed in the Ledgers view, not of the account selected in the Accounts view. This commit fixes the issue so that the 'Reconcile...' option opens correct ledger. BUG: 421307 FIXED-IN: 5.0.9 Reviewers: tbaumgart Reviewed By: tbaumgart Tags: #kmymoney Differential Revision: https://phabricator.kde.org/D29614 commit 7000ad415ad66fda35b0513afb91995643e6f808 Author: Dawid Wróbel Date: Wed May 13 21:49:52 2020 -0400 Fix broken build after incomplete cherry-pick merge commit cb3e2d1f61d4f6b5a89145d74a8fc3e802040344 Author: Dawid Wróbel Date: Wed May 13 00:27:43 2020 -0400 Streamline CSV importer's icons Match CSV importer's icons with other importers and KMyMoney. Remove unused declarations. commit c80ea8bc4b4fd0822ad89abea806b06925b80a22 Author: Dawid Wróbel Date: Tue May 12 22:02:35 2020 -0400 Use saner Icon names. Icon enum members should be named after the context in which they are actually used in, not after the theme icon names arbitrarily chosen to represent them. commit 30223df58f2b58587a3726ad1ef9f3d389f4e121 Author: Dawid Wróbel Date: Tue May 12 20:32:39 2020 -0400 Move icon handling to a separate function commit 1022c226c53fe7ae5d9601cc9f209ff6ac027a3d Author: Dawid Wróbel Date: Tue May 12 20:11:59 2020 -0400 Fix custom icons missing on macOS Custom icons were not being loaded on macOS after the 9b27c432e commit that changed their installation location from icons/ to kmymoney/icons/. This fix makes the relative path used to locate the icons platform-specific. commit 23219c7b66dfc71cd6c137c8327a5efdd3603c64 Author: Dawid Wróbel Date: Wed Mar 25 17:00:09 2020 -0400 Use unary minus operator to negate values in negateShares() and negateValue() commit 8007a891881153a0a266f0cff9c01c094b5117f9 Author: Dawid Wróbel Date: Mon Mar 23 21:03:37 2020 -0400 Add negateShares() to MyMoneySplit; Also negate shares value when reversing transaction commit 78c03decc0296d6464fbb74718992919a13952d4 Author: Dawid Wróbel Date: Fri Mar 20 12:39:50 2020 -0400 Add an option to add a reversing transaction to the one(s) currently selected: - add negateValue() to MyMoneySplit which does exactly that. - add reverse() to MyMoneyTransaction which negates value of all its splits, effectively reversing the transaction. - refactor slotDuplicateTransaction(reverse bool) to optionally handle the reversing. Assuming typical use case being to transfer the reversed amount to an income/expense category, the reversed transaction has the same date as the original. - add Icon::Reverse commit 58e7dfa7b35772aa3eb6cf63c98797e5890ffc35 Author: Dawid Wróbel Date: Wed May 13 00:27:43 2020 -0400 Streamline CSV importer's icons Match CSV importer's icons with other importers and KMyMoney. Remove unused declarations. commit 7e96fd315724a02cf3e8fb69c5d2be5df637ef6d Author: Dawid Wróbel Date: Tue May 12 22:02:35 2020 -0400 Use saner Icon names. Icon enum members should be named after the context in which they are actually used in, not after the theme icon names arbitrarily chosen to represent them. commit 316d4ff293f57085cf6dc3970b094f68de16418f Author: Dawid Wróbel Date: Tue May 12 20:32:39 2020 -0400 Move icon handling to a separate function commit 9b92214d03e4763fdad3f095be9bd64b7adab378 Author: Dawid Wróbel Date: Tue May 12 20:11:59 2020 -0400 Fix custom icons missing on macOS Custom icons were not being loaded on macOS after the 9b27c432e commit that changed their installation location from icons/ to kmymoney/icons/. This fix makes the relative path used to locate the icons platform-specific. commit 650d68b395dcd87dfa41294565d86d0fdbfcbab4 Author: Thomas Baumgart Date: Sun May 10 07:57:16 2020 +0200 Use the correct institution in reports When an account has no institution assigned the one of the top-level account was used in some reports. This leads to wrong results in case of investments which don't have an institution assigned but should use the one of the parent investment account. This worked as long as the investment account itself was the top-level account. In case the investment account itself was a sub-account to a top-level account or even further down in the account hierarchy, the institution was always taken from the top-level account. This change fixes the problem by walking up the hierarchy and using the first institution found. BUG: 421260 FIXED-IN: 5.0.9 commit dcc4375e12157fdb046ce1e71e363bda5f9f362e Author: Thomas Baumgart Date: Sun May 10 07:50:01 2020 +0200 Fix typo in comment commit ba7363ab6ae8d374dbd4cb7514b944edc24e8101 Merge: 015909c1c 8e5e9d7d8 Author: Thomas Baumgart Date: Sat May 9 12:00:23 2020 +0200 Merge remote-tracking branch 'origin/5.0' commit 8e5e9d7d8842c3b6bc1f9c0f0d4ae627a0c9c679 Author: Thomas Baumgart Date: Sat May 9 10:46:07 2020 +0200 Do not override statement logfiles In case import statement logging is enabled and an imported file contains multiple statement only the last one is kept. This change will make sure that the logfiles do not override each other. commit fc3926479ed186ae2166e6701d267eb0b3f09a07 Author: Thomas Baumgart Date: Sat May 9 06:55:11 2020 +0200 Detect brokerage account based on partial name The detection of a brokerage account connected to an investment account did not work if the brokerage account was not a top-level account (sub-account of Asset or Liability). This change allows to locate the brokerage account based on its name in any hierarchical level of the account structure. BUG: 350360 FIXED-IN: 5.0.9 commit 06c11e35e04eef6f3be86698e2c11c3da97b2925 Author: Thomas Baumgart Date: Fri May 8 18:18:44 2020 +0200 Remember user defined trading markets BUG: 421126 FIXED-IN: 5.0.9 commit 015909c1c75d281befa418b3370da94d1fb56470 Merge: d546edecf 39962088a Author: Thomas Baumgart Date: Fri May 8 14:03:21 2020 +0200 Merge remote-tracking branch 'origin/5.0' commit 39962088ab482187ca80a64ce33b0965f2a1aa32 Author: Thomas Baumgart Date: Fri May 8 13:55:08 2020 +0200 Improve object destruction commit 793483e956310cfee0841ceb8256c9c41c96c840 Author: Thomas Baumgart Date: Fri May 8 13:48:15 2020 +0200 Fix Freeze: logarithmic vertical axis and negative data range From value Summary: Added a new validator for data range From and To values that ensures user be unable to specify data range values lower than the precision limit (always positive). The fields are re-validated when the user checks/unchecks the 'Logarithmic vertical axis' option. BUG: 421056 FIXED-IN: 5.0.9 Reviewers: tbaumgart Tags: #kmymoney Differential Revision: https://phabricator.kde.org/D29446 (cherry picked from commit d546edecf989a2c623bd42c72a4758d4916ac870) commit d546edecf989a2c623bd42c72a4758d4916ac870 Author: Robert Szczesiak Date: Fri May 8 13:10:25 2020 +0200 Fix Freeze: logarithmic vertical axis and negative data range From value Summary: Added a new validator for data range From and To values that ensures user be unable to specify data range values lower than the precision limit (always positive). The fields are re-validated when the user checks/unchecks the 'Logarithmic vertical axis' option. BUG: 421056 Reviewers: tbaumgart Tags: #kmymoney Differential Revision: https://phabricator.kde.org/D29446 commit b9d999e137f070577821c6a09b3978f3e095c77a Author: Robert Szczesiak Date: Fri May 8 09:41:45 2020 +0200 Fix Logarithmic vertical axis has multiple zero labels Summary: Vertical axis range is now cropped to the value of precision limit. BUG: 421105 FIXED-IN: 5.0.9 Reviewers: tbaumgart Reviewed By: tbaumgart Tags: #kmymoney Differential Revision: https://phabricator.kde.org/D29480 (cherry picked from commit 462f3dcb13060011b993f88c3a44cd55f6d24bd1) commit 462f3dcb13060011b993f88c3a44cd55f6d24bd1 Author: Robert Szczesiak Date: Fri May 8 08:41:51 2020 +0200 Fix Logarithmic vertical axis has multiple zero labels Summary: Vertical axis range is now cropped to the value of precision limit. BUG: 421105 Reviewers: tbaumgart Reviewed By: tbaumgart Tags: #kmymoney Differential Revision: https://phabricator.kde.org/D29480 commit a6dd83a2c6bf24edea501e10c1bbfb945cb2d719 Author: Yuri Chornoivan Date: Thu May 7 13:17:26 2020 +0300 Fix minor typo commit c8b799f590be9944b2372973730e3dd1aa2d7373 Author: Jack Ostroff Date: Tue May 5 17:01:40 2020 -0400 Update categories docbook (KMM) Summary: Update Categories chapter of Handbook for 5.x Merge branch '5.0' into docs (Revision initially created including irrelevant commits. Hopefully it now just has the docbook updates.) Test Plan: Ran CheckXML5 and meinproc5 Reviewers: kde-doc-english, #kmymoney, yurchor Reviewed By: yurchor Subscribers: yurchor, #kmymoney, kde-doc-english Tags: #documentation Differential Revision: https://phabricator.kde.org/D29428 commit 2812ef60269832da40dd7fa7e5992ebb8aa3250c Author: Thomas Baumgart Date: Sun May 3 15:08:40 2020 +0200 Don't crash if loan schedule is not available BUG: 420931 FIXED-IN: 5.0.9 commit 332b888252b4bd8e08b9d21e21d34e5be3ac25b9 Author: Thomas Baumgart Date: Sat May 2 09:57:19 2020 +0200 Fix ordinate axis labels when zooming Summary: If I understand the intent of the author correctly, the sole purpose of `KReportChartView::slotNeedUpdate()` was one-time customization of ordinate axis labels at the time of chart creation. The fact that signal is disconnected immediately after execution of slot starts seems to confirm my understanding. The problem begins when one zooms the chart (using so-called rubber band zooming feature from KDiagram project). Axis ticks and labels are recalculated but still they are overridden with "hard labels" defined in the slot body. The number of axis ticks increases and is grater than the number of hard labels, so the labels are repeated in cycle. In and of itself it is really a feature rather than a bug but the feature works to our disadvantage in this case. Please find below a quote from AbstractAxis Class documentation: > void AbstractAxis::setLabels( const QStringList & list ) > Use this to specify your own set of strings, to be used as axis labels. > Labels specified via setLabels take precedence: If a non-empty list is passed, KD Chart will use these strings as axis labels, **instead of calculating them.** > **If you pass a smaller number of strings than the number of labels drawn at this axis, KD Chart will repeat the strings until all labels are drawn**. As an example you could specify the seven days of the week as abscissa labels, which would be repeatedly used then. Unfortunately, mere removal of disconnect method call does not solve the problem but the same documentation provides a way to customize axis labels when needed. It is done through overriding of `const QString AbstractAxis::customizedLabel( const QString & label ) const` My solution proposed in attached patch goes this way and also simplifies calculations where they seemed over-complicated to me. Please correct my understanding if i missed the point of removed lines. Please find attached screenshots before and after the fix. Balance history chart before fix with no zoom: {F8268351} Balance history chart before fix with zoom:: {F8268353} Balance history chart after fix with no zoom: {F8268359} Balance history chart after fix with zoom:: {F8268358} As a footnote, I would like to sincerely thank to all the people who have contributed to this project. I started to use KMyMoney recently and I am surprised how good it is, especially for an open-source project run by the community. It suits my need for personal finance and investment-supporting software amazingly well. If you find my contribution valuable, I would love to provide more patches in the future if I find more bugs or feel that some feature is missing. In fact, I have little to no industrial experience in C++ as I work mostly in Java. Please let me know if I broke any C++ coding rules. BUG: 420767 Reviewers: #kmymoney, tbaumgart Reviewed By: #kmymoney, tbaumgart Subscribers: tbaumgart Tags: #kmymoney, #kdiagram Differential Revision: https://phabricator.kde.org/D29255 (cherry picked from commit 5e4c8322fbefcb6cdaf1c51f6204986946ca0ba4) commit 5e4c8322fbefcb6cdaf1c51f6204986946ca0ba4 Author: Robert Szczesiak Date: Sat May 2 06:57:44 2020 +0200 Fix ordinate axis labels when zooming Summary: If I understand the intent of the author correctly, the sole purpose of `KReportChartView::slotNeedUpdate()` was one-time customization of ordinate axis labels at the time of chart creation. The fact that signal is disconnected immediately after execution of slot starts seems to confirm my understanding. The problem begins when one zooms the chart (using so-called rubber band zooming feature from KDiagram project). Axis ticks and labels are recalculated but still they are overridden with "hard labels" defined in the slot body. The number of axis ticks increases and is grater than the number of hard labels, so the labels are repeated in cycle. In and of itself it is really a feature rather than a bug but the feature works to our disadvantage in this case. Please find below a quote from AbstractAxis Class documentation: > void AbstractAxis::setLabels( const QStringList & list ) > Use this to specify your own set of strings, to be used as axis labels. > Labels specified via setLabels take precedence: If a non-empty list is passed, KD Chart will use these strings as axis labels, **instead of calculating them.** > **If you pass a smaller number of strings than the number of labels drawn at this axis, KD Chart will repeat the strings until all labels are drawn**. As an example you could specify the seven days of the week as abscissa labels, which would be repeatedly used then. Unfortunately, mere removal of disconnect method call does not solve the problem but the same documentation provides a way to customize axis labels when needed. It is done through overriding of `const QString AbstractAxis::customizedLabel( const QString & label ) const` My solution proposed in attached patch goes this way and also simplifies calculations where they seemed over-complicated to me. Please correct my understanding if i missed the point of removed lines. Please find attached screenshots before and after the fix. Balance history chart before fix with no zoom: {F8268351} Balance history chart before fix with zoom:: {F8268353} Balance history chart after fix with no zoom: {F8268359} Balance history chart after fix with zoom:: {F8268358} As a footnote, I would like to sincerely thank to all the people who have contributed to this project. I started to use KMyMoney recently and I am surprised how good it is, especially for an open-source project run by the community. It suits my need for personal finance and investment-supporting software amazingly well. If you find my contribution valuable, I would love to provide more patches in the future if I find more bugs or feel that some feature is missing. In fact, I have little to no industrial experience in C++ as I work mostly in Java. Please let me know if I broke any C++ coding rules. BUG: 420767 Reviewers: #kmymoney, tbaumgart Reviewed By: #kmymoney, tbaumgart Subscribers: tbaumgart Tags: #kmymoney, #kdiagram Differential Revision: https://phabricator.kde.org/D29255 commit c8eda97b6152eab735400a5e3b530c079c07cad7 Author: l10n daemon script Date: Sat May 2 05:56:38 2020 +0200 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" commit df474925e71a96959f0d12fdbfb8720e1975eee1 Author: Thomas Baumgart Date: Fri May 1 14:39:35 2020 +0200 Allow plural form for XX day forecast Summary: Currently KMyMoney doesn't allow plural form to translate this string. That doesn't translate well in some languages, for instance French. GUI: Reviewers: tbaumgart Reviewed By: tbaumgart Differential Revision: https://phabricator.kde.org/D29306 (cherry picked from commit 33eca83146db16480a556c24863f17cb85114e44) commit 33eca83146db16480a556c24863f17cb85114e44 Author: Simon Depiets Date: Thu Apr 30 23:44:58 2020 +0800 Allow plural form for XX day forecast Summary: Currently KMyMoney doesn't allow plural form to translate this string. That doesn't translate well in some languages, for instance French. Reviewers: tbaumgart Reviewed By: tbaumgart Differential Revision: https://phabricator.kde.org/D29306 commit e5fa0f8fb67b98112c52b03128ae8d69a9710467 Author: l10n daemon script Date: Fri May 1 10:12:24 2020 +0200 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" commit 0ffcef0b2328ce26fdbcd93bd4fa44e14aa9d225 Merge: 30b507214 187764863 Author: Thomas Baumgart Date: Fri May 1 09:20:24 2020 +0200 Merge remote-tracking branch 'origin/5.0' commit 187764863a426b95271b5f637f7ed6883f7e44ba Author: Thomas Baumgart Date: Fri May 1 09:17:42 2020 +0200 Added message contexts to support Korean translation GUI: commit 62d4670b21c949af8254a5351fd5897540bcca72 Author: Thomas Baumgart Date: Fri May 1 07:44:48 2020 +0200 Make InvestmentWizard error message user-friendly Users don't know what "objects" are, make the error message user-friendly. GUI: (cherry picked from commit d2fc61b3b8141244f690a5c3df5e3bad12aa7646) commit 101e5f665f1e9583887c97126d5c9b7674935433 Author: Thomas Baumgart Date: Fri May 1 07:43:28 2020 +0200 Start New Investment Wizard for new securities When importing investment transactions, don't ignore previously unknown securities and instead ask user to create them using a wizard. BUG: 420584 FIXED-IN: 5.0.9 (cherry picked from commit 6e19d946bbf8543c7b7b02ba8b59cc7603ff0891) commit 7d860a6b0f17b7903bbe14ce93f798a25067f150 Author: Thomas Baumgart Date: Fri May 1 07:40:33 2020 +0200 Display transactions sum using all decimal places For a sum of multiple rows selected in the global ledger view, use the automatically determined minimum required precision to avoid truncating the value BUG: 420593 FIXED-IN: 5.0.9 (cherry picked from commit c37191ada147cf18f1c74dab70c02a425b67104a) commit 3a019f264c802054b4fecadf6e55a54aec9a03f3 Author: Thomas Baumgart Date: Tue Apr 28 20:27:22 2020 +0200 Add more required files to the AppImage commit 30b50721486832af9b7676c1f562a4a704ac1c7a Author: Thomas Baumgart Date: Sun Apr 26 19:52:02 2020 +0200 Fix build script for AppImage This corrects the latest change to this file which caused the script to fail. commit c37191ada147cf18f1c74dab70c02a425b67104a Author: Dawid Wróbel Date: Sat Apr 25 18:01:19 2020 -0400 Display transactions sum using all decimal places For a sum of multiple rows selected in the global ledger view, use the automatically determined minimum required precision to avoid truncating the value BUG: 420593 commit d2fc61b3b8141244f690a5c3df5e3bad12aa7646 Author: Dawid Wróbel Date: Sat Apr 25 15:21:56 2020 -0400 Make InvestmentWizard error message user-friendly Users don't know what "objects" are, make the error message user-friendly. commit 6e19d946bbf8543c7b7b02ba8b59cc7603ff0891 Author: Dawid Wróbel Date: Sat Apr 25 15:16:04 2020 -0400 Start New Investment Wizard for new securities When importing investment transactions, don't ignore previously unknown securities and instead ask user to create them using a wizard. BUG: 420584 commit 253607a6c6d8a2bc84c8e3c1b1932fbe40657dbe Author: Thomas Baumgart Date: Sat Apr 25 16:19:51 2020 +0200 Add more required files to the AppImage commit a83f94d1d38c1b507c10f9998e246004a7b5377a Author: l10n daemon script Date: Sat Apr 25 10:39:30 2020 +0200 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" commit 529d7cc4de5e9508d0067ccbee248d12c15bf57b Author: l10n daemon script Date: Sat Apr 25 06:09:28 2020 +0200 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" commit f3b3d0958496b196db74bbc21a7fd90a4d251227 Author: Thomas Baumgart Date: Fri Apr 24 22:16:44 2020 +0200 Bumped version of xmlsec1 for AppImage (cherry picked from commit b445c56686e20e04ab2ec44ce554c556aa3e59dc) commit 89d4b30a5875b7041872ba494506ef17c2fdc4d5 Author: Thomas Baumgart Date: Fri Apr 24 22:16:18 2020 +0200 Fix icu4c download location and bumped version (cherry picked from commit 35b22acf5a9ef2bf84da3bb98e28bf44671f4601) commit b445c56686e20e04ab2ec44ce554c556aa3e59dc Author: Thomas Baumgart Date: Fri Apr 24 08:23:52 2020 +0200 Bumped version of xmlsec1 for AppImage commit 35b22acf5a9ef2bf84da3bb98e28bf44671f4601 Author: Thomas Baumgart Date: Thu Apr 23 18:35:34 2020 +0200 Fix icu4c download location and bumped version commit 8a99df958eb8664188a25e95b6c953609a81bf37 Author: Thomas Baumgart Date: Thu Apr 23 18:20:32 2020 +0200 Fix gwenhywfar URL (cherry picked from commit dbc842f4ac61039b1201e42e750233eaa4ad210f) commit 27b7a488c4f983525e0938facbb9467a0aaff8e2 Author: Thomas Baumgart Date: Wed Apr 22 18:51:00 2020 +0200 Update symbol for Indian Rupee This will use the new symbol in new data files but not update existing files. Currently there's no other way than patching the data file directly to change the symbol. BUG: 420422 FIXED-IN: 5.0.9 commit dbc842f4ac61039b1201e42e750233eaa4ad210f Author: Dawid Wróbel Date: Mon Apr 20 15:27:11 2020 -0400 Fix gwenhywfar URL commit 9cc6c91a5778b2d5b5f8524bb00fb2dc4500b7a5 Author: l10n daemon script Date: Mon Apr 20 09:46:36 2020 +0200 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" commit 21e9cb15ce7fb055c5fb23b0d5807d36719f1331 Author: l10n daemon script Date: Mon Apr 20 05:40:45 2020 +0200 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" commit 7d0f34cc1a6dcd73241e2b14608f3e600c869c21 Author: Yuri Chornoivan Date: Sat Apr 18 07:48:47 2020 +0300 Fix minor typo commit 50da0c1ac7d911c024e8d4b1b9cd0a925aba858f Author: Dawid Wróbel Date: Thu Apr 16 20:00:13 2020 -0400 Add option to enable fixing of the buy/sell signs Some providers do not follow the OFX spec and do not assign the correct positive/negative signage to amount (TOTALs) and quantity (UNITs) values assosciated with BUY/SELL investment transactions (see OFX2.2, section 13.3.3). This change adds option to OFX import dialog and account's online settings to force the signage to follow the the spec. BUG: 420056 GUI: commit 130720bf624e20a8d9060474f22c15883337796a Merge: 264f15318 2be4ff3bc Author: Dawid Wróbel Date: Wed Apr 15 18:51:36 2020 -0400 Merge branch 'master' of git://anongit.kde.org/kmymoney commit 264f15318338c119eb83476811700f7bc8680089 Author: Dawid Wróbel Date: Wed Apr 15 18:30:28 2020 -0400 Initialize "Invert Amount" setting for online transactions. The "Invert Amount" setting was never being initialized correctly when importing transactions online. CCBUG: 416279 commit 2be4ff3bc20741698bb2c5976cf2a61529616e5d Merge: b075d669c feb8f9e0d Author: Thomas Baumgart Date: Wed Apr 15 20:08:53 2020 +0200 Merge remote-tracking branch 'origin/5.0' commit feb8f9e0d298fe4d5b74667d64890df85a3feda8 Author: Thomas Baumgart Date: Wed Apr 15 20:02:16 2020 +0200 Add french startlogo file Created from svg file commit eefdbd26ee9f849e4f3a830ec249710809ef37b8 Author: Thomas Baumgart Date: Wed Apr 15 20:01:37 2020 +0200 Added french translation of startlogo Adapted from version attaced to the bug-report to fit the directory layout BUG: 420082 FIXED-IN: 5.0.9 commit d09482fbff274a338a488c3c777e9ae63bf13c34 Author: l10n daemon script Date: Mon Apr 13 10:18:29 2020 +0200 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" commit b075d669c0f4063df4d34faf2aa8c20499727248 Author: l10n daemon script Date: Mon Apr 13 06:05:35 2020 +0200 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" commit 407d5fea0053e8dcd6a96740b4f1cc6c06ab32f9 Merge: 5bcf3cf9d e76470dd1 Author: Thomas Baumgart Date: Sun Apr 12 10:03:59 2020 +0200 Merge remote-tracking branch 'origin/5.0' commit e76470dd174838accb278854f0cb8ecd05c1200e Author: Thomas Baumgart Date: Sun Apr 12 10:02:03 2020 +0200 Use target account's commodity instead of base currency When importing new transactions, use the target account's commodity (which is set to target account's currency) since it may differ from the base currency. BUG: 419974 FIXED-IN: 5.0.9 (cherry picked from commit 181da28c988ee25f125b37b14aae74b6de9f43a5) commit b0c87004737691582b9416e5a21264ce067f8f78 Author: Thomas Baumgart Date: Sun Apr 12 09:58:54 2020 +0200 Bring back the Yahoo Finance quotes Tested for a few months by the original poster and continues to work, so assuming it is stable enough to push it to mainline. BUG: 417142 FIXED-IN: 5.0.9 (cherry picked from commit 1cff1f9ec55e81f2feff041d595774bfa9983c9a) commit 1655f78fd9bcbb3c23f2a5c8d8d4cf05a61823a0 Author: Thomas Baumgart Date: Sun Apr 12 09:55:54 2020 +0200 Make sure bankID is assigned when importing transactions The bankID member of a split is the ultimate identifier to detect duplicate transactions. Yet if empty it is not used and transactions of the same import session are falsely detected as duplicates. This change assigns a bankID in case it is empty based on the account id, the post date, the payee name, the memo text, and the amount which makes the bankID unique for the import session. BUG: 419975 FIXED-IN: 5.0.9 commit 5bcf3cf9db2f689aefc7d9c3459ac0a496075c85 Author: Dawid Wróbel Date: Sun Apr 12 02:00:26 2020 -0400 Revert the fix which broke duplicate transaction detection between imports. This reverts commit 295d003c977ee67e2af7d76a14a39869c599ac9e. CCBUG: 419975 commit 1cff1f9ec55e81f2feff041d595774bfa9983c9a Author: Dawid Wróbel Date: Sun Apr 12 01:15:32 2020 -0400 Bring back the Yahoo Finance quotes. Tested for a few months and continues to work, so assuming it is stable enough to push it to mainline. BUG: 417142 commit 295d003c977ee67e2af7d76a14a39869c599ac9e Author: Dawid Wróbel Date: Sat Apr 11 23:53:44 2020 -0400 When importing transactions, make sure not to match against the transactions already imported during the same session. BUG: 419975 commit 181da28c988ee25f125b37b14aae74b6de9f43a5 Author: Dawid Wróbel Date: Sat Apr 11 20:37:07 2020 -0400 When importing new transactions, use the target account's commodity (which is set to target account's currency) since it may differ from the base currency. BUG: 419974 commit 569a3ed9179c2cca122c801242d37975b9ff4c76 Author: Thomas Baumgart Date: Tue Apr 7 20:42:16 2020 +0200 Use valid start date to calculate remaining scheduled payments BUG: 419113 FIXED-IN: 5.0.9 commit 02815525c43a6f0bdeefcf11aed8a8ae4a40ca36 Author: l10n daemon script Date: Mon Apr 6 10:14:13 2020 +0200 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" commit d8b7b6b0ca4357f3f6e6992bad77aa21ab061b2e Author: l10n daemon script Date: Mon Apr 6 06:01:56 2020 +0200 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" commit c7f764ace1282115bf541c80c8393dcf9bcc0814 Author: Thomas Baumgart Date: Sun Apr 5 15:29:34 2020 +0200 Try to retrieve error information about failing GPG detection commit d5a902ba4f57c9bdfbe8d02fbbe9b88af5785c18 Author: l10n daemon script Date: Sat Apr 4 09:18:16 2020 +0200 GIT_SILENT made messages (after extraction) commit e87b9db8fde33a4dac4aead8e33ceca1f11e7106 Author: l10n daemon script Date: Sat Apr 4 03:03:40 2020 +0200 GIT_SILENT made messages (after extraction) commit 751f8979bc09a0577de4fbc9f23309f0ac56ab57 Merge: f753dc0fa 59a56c947 Author: Thomas Baumgart Date: Fri Apr 3 20:46:46 2020 +0200 Merge remote-tracking branch 'origin/5.0' commit 59a56c94761ecd17b9fd42e7270fbd8b9eee8245 Author: Thomas Baumgart Date: Fri Apr 3 18:53:14 2020 +0200 Add a leading slash in front of the drive letter This amends commit d8052a698b736ddc0b9af6287ae698194cf0f10d and finally fixes the problem. CCBUG: 396286 commit a5d6a4d23af59378e9fea5ca6afc51b4f1dedd2a Author: l10n daemon script Date: Fri Apr 3 10:23:47 2020 +0200 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" commit f753dc0faea846ee63e18628119653497a44042e Author: l10n daemon script Date: Fri Apr 3 06:15:10 2020 +0200 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" commit 8b8d82b608372512c89eeed004580d7562c9b49b Author: Thomas Baumgart Date: Thu Apr 2 19:19:01 2020 +0200 Fix budget total display The budget total was displayed incorrectly. This change corrects this. BUG: 419554 FIXED-IN: 5.0.9 commit 1a7022e9e27562ca16037adff388ca5b8acfe8c2 Author: l10n daemon script Date: Thu Apr 2 10:21:24 2020 +0200 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" commit 002c41b43bc50576724a2cca196a7ad36a54f596 Author: l10n daemon script Date: Thu Apr 2 06:07:23 2020 +0200 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" commit d8052a698b736ddc0b9af6287ae698194cf0f10d Author: Thomas Baumgart Date: Mon Mar 30 19:14:46 2020 +0200 Reconstruct url based on modified filename This should resolve the issue that the URL is invalid on windows systems. This amends commit 1989a4296d070c9ad962578815ab4fa169f61706 BUG: 396286 commit 7c730db6d663a7251fa37e4eb9934e899a877efa Author: Thomas Baumgart Date: Sun Mar 29 19:33:16 2020 +0200 Get path to libofx headers out of target property This allows to find the respective header files on the binary-factory MSVC build. In case the property is not set, the prior mechanism is used to extract the include directory path. commit 8bac6705cc482400a0ccf5831f9572d214cd592f Author: Thomas Baumgart Date: Fri Mar 27 19:52:18 2020 +0100 Bump aqbanking version to 6.1.4 (cherry picked from commit e7918731d06df4f27196a7ecdee19d28ac6ce8f4) commit fb666bc3adcc5360fa1b59755c7463791453240e Author: Thomas Baumgart Date: Fri Mar 27 19:51:44 2020 +0100 Remove the osbolete ktoblzcheck dependency (cherry picked from commit b8f0abe62c499ac3e3dbc736093e6687e4da6c6a) commit 8332bfebebcebbebfd18ddbb7d618bbcb1be6251 Author: Thomas Baumgart Date: Fri Mar 27 19:51:01 2020 +0100 Use gnu.org mirror for nettle lib (cherry picked from commit 4da561b589254718d637296729e344fd26081140) commit e7918731d06df4f27196a7ecdee19d28ac6ce8f4 Author: Thomas Baumgart Date: Fri Mar 27 07:28:02 2020 +0100 Bump aqbanking version to 6.1.4 commit b8f0abe62c499ac3e3dbc736093e6687e4da6c6a Author: Dawid Wróbel Date: Thu Mar 26 15:24:49 2020 -0400 Remove the osbolete ktoblzcheck dependency commit 4da561b589254718d637296729e344fd26081140 Author: Dawid Wróbel Date: Thu Mar 26 15:22:06 2020 -0400 Use gnu.org mirror for nettle lib commit cb1784822d84970c282032fd1125465dc8a5dc27 Merge: 3c9fefb51 1a7439d35 Author: Dawid Wróbel Date: Thu Mar 26 15:07:25 2020 -0400 Merge branch 'add_reversing_transaction' GUI: commit 1989a4296d070c9ad962578815ab4fa169f61706 Author: Thomas Baumgart Date: Thu Mar 26 16:36:58 2020 +0100 Fix local filename on windows for ofx banking BUG: 396286 FIXED-IN: 5.0.9 commit 1a7439d35dbdc9fed05cae6fa773e5b29bf002a7 Author: Dawid Wróbel Date: Wed Mar 25 17:00:09 2020 -0400 Use unary minus operator to negate values in negateShares() and negateValue() commit e3a12e4a16b389b35c3146708f57f7ec635e1d7f Author: Thomas Baumgart Date: Tue Mar 24 17:58:49 2020 +0100 Bump aqbanking version to 6.1.3 (cherry picked from commit 3c9fefb5155cdcadf3717473197d95b1eba75c1d) commit 3c9fefb5155cdcadf3717473197d95b1eba75c1d Author: Thomas Baumgart Date: Tue Mar 24 17:58:02 2020 +0100 Bump aqbanking version to 6.1.3 commit 73d53f50159475c3d4dabfc531da93952832cd89 Author: Dawid Wróbel Date: Mon Mar 23 21:03:37 2020 -0400 Add negateShares() to MyMoneySplit; Also negate shares value when reversing transaction commit 915fa7d8c4d81b0a8b4d97e5a0c69c19dd19c708 Author: Thomas Baumgart Date: Mon Mar 23 20:58:24 2020 +0100 Force setting the file type to the one selected in the filter CCBUG: 419120 commit 027a24cad9097562c57eb76c1baa15930f99d557 Merge: 57d5c3868 7dcc5c5cb Author: Thomas Baumgart Date: Mon Mar 23 08:24:02 2020 +0100 Merge remote-tracking branch 'origin/5.0' commit 7dcc5c5cb3740a71b944b5233e432974a696e31d Author: Thomas Baumgart Date: Mon Mar 23 08:16:40 2020 +0100 Add password display feature to KBanking password dialog commit c195e0cda57949891207f5c7f2c817d2b6fbe298 Author: Thomas Baumgart Date: Sun Mar 22 19:27:34 2020 +0100 Improve handling of the backup feature on MS windows On windows the option to mount a device is not available. So the GUI elements have been removed in this case and the label is adjusted to be more precise. GUI: BUG: 419082 FIXED-IN: 5.0.9 commit 170be2e2672ef082943119ccdbc172c424e9f926 Author: Dawid Wróbel Date: Fri Mar 20 12:39:50 2020 -0400 Add an option to add a reversing transaction to the one(s) currently selected: - add negateValue() to MyMoneySplit which does exactly that. - add reverse() to MyMoneyTransaction which negates value of all its splits, effectively reversing the transaction. - refactor slotDuplicateTransaction(reverse bool) to optionally handle the reversing. Assuming typical use case being to transfer the reversed amount to an income/expense category, the reversed transaction has the same date as the original. - add Icon::Reverse commit 57d5c38683c89f3b99ed1248d8a92b29d0ec22ee Merge: 6f63cd6a4 029de4701 Author: Thomas Baumgart Date: Thu Mar 19 21:16:27 2020 +0100 Merge remote-tracking branch 'origin/5.0' commit 029de47016d17a9d6d01a6a79f4a92bf8e7af97a Author: Thomas Baumgart Date: Thu Mar 19 21:15:14 2020 +0100 Fix autofill to use latest transaction not earliest The logic to auto fill a transaction with data from a previous transaction to the same payee was using the first transaction when the option "With previously most often used transaction for the payee" was selected. This change will instruct KMyMoney to use the latest transaction instead. BUG: 418334 FIXED-IN: 5.0.9 commit 8024818f811c74bb6e1578db0f9a64787c6f65d8 Author: Thomas Baumgart Date: Sat Mar 14 08:39:24 2020 +0100 Allow local script files as price update sources in AppImage The price update service in KMyMoney allows to start local scripts to fetch price information. This did not work when started as AppImage. This change brings that functionality to the AppImage version. Within the AppImage version a configured URL such as "file:///home/user/bin/price.sh %1" is called as "/bin/sh" "-c" "/home/user/bin/price.sh %1" where %1 will be replaced with the actual investment symbol. BUG: 418823 FIXED-IN: 5.0.9 commit 6f63cd6a476079cd47525a3acdb64d056b1568ac Merge: 431b970ac 8ff112d26 Author: Pino Toscano Date: Fri Mar 13 21:42:50 2020 +0100 Merge remote-tracking branch 'origin/5.0' commit 8ff112d26e4b617c5d4951cde3a5426e3283f760 Author: Pino Toscano Date: Fri Mar 13 21:42:30 2020 +0100 remove qPixmapFromMimeSource from ui files old qt3 relics commit 431b970ac4286de93f410c9c6c240795c26382dc Author: Thomas Baumgart Date: Thu Mar 12 09:41:21 2020 +0100 Change download location of Qt sources commit 9d975d244f3027859dbd5915efc56ed57ab06e2f Author: Thomas Baumgart Date: Thu Mar 12 09:33:38 2020 +0100 Revert "Update Qt version to use for AppImage build" This reverts commits 1180f2a69bbd5d9fdbbd6b7c161b2b64f648d05c b367af9cdd37bc3fe900cd2104e9cc144de1d982 0cdde58ebde30f7e490760e641a5c2c5b49cf515 0c8ff2257626c3b4bf0669bed1dc398f9c670f0d commit fad2ee731c999e02f923a001b16664d1f227474b Merge: 1180f2a69 e4eac6f1b Author: Pino Toscano Date: Thu Mar 12 07:42:42 2020 +0100 Merge remote-tracking branch 'origin/5.0' commit 1180f2a69bbd5d9fdbbd6b7c161b2b64f648d05c Author: Thomas Baumgart Date: Wed Mar 11 20:35:54 2020 +0100 Try to pass OPENSSL_LIBS as environment variable to configure commit b367af9cdd37bc3fe900cd2104e9cc144de1d982 Author: Thomas Baumgart Date: Wed Mar 11 19:32:24 2020 +0100 Try to fix Qt build regarding openssl libs commit 0cdde58ebde30f7e490760e641a5c2c5b49cf515 Author: Thomas Baumgart Date: Wed Mar 11 07:23:19 2020 +0100 Removed non-existing option qtenginio commit 0c8ff2257626c3b4bf0669bed1dc398f9c670f0d Author: Thomas Baumgart Date: Tue Mar 10 20:07:36 2020 +0100 Update Qt version to use for AppImage build commit e4eac6f1b3cb03b9e961949e2406ef8bc6a0f9d1 Author: Thomas Baumgart Date: Sun Mar 8 19:11:57 2020 +0100 Bump aqbanking version to 6.1.2 This fixes a bug with a large german bank (comdirect), see https://www.aquamaniac.de/rdm/issues/136 Original patch by Matthias Gehre Reviewers: tbaumgart Reviewed By: tbaumgart Tags: #kmymoney Differential Revision: https://phabricator.kde.org/D27930 (cherry picked from commit 0e4ec2e7b74c5b017839a69c6934b2f13357806b) commit 0e4ec2e7b74c5b017839a69c6934b2f13357806b Author: Thomas Baumgart Date: Sun Mar 8 19:04:22 2020 +0100 Bump aqbanking version to 6.1.2 This fixes a bug with a large german bank (comdirect), see https://www.aquamaniac.de/rdm/issues/136 Original patch by Matthias Gehre Reviewers: tbaumgart Reviewed By: tbaumgart Tags: #kmymoney Differential Revision: https://phabricator.kde.org/D27930 commit e055a7cecc26035a7bf8a730093c3eaf38b02662 Merge: c9e1ea67b efd5847ee Author: Thomas Baumgart Date: Mon Mar 2 20:52:31 2020 +0100 Merge remote-tracking branch 'origin/5.0' commit efd5847ee2c0dcb3174c84fc93c1f72da784f09c Author: Thomas Baumgart Date: Mon Mar 2 20:46:32 2020 +0100 Fix detection of LibOFX clientuid support Commit 487f8758987edb72e616a602706f100cafa877d8 introduced a different method to detect the presence of the LibOFX library. This change also changed the variable name for the libofx include directory. This caused the detection of the clientuid to fail later in the process as it still used the old variable (which now is empty). This change modifies the variable name and thus fixes the clientuid detection. commit c9e1ea67b219526b6d23d3757a77eaad4cf029d8 Merge: 25479fd8f 616f48563 Author: Thomas Baumgart Date: Sun Mar 1 19:02:10 2020 +0100 Merge remote-tracking branch 'origin/5.0' commit 616f48563636269cd9bccf49cf59f49fc9656e82 Author: Thomas Baumgart Date: Sun Mar 1 19:00:48 2020 +0100 Revert "Increase verbosity during appimage build" Problems are fixed so we can reduce the verbosity again and build in parallel This reverts commit b828dfaa4e8aef13c0dc1ccc604e8905fb4069ca. commit 78d3b34c42c70e746b0e14a63b3ee6ee3f1e069e Author: l10n daemon script Date: Sun Mar 1 09:37:05 2020 +0100 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" commit 25479fd8fff3cacd38ad9f21ccae90aaddb01b56 Merge: a956c98ec 4e4ad7753 Author: Pino Toscano Date: Sun Mar 1 09:34:06 2020 +0100 Merge remote-tracking branch 'origin/5.0' commit 4e4ad7753c02e5c2b2caeeb63121f5f611892533 Author: Pino Toscano Date: Sun Mar 1 09:27:52 2020 +0100 appdata: use canonical docs.kde.org help location commit a956c98ec8ad7ac3924d92a88a5e98469b62b361 Author: l10n daemon script Date: Sun Mar 1 05:38:01 2020 +0100 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" commit b21edda0e88564903fe4b9c0aecb77077d8b8261 Author: Thomas Baumgart Date: Thu Feb 27 20:19:59 2020 +0100 Use pkg_check_modules to detect LibOFX (cherry picked from commit 487f8758987edb72e616a602706f100cafa877d8) commit 06a6a62cd35669157a9606fe22e2f0a464908545 Author: Thomas Baumgart Date: Thu Feb 27 20:18:41 2020 +0100 Try to solve linkage problem in appimage build environment (cherry picked from commit 00f427d1691a3d2a71d026bd475ca007578a6c7a) commit 3e5ed4daedff99b046a056b21d8ef3bd9cef0118 Author: Thomas Baumgart Date: Thu Feb 27 19:55:51 2020 +0100 Revert "Try to fix sqlcipher compilation on newer Qt versions" This reverts commit 86c730199d6a71b8de22067bf3986374d044b670. commit 487f8758987edb72e616a602706f100cafa877d8 Author: Thomas Baumgart Date: Thu Feb 27 19:00:27 2020 +0100 Use pkg_check_modules to detect LibOFX commit 00f427d1691a3d2a71d026bd475ca007578a6c7a Author: Thomas Baumgart Date: Thu Feb 27 10:15:02 2020 +0100 Try to solve linkage problem in appimage build environment commit 08b315e11245cf9451c8cdf5a11fd129a4511cac Author: l10n daemon script Date: Thu Feb 27 09:39:07 2020 +0100 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" commit bc0c086a90cffc4cf89426f623c70f46fd9ce71b Author: l10n daemon script Date: Thu Feb 27 08:21:28 2020 +0100 GIT_SILENT made messages (after extraction) commit 73597c5606829c789957ff148b63435198f6306e Author: l10n daemon script Date: Thu Feb 27 05:44:06 2020 +0100 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" commit 3f561ca28da387547eafdd60655375dc38fa249a Author: l10n daemon script Date: Thu Feb 27 02:48:39 2020 +0100 GIT_SILENT made messages (after extraction) commit 0cdec51da57e38590c7676dfb0103c81a2c4cf2a Author: l10n daemon script Date: Wed Feb 26 09:46:15 2020 +0100 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" commit 48ec7771862b52ff7468935b757ccd001e9a3e35 Author: l10n daemon script Date: Wed Feb 26 08:34:42 2020 +0100 GIT_SILENT made messages (after extraction) commit 0415292779d61ba6bdc07e0329d8337341f221c3 Author: l10n daemon script Date: Wed Feb 26 05:54:06 2020 +0100 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" commit a49c50f03853f8a368d1544d39d0928db0395e33 Author: l10n daemon script Date: Wed Feb 26 02:52:07 2020 +0100 GIT_SILENT made messages (after extraction) commit b828dfaa4e8aef13c0dc1ccc604e8905fb4069ca Author: Thomas Baumgart Date: Mon Feb 24 20:49:28 2020 +0100 Increase verbosity during appimage build Try to resolve problem during build of appimage on CI system commit 86c730199d6a71b8de22067bf3986374d044b670 Author: Thomas Baumgart Date: Mon Feb 24 19:48:58 2020 +0100 Try to fix sqlcipher compilation on newer Qt versions commit 4d560f17543f6cfea34fe5b01a0b8cd3e7f083c5 Author: Thomas Baumgart Date: Mon Feb 24 19:00:51 2020 +0100 Fix minor typo:: de -> the (cherry picked from commit d797019ad3a690170ffe10c20e8613e0b72635a0) commit ba2d32566e7f37f8b5b43dc44f8bb6db19d20cc8 Author: l10n daemon script Date: Mon Feb 24 09:55:42 2020 +0100 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" commit d797019ad3a690170ffe10c20e8613e0b72635a0 Author: Yuri Chornoivan Date: Mon Feb 24 08:57:17 2020 +0200 Fix minor typo:: de -> the commit 7984e58ccda6bf89cc59ec5a66ab2c6800e10f63 Author: l10n daemon script Date: Mon Feb 24 05:56:39 2020 +0100 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" commit b065e59d59a567c9c8bbcc5664b1b255bee7fa59 Author: Thomas Baumgart Date: Sun Feb 23 21:38:58 2020 +0100 Documentation improves http: to https:, Review links and some menu items Summary: First fixes from translation workflow Test Plan: Validate links Reviewers: #kmymoney, habacker, yurchor, ostroffjh Reviewed By: #kmymoney, ostroffjh Subscribers: tbaumgart, ostroffjh, kde-doc-english Tags: #kmymoney, #documentation Differential Revision: https://phabricator.kde.org/D27582 (cherry picked from commit b68096444484c982cac5d6bfe944cda329081647) commit b68096444484c982cac5d6bfe944cda329081647 Author: Antoni Bella Pérez Date: Sat Feb 22 19:32:26 2020 +0100 Documentation improves http: to https:, Review links and some menu items Summary: First fixes from translation workflow Test Plan: Validate links Reviewers: #kmymoney, habacker, yurchor, ostroffjh Reviewed By: #kmymoney, ostroffjh Subscribers: tbaumgart, ostroffjh, kde-doc-english Tags: #kmymoney, #documentation Differential Revision: https://phabricator.kde.org/D27582 commit b74cecd4b3f90e4b100cb0bb4beac57d311c0e2e Author: Thomas Baumgart Date: Sun Feb 23 14:50:17 2020 +0100 Updated 3rdparty package to latest version grantlee 5.2.0 (cherry picked from commit 09448ad5397188bb4440e5427d920731ec0c8185) commit 09448ad5397188bb4440e5427d920731ec0c8185 Author: Thomas Baumgart Date: Sun Feb 23 14:45:02 2020 +0100 Updated 3rdparty package to latest version grantlee 5.2.0 commit 806e5489c3e7e795d6c6abd125e7b7c7a470d37b Author: Thomas Baumgart Date: Sat Feb 22 18:13:13 2020 +0100 Updated 3rdparty packages to latest versions Gwenhywfar (5.2.0) AqBanking (6.1.0) (cherry picked from commit b4606431996e826129a6b55c7038e8fd51d84a89) commit b4606431996e826129a6b55c7038e8fd51d84a89 Author: Thomas Baumgart Date: Sat Feb 22 18:10:24 2020 +0100 Updated 3rdparty packages to latest versions Gwenhywfar (5.2.0) AqBanking (6.1.0) commit a4cd824d2516907fab7fcd512a5367e3fe0125a4 Author: l10n daemon script Date: Sat Feb 22 09:22:32 2020 +0100 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" commit f1f6f898abeb011da94e7cfa465c75759d49c62b Author: l10n daemon script Date: Sat Feb 22 05:34:20 2020 +0100 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" commit ab31752ddd5fa97cbba5c1756cabbf8daf45c049 Author: Thomas Baumgart Date: Sun Feb 9 20:42:40 2020 +0100 Allow to select investments for investment reports The selection of investments as sub-accounts of investment accounts was only possible if the expert mode was selected. This change will provide access to the selection in report configuration for all investment reports. BUG: 416902 FIXED-IN: 5.0.9 (cherry picked from commit da137a230e528c7ef7e31687fd5b58ab82cbac39) commit da137a230e528c7ef7e31687fd5b58ab82cbac39 Author: Thomas Baumgart Date: Sun Feb 9 20:38:51 2020 +0100 Allow to select investments for investment reports The selection of investments as sub-accounts of investment accounts was only possible if the expert mode was selected. This change will provide access to the selection in report configuration for all investment reports. BUG: 416902 FIXED-IN: 5.0.9 commit fb1f9ab3b5bd14006f9885cdd87d048437aeef8f Author: Thomas Baumgart Date: Fri Jan 31 22:21:10 2020 +0100 Add path to load OFX DTDs on MacOS BUG: 416621 FIXED-IN: 5.0.9 (cherry picked from commit c737397b2924166b6a419110640794e115112ca2) commit c737397b2924166b6a419110640794e115112ca2 Author: Thomas Baumgart Date: Fri Jan 31 22:20:15 2020 +0100 Add path to load OFX DTDs on MacOS BUG: 416621 FIXED-IN: 5.0.9 commit fc49915733046a95ae0a9f7894b43e02fda89d32 Author: Thomas Baumgart Date: Fri Jan 31 11:00:38 2020 +0100 Add missing i18n call in checkprinting (cherry picked from commit 6982acea4514397531b233b9b81d1c34b8ec4e69) commit 6982acea4514397531b233b9b81d1c34b8ec4e69 Author: Thomas Baumgart Date: Fri Jan 31 10:59:11 2020 +0100 Add missing i18n call in checkprinting commit 2741bd69844973b387bfe9b405e3a764819ef2ef Author: Thomas Baumgart Date: Thu Jan 30 22:00:58 2020 +0100 Add a No/100 to the text when a check has not fractional part Summary: Captalizes the first letter for each number to be printed in text and for checks that have no fractional part prints No/100 Reviewers: #kmymoney, tbaumgart Reviewed By: tbaumgart Subscribers: ostroffjh, tbaumgart Differential Revision: https://phabricator.kde.org/D25029 (cherry picked from commit adf36334ac9724c1e30d8ba2d084992e5bf43f55) commit 98ac8a23aeb474340e8236ba8557da447051923e Author: Thomas Baumgart Date: Thu Jan 30 22:00:35 2020 +0100 These changes add the ability to set the payee's city and state Reviewers: tbaumgart Reviewed By: tbaumgart Differential Revision: https://phabricator.kde.org/D24233 (cherry picked from commit b6bf258a80a97b885f52b1cdeff15f57b39863aa) commit ac15c364bfa48fdbf870072076b2ec6082228f17 Author: Thomas Baumgart Date: Thu Jan 30 21:59:02 2020 +0100 Load OFX DTDs from AppImage filesystem (cherry picked from commit f16405aac20ec6fb098c488009b5397133258370) commit 34cf20f9d77b16eec029a861a38d024cc39fcf9b Author: Thomas Baumgart Date: Thu Jan 30 21:58:07 2020 +0100 Include libofx DTD files in AppImage (cherry picked from commit 3d75724abd659cfc8eacbd395966abecaa86fb8d) commit adf36334ac9724c1e30d8ba2d084992e5bf43f55 Author: Phil Hopkins Date: Thu Jan 30 21:42:46 2020 +0100 Add a No/100 to the text when a check has not fractional part Summary: Captalizes the first letter for each number to be printed in text and for checks that have no fractional part prints No/100 Reviewers: #kmymoney, tbaumgart Reviewed By: tbaumgart Subscribers: ostroffjh, tbaumgart Differential Revision: https://phabricator.kde.org/D25029 commit b6bf258a80a97b885f52b1cdeff15f57b39863aa Author: Phil Hopkins Date: Thu Jan 30 19:01:10 2020 +0100 These changes add the ability to set the payee's city and state Reviewers: tbaumgart Reviewed By: tbaumgart Differential Revision: https://phabricator.kde.org/D24233 commit f16405aac20ec6fb098c488009b5397133258370 Author: Thomas Baumgart Date: Wed Jan 29 20:52:44 2020 +0100 Amend last commit commit 7ea9a9d7d2822e7fdd7c1de5245e275bbc5246b9 Author: Thomas Baumgart Date: Wed Jan 29 20:23:42 2020 +0100 Load OFX DTDs from AppImage filesystem In AppImage mode LibOFX needs to be instructed to search the DTD files inside the AppImage file instead of the root filesystem. BUG: 416827 FIXED-IN: 5.0.9 commit 3d75724abd659cfc8eacbd395966abecaa86fb8d Author: Thomas Baumgart Date: Mon Jan 27 20:07:47 2020 +0100 Fix last commit commit 07131912856d7b8f04d374ad8e79cfe505563f5f Author: Thomas Baumgart Date: Mon Jan 27 19:51:03 2020 +0100 Include libofx DTD files in AppImage BUG: 416827 FIXED-IN: 5.0.9 commit 74a1b7f848c8ff8a30c1c74a7b21b25feda57961 Author: Ahmad Samir Date: Sun Dec 1 19:47:12 2019 +0200 Port KRecursiveFilterProxyModel to QSortFilterProxyModel Summary: Add QT_VERSION checks so that the code can still be built with Qt versions older than 5.10 (that's where QSortFilterProxyModel gained recursive filtering capabilities). Also add some defines to ease porting in the future; add a dud setRecursiveFilteringEnabled() method to keep backward compatibility. For details see the code the review. Test Plan: make && ctest; all unit tests pass except qsqlcipher-test, but it fails on master too. Reviewers: tbaumgart Reviewed By: tbaumgart Subscribers: davidre Maniphest Tasks: T12269 Differential Revision: https://phabricator.kde.org/D26579 commit 1f23553cebabee02020cdb3bbd20633ae31bf184 Author: Thomas Baumgart Date: Sat Jan 25 14:23:33 2020 +0100 Show all required widgets Since some widgets were hidden when required, the update of certain values did not work correctly in all circumstances. BUG: 416746 FIXED-IN: 5.0.9 (cherry picked from commit b3988b80e81cb294597271c11f1f9c9d4af50fae) commit b3988b80e81cb294597271c11f1f9c9d4af50fae Author: Thomas Baumgart Date: Sat Jan 25 14:22:59 2020 +0100 Show all required widgets Since some widgets were hidden when required, the update of certain values did not work correctly in all circumstances. BUG: 416746 FIXED-IN: 5.0.9 commit 620a3907576f41a859f82d9f6d0c0ad417ad0097 Author: Thomas Baumgart Date: Sat Jan 25 00:12:46 2020 +0100 Make headers translatable BUG: 416711 FIXED-IN: 5.0.9 (cherry picked from commit 68ea42edf0bb5bdb5642ec080c65fdaf0e94bbf2) commit 68ea42edf0bb5bdb5642ec080c65fdaf0e94bbf2 Author: Thomas Baumgart Date: Sat Jan 25 00:11:48 2020 +0100 Make headers translatable BUG: 416711 FIXED-IN: 5.0.9 commit ad0c921909a5ded1508e142034bcff064f22c4fa Author: Thomas Baumgart Date: Fri Jan 24 22:51:36 2020 +0100 Fix layout handling in split correction dialog BUG: 416577 FIXED-IN: 5.0.9 (cherry picked from commit 07d70700b68b5df1e66c31386b0248d3fdf3194c) commit 07d70700b68b5df1e66c31386b0248d3fdf3194c Author: Thomas Baumgart Date: Fri Jan 24 22:50:28 2020 +0100 Fix layout handling in split correction dialog BUG: 416577 FIXED-IN: 5.0.9 commit 232f03a900793a796275676c4e96ea55d276272e Author: Thomas Baumgart Date: Thu Jan 23 08:48:19 2020 +0100 Fix argument error reporting commit 42e2e8f354298e0715c30693f0d5ebcb9fe0fcff Author: Thomas Baumgart Date: Thu Jan 23 08:45:22 2020 +0100 Fix argument error reporting commit e40d7528c315a7c2116ba07a2a23018d7b4164ea Author: Thomas Baumgart Date: Tue Jan 21 20:54:31 2020 +0100 Fix missing ui file customwidget definitions BUG: 416534 FIXED-IN: 5.0.9 (cherry picked from commit fbfba1f6652fc96864399023b83bdb4aabfa8ac6) commit a098e28e28460c72d8b193bbe598c163b1c115c0 Author: Thomas Baumgart Date: Tue Jan 21 20:54:11 2020 +0100 Added option to invert amounts during OFX import FEATURE: 416279 FIXED-IN: 5.0.9 (cherry picked from commit 74a6554da398e4e8edecf99986546a321cd90028) commit fbfba1f6652fc96864399023b83bdb4aabfa8ac6 Author: Thomas Baumgart Date: Tue Jan 21 20:53:01 2020 +0100 Fix missing ui file customwidget definitions BUG: 416534 FIXED-IN: 5.0.9 commit 74a6554da398e4e8edecf99986546a321cd90028 Author: Thomas Baumgart Date: Tue Jan 21 20:43:39 2020 +0100 Added option to invert amounts during OFX import FEATURE: 416279 FIXED-IN: 5.0.9 commit 7e998babee8c4cf50fbd56eec5a87e03c1e58f2d Author: Thomas Baumgart Date: Sun Jan 19 19:06:39 2020 +0100 Raise minimum required versions for AqBanking and Gwenhywfar (cherry picked from commit addf8816916af595afc42328d4752d34ce822038) commit 028d53ec2c3f48bfd87fec8b0d97c5335b845d15 Author: Thomas Baumgart Date: Sun Jan 19 17:57:54 2020 +0100 Updated minimum required AqBanking commit bb6cf996c8c2b63b4cb0e387dc4024413d95dfa3 Author: Thomas Baumgart Date: Sat Jan 18 18:54:22 2020 +0100 Avoid flooding console with AqBanking warnings (cherry picked from commit f507330eee85ca54232daa5a495a8bfdbbde37d6) commit ae25b72b0683e25d7896b19a33ff6418af2ce13e Author: Thomas Baumgart Date: Sat Jan 18 14:31:04 2020 +0100 Prevent creation of schedules that are not assigned to an account BUG: 416410 FIXED-IN: 5.0.8 (cherry picked from commit f9bc63cd63408f2fe0c9c467c3e344d065bc4935) commit d8e96afe628041dd0bfc560c5ef8a5acad777dce Author: Thomas Baumgart Date: Fri Jan 17 22:29:58 2020 +0100 Updated minimum required AqBanking and Gwenhywfar versions commit bc83cbfd2eab462b764e1b62f0320c5b5647f680 Author: Thomas Baumgart Date: Fri Jan 17 19:09:50 2020 +0100 Fix subtotals in investment performance by account report The subtotal rows were attached to the wrong groups. This change fixes the order of the rows. BUG: 416274 FIXED-IN: 5.0.8 (cherry picked from commit f8ae85c34889b0023fe32d6e75569f18f2a8deac) commit 9f4a8127b0c4151f6a8f1c213b5bb7a489d6a5d4 Author: John Hayes Date: Thu Jan 16 16:02:46 2020 +0100 KMyMoney correct spelling in widget tooltips Summary: Correct ToolTip spelling in kmymoney.widgets Reviewers: tbaumgart Reviewed By: tbaumgart Differential Revision: https://phabricator.kde.org/D26612 commit 57a5c7fe972e25ceafae8daf0ea69ab2f12c3829 Author: Thomas Baumgart Date: Wed Jan 15 20:06:04 2020 +0100 Allow to modify name of loan account The UI elements were present and functional but the value was not stored. This change stores the value provided by the user. BUG: 416269 FIXED-IN: 5.0.8 (cherry picked from commit 16e542a4ef150866fa5f89d289e597cfe103c02d) commit 604d2418ecf1381860c519ecf9149890fcacb662 Author: Thomas Baumgart Date: Wed Jan 15 09:41:59 2020 +0100 Updated minimum required AqBanking and Gwenhywfar versions Update the required versions to the released stable versions that are capable to handle the PSD2 related changes. (cherry picked from commit a93ef28170003594a3ec2636c86706a39f6bf867) commit 5aac4450f3f91067fb92b59b0f860eda8d6bbdac Author: Thomas Baumgart Date: Tue Jan 14 21:42:15 2020 +0100 Update the AqBanking and Gwenhywfar versions for AppImage (cherry picked from commit da6ef9745c76af20aa3fa1468b75ba455db7a4e3) commit 38ea8dc4603f6e263d8d986e901e8870e534134a Author: Thomas Baumgart Date: Sat Jan 11 10:15:54 2020 +0100 Fix calculation of columnDate The returned date of columnDate was not correct in certain circumstances so that the price information using this date was incorrect which resulted in false opening balance values in reports. BUG: 414932 FIXED-IN: 5.0.8 (cherry picked from commit 286c3aecb316ab79b5e7115b26a9fdd58f147298) commit 460d42c0edf2a4ae319c48ed4c58347bf5e18942 Author: Thomas Baumgart Date: Thu Jan 9 22:45:10 2020 +0100 Make sure configuration is loaded This is needed to get the setting of IS_APPIMAGE in this module. This amends commit 7eab5dc6dad122dd90fae25789a36c9b329c6a85 (cherry picked from commit c881fd808ddff56e2215a7f1e0bf720f41337361) commit d8888d33c150053143c4cd694470cdd25578df7d Author: Thomas Baumgart Date: Thu Jan 9 22:44:33 2020 +0100 Fix accessing account templates in AppImage version BUG: 416052 FIXED-IN: 5.0.8 (cherry picked from commit 7eab5dc6dad122dd90fae25789a36c9b329c6a85) commit 95590fbf0ece4452f7f20ca7803f532385e0cb90 Author: Thomas Baumgart Date: Sun Jan 5 12:02:38 2020 +0100 Add initial notes on reusing an existing security in a second investment account. Expansion and screenshots to be added later. (cherry picked from commit 8547037f9373f5ae8c5d3d039a2e6f6fe2514c52) commit 35379fe1f4cee92d24c8bc1a276314d3c09064b7 Author: l10n daemon script Date: Fri Jan 3 05:52:44 2020 +0100 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" commit eb1050e05cd4ac74afa7ba402f766412dfb2c36e Author: Thomas Baumgart Date: Thu Jan 2 12:40:01 2020 +0100 Correctly increment amended number of new tags BUG: 415793 FIXED-IN: 5.0.8 (cherry picked from commit 7a4c060412fc8b4db8633d50ac3dc054310dbde1) commit f382487fc966383282a704b4f91f8e26c0b20b18 Author: Thomas Baumgart Date: Mon Dec 30 08:49:40 2019 +0100 Avoid duplicate multiplication with price for investments In non forecast reports, the number of shares of investment accounts was multiplied twice with the price due to a change made with commit 83dd7a0d. This change reverts commit 83dd7a0d and fixes the original problem in the right place. BUG: 415668 FIXED-IN: 5.0.8 (cherry picked from commit c4c0e3c3a0453f806c0fff5de884788c8953bba1) commit 03b8b79353f13427b3fe8340cb543b6ac3b19c5f Author: Thomas Baumgart Date: Thu Dec 26 12:04:29 2019 +0100 Allow to load files written with previous versions This amends the last commit and allows to read files that contain a matched transaction written with older versions of KMyMoney (prior to the last commit). Without this change the backward compatability was not provided. (cherry picked from commit ab30728c4246f94d1fcc35acc9ef7554e706e0a3) commit e529e3124d19c082acd71cf41b9488efe8a6ee6a Author: Thomas Baumgart Date: Wed Dec 25 16:54:52 2019 +0100 Fix storage of matched transaction containing a the character < A problem occured if a matched transaction contained the character 'less than' (<). This change eliminates this problem. It does not affect already stored transasction which have to be modified manually. BUG: 415548 FIXED-IN: 5.0.8 (cherry picked from commit 2ce69c0aa4133714804231e587f196b808eaa3d0) commit 44e8945aa2db9c7d62ddbcf7f6ffc42875bcd437 Author: Thomas Baumgart Date: Wed Dec 25 16:54:28 2019 +0100 Add testcase for < in memo of matched transaction (cherry picked from commit 9c939386e4a23a7033530a8f1082a626672e3eb8) commit 2309eb945c2bffb00b874ac8c57dfc73d7b13838 Author: Thomas Baumgart Date: Wed Dec 25 10:21:45 2019 +0100 checkprinting: avoid incorrect replacement of split values Template parameters for split values are now replaced in descending order. If we replace the template parameter 'SPLITVALUE1' before 'SPLITVALUE10', the latter is erroneously overwritten with the value from the former, followed by '0'. Cherry picked from commit 9ae5d7c17654dc57b396571ddd630305674ff3a2 CCBUG:415411 Reviewed By: tbaumgart Differential Revision: https://phabricator.kde.org/D26134 (cherry picked from commit 3227834a97fc62537a3b60d91c91de1f7ce2dfe7) commit d58530d5e24261d89500c6d2a9873f2a345ec78d Author: Thomas Baumgart Date: Wed Dec 25 10:21:06 2019 +0100 Use term 'charge(s)' instead of 'deposit(s)' in reconcilation report for credit card accounts Cherry picked and rebased from commit 8167daf35f22afe9d7b9d64e3e5cd3c3ee84b953. CCBUG:413555 Reviewed By: tbaumgart Differential Revision: https://phabricator.kde.org/D26132 (cherry picked from commit edce864614e258a1b7b6bb6a477b19d7e4ba46c2) commit 0efb6995402f1529c3c2e9f844a2d304027ef420 Author: Thomas Baumgart Date: Wed Dec 25 10:20:28 2019 +0100 Fix 'Summary line of reconcilation uses Deposits/Payments rather than Charges/Payments for credit cards' Cherry picked and reabased from commit dc59d0408b4412f9ea11af329997dccfaaee3938 CCBUG:413555 Reviewed By: tbaumgart Differential Revision: https://phabricator.kde.org/D26132 (cherry picked from commit a4577f64adb70336f9222c79ed1112086493bd40) commit 6ed6175828ac1b027d1120eb7fabd3e1d239e5c9 Author: Thomas Baumgart Date: Fri Dec 20 19:00:55 2019 +0100 Assign bankid to correct split The bankid used to detect duplicate transactions was assigned to the wrong split (the one that identifies the category). This change places the bankid in the split that references the investment account. BUG: 415409 FIXED-IN: 5.0.8 (cherry picked from commit c17568b8c82b59ad72b07d2db4ab7181757b4bfe) commit e7fbbf3373fadbe36175d8a9483d4c65d2295e8d Author: Thomas Baumgart Date: Mon Dec 16 20:54:23 2019 +0100 Keep values stored in splits when editing invest transactions Values stored in splits provided e.g. by online banking plugins were erased when a transaction was edited. This change make sure that this information is remained unmodified. BUG: 415257 FIXED-IN: 5.0.8 (cherry picked from commit de6d2425c6f17f3e98e10e93fedcad2707a30e08) commit 8e251e856b98f958717d757408e066ad19ce665b Author: l10n daemon script Date: Thu Dec 12 05:33:03 2019 +0100 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" commit 0aeb3019706f08dd5b0d4d64b1d920b1b0b55c94 Author: l10n daemon script Date: Thu Dec 12 02:42:17 2019 +0100 GIT_SILENT made messages (after extraction) commit c404e6723ff6d9a9af3e4b171d82ae9a15bf74c4 Author: Thomas Baumgart Date: Sun Dec 1 14:08:35 2019 +0100 Fix storage of additional institution attributes in SQL backend BUG: 413325 FIXED-IN: 5.0.8 (cherry picked from commit f5b86b78d2d3abd0d29e975b51ee948766994188) commit dcddb460f21f93d09c2f216eb3af386bf4979724 Author: Thomas Baumgart Date: Sun Dec 1 10:52:53 2019 +0100 Updated Gwenhywfar and AqBanking versions for AppImage Move on to the latest available versions commit 96e3d4016a97de1d150659261bd1a80860a19019 Author: Yuri Chornoivan Date: Tue Nov 26 17:17:43 2019 +0200 Fix link: ui.html -> menus.html commit 107eb87fff109d648bd8169cd2ec47a3a4f3a671 Author: Yuri Chornoivan Date: Fri Nov 22 20:03:06 2019 +0200 Use URL with transport encryption commit 0273d51f9080b19d2a49af33cc59427984dee141 Author: Yuri Chornoivan Date: Fri Nov 22 18:45:38 2019 +0200 Update URLs commit 56d118b136f697af756e796688dda0b41727df02 Author: Thomas Baumgart Date: Fri Nov 22 15:05:21 2019 +0100 Fix loading of Finance::Quote supported sources BUG: 414333 FIXED-IN: 5.0.8 (cherry picked from commit 2d73384be87dc786fe1aecdd050b3759722e0033) commit c64bc8a5e744baa166edd109f1b2966bdd613d55 Author: l10n daemon script Date: Wed Nov 20 02:41:48 2019 +0100 GIT_SILENT made messages (after extraction) commit 516a401b7102a64065f8cbf177b16b27eb14f7a5 Author: Thomas Baumgart Date: Sat Nov 9 13:14:00 2019 +0100 Added script to determine build dependencies This script if started in the base directory of a git repository scans all source files and locates the packages from which C/C++ header files are included. (cherry picked from commit 54a94f92d15fb5b7627c218b0d735bc9d7eedee6) commit 0e819d94a99a944da4f3a267974a0716fc986f67 Author: l10n daemon script Date: Fri Nov 8 05:30:33 2019 +0100 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" commit cfadbad001a99cfd25931650409e35599d0ce0ff Author: l10n daemon script Date: Mon Nov 4 05:15:52 2019 +0100 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" commit 82094099071615de687826ab9c61d2aa8a837065 Author: l10n daemon script Date: Mon Nov 4 02:44:33 2019 +0100 GIT_SILENT made messages (after extraction) commit cf8d796bd5fe26d4e5bd0707caa35f58f0f0b1c8 Author: Thomas Baumgart Date: Sat Nov 2 09:45:24 2019 +0100 Correctly handle splits with differing currency When entering investments the foreign currency detection did not compare a split's currencyId against the transaction commodity. This is now fixed. BUG: 410544 FIXED-IN: 5.0.8 (cherry picked from commit 962c9bcb3e16660e1c7ba0768b96f7be561b9b6f) commit 1426997e132bcd278c99cd6e459a08d141ce93e8 Author: Thomas Baumgart Date: Sat Nov 2 09:44:56 2019 +0100 Correctly identify new transaction A new transaction can be correctly identified by an empty original transaction. (cherry picked from commit 47cbe6d7e177207a792db65e5e1a661fcde993a5) commit 1832315b08cdb9e1beef411a65b990c7a71b5447 Author: Thomas Baumgart Date: Sat Nov 2 09:44:27 2019 +0100 Use nullptr instead of 0 (cherry picked from commit e7130c06f9a6b9b762396f6bd283eebd29642e77) commit 5283affdd721cc167b32af686385113c12175952 Author: Thomas Baumgart Date: Fri Nov 1 19:54:19 2019 +0100 Avoid usage after free as reported by tests (cherry picked from commit 4f01d3fc08f7b764e1b01e1a210d4d0fd7a6d7ba) commit bdf2ef4b5c67fd5cf38be65c553a2d70c0134b21 Author: Thomas Baumgart Date: Sat Oct 26 10:33:31 2019 +0200 Add a general mechanism to make entered password visible Attaching the PasswordToggle widget to a QLineEdit adds an icon to temporarily make the text in the widget visible when needed. (cherry picked from commit 05ff3958264c37eaf0adf5b0546b3523edbbfcd4) commit e8aa25bac8d1f0351e4a417c50934ac10dceee47 Author: Yuri Chornoivan Date: Thu Oct 24 20:57:45 2019 +0300 Fix minor issues found by EBN commit 8aeb7a314ab3afea110a7de6dc7a3e4d6b57bf62 Author: Thomas Baumgart Date: Sun Oct 20 17:49:57 2019 +0200 KBanking differentiates between account types (cherry picked from commit 72abb79eb2ec970f13ed7efac203196430a92cfe and 63d01341dde66e7fbf5a0423c350f6ba54dc647f) commit 142f2d11c9721a517d164a19df5b28e7393b2fa7 Merge: 2a5b5863d 4d0dfde57 Author: Thomas Baumgart Date: Sun Oct 13 22:24:39 2019 +0200 Merge remote-tracking branch 'origin/5.0' commit 2a5b5863d5cbdf0b96338ccece717e8f2fcc37a3 Merge: 029683a64 ff086a662 Author: Thomas Baumgart Date: Sun Oct 13 10:48:57 2019 +0200 Merge remote-tracking branch 'origin/5.0' commit 029683a649e997d949ce5a1931eddc88cddd98aa Author: Thomas Baumgart Date: Sun Oct 13 08:48:53 2019 +0200 Fix menu xml file path for appimage builds commit 3c11388f9dc7bfdc85ed8d7638239832c56eb289 Author: Yuri Chornoivan Date: Sat Oct 12 21:51:13 2019 +0300 Fix minor typo commit acba99523e3418257f9bfb07cb4235610f531327 Author: Thomas Baumgart Date: Sat Oct 12 16:25:40 2019 +0200 Copy instead of move since destination is partially filled commit 81ba589bf90e2c61a246fa5cf1fff04a558f34d1 Author: Thomas Baumgart Date: Sat Oct 12 15:26:12 2019 +0200 Fix source path of plugins one 'usr' too much commit f95b19059de26c46eb1904a323c6da540ea53791 Author: Thomas Baumgart Date: Sat Oct 12 14:56:02 2019 +0200 More appimage build fixes Some KF5 plugins where not copied into the image so that downloading price information did not work. This change should fix that. Also avoid including unnecessary files (e.g. include header files) commit 934bc9d8bb2df70127b1bb314e7f2f7c0f7c70fc Author: Thomas Baumgart Date: Sat Oct 12 08:13:15 2019 +0200 Fix locale handling for aqbanking Apparently, AqBanking searches the localization info in a different directory from where we have moved it before. So we simply set a link to avoid duplicates. commit be29d6a29e0a74704e60bc42bd9055da88fba444 Author: Thomas Baumgart Date: Fri Oct 11 20:37:47 2019 +0200 Adjust destination path commit b40573b5abf5d2d28c86fb0005076c62c361a1e9 Author: Thomas Baumgart Date: Fri Oct 11 18:05:13 2019 +0200 Make sure destination directory exists commit b486e0b5956a8b3a6e0510403ec60b19913640d2 Author: Thomas Baumgart Date: Fri Oct 11 17:34:39 2019 +0200 Enclose log output in quotes commit d6abb7647e12b54f300d9c26ccd2e3bfe0718192 Author: Thomas Baumgart Date: Thu Oct 10 21:34:50 2019 +0200 Modify copying whole directory structures commit fe726e7e9b350882b118b1c8c35321bafa089af5 Author: Thomas Baumgart Date: Thu Oct 10 18:45:34 2019 +0200 Make sure directory exists commit 6391d4131bbffabdb3133283408d36c18c57868b Author: Thomas Baumgart Date: Wed Oct 9 15:34:58 2019 +0200 Updated 3rdparty packages to latest versions Gwenhywfar AqBanking commit 01604806fbaf79a3f098fb0f4299ea61060e42e0 Author: Thomas Baumgart Date: Wed Oct 9 15:29:14 2019 +0200 Build AqBanking and Gwenhywfar for local install commit db21936354a358567b4abac0c2ab1fbd12522bf8 Author: Thomas Baumgart Date: Tue Oct 8 17:59:38 2019 +0200 Add more missing files to package commit baca47ea3954847f5534095f39c5281657760911 Author: Thomas Baumgart Date: Fri Oct 4 12:45:00 2019 +0200 Try to package missing library files into appimage commit ac52211fd0fcb153b5a32b80ea73d41da92f7b2f Author: Thomas Baumgart Date: Mon Sep 30 21:50:42 2019 +0200 Updated some more links of packages commit 766461a3bbf66b6e68fe0e6f17b335288df45b37 Author: Thomas Baumgart Date: Mon Sep 30 21:17:23 2019 +0200 Updated download link for Qt sources commit 4ff0d54848a5b48d49c7ea28fdd00d73eebf51d1 Author: Thomas Baumgart Date: Mon Sep 30 20:23:33 2019 +0200 Changed download location for MySQL package commit ea34af93f64ec3db096e2ea653815869fa1b3408 Merge: 8325e56eb e533e07e6 Author: Thomas Baumgart Date: Mon Sep 30 19:47:08 2019 +0200 Merge remote-tracking branch 'origin/5.0' commit 8325e56eb0c22ff268aef2c1df10e83ea2c2e0a5 Merge: fc725fc17 2d6f2338c Author: Thomas Baumgart Date: Wed Sep 25 10:55:32 2019 +0200 Merge remote-tracking branch 'origin/5.0' commit fc725fc179b8dbbee8e754f3d90e292892771143 Merge: 4e38f0cb4 938008b5c Author: Thomas Baumgart Date: Tue Sep 24 20:18:16 2019 +0200 Merge remote-tracking branch 'origin/5.0' commit 4e38f0cb4bae63884e8122eaabbe0527de18718e Author: l10n daemon script Date: Tue Sep 24 02:43:47 2019 +0200 GIT_SILENT made messages (after extraction) commit 7b72e980014dcf48a42be19f2441d02dadbbd7d3 Merge: 85f4f7aa1 89a9f0409 Author: Thomas Baumgart Date: Sun Sep 22 11:40:48 2019 +0200 Merge remote-tracking branch 'origin/5.0' commit 85f4f7aa1aa6900cc194ee3cac09ee8747cf7927 Author: l10n daemon script Date: Sun Sep 15 05:03:20 2019 +0200 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" commit 7aa2eb221d0686e58a5a93e81c7df5331ee001a1 Author: l10n daemon script Date: Sun Sep 15 02:40:28 2019 +0200 GIT_SILENT made messages (after extraction) commit a643a9ea9e61efb8c46aefa339305f3ccf0d32fe Author: Thomas Baumgart Date: Sat Sep 14 17:13:43 2019 +0200 Limit version to 5 characters The version information that is transitted to the German banks only allows a maximum of 5 characters. We simply remove the dots and truncate it to five characters which will send the full version info to the institution. commit 9ee73d0dcdd7ccc355e1575bfec51944c0029cee Merge: 806e236d4 cb8895fc0 Author: Thomas Baumgart Date: Sat Sep 14 16:48:58 2019 +0200 Merge remote-tracking branch 'origin/5.0' commit 806e236d486917987510ee9b5e7e08d445c3314e Merge: 2ab1dac41 5f5848ba2 Author: Thomas Baumgart Date: Sat Aug 31 17:48:59 2019 +0200 Merge remote-tracking branch 'origin/5.0' commit 2ab1dac41af17d37cd7172986617674f6131cddf Author: l10n daemon script Date: Tue Aug 20 04:56:11 2019 +0200 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" commit 5b2daafacd6696423eb74ccfbe0f332b6b39ec76 Author: l10n daemon script Date: Tue Aug 20 02:39:00 2019 +0200 GIT_SILENT made messages (after extraction) commit e08a50431dfd99951964fef6ad5c4ac2956dd57e Merge: c3570cc44 ab92d1e11 Author: Thomas Baumgart Date: Sun Aug 18 09:15:21 2019 +0200 Merge remote-tracking branch 'origin/5.0' commit c3570cc4490b27393cbb589bc69692ee49268f5f Merge: fcd162bc4 cd00fe960 Author: Thomas Baumgart Date: Sat Aug 10 18:44:35 2019 +0200 Merge remote-tracking branch 'origin/5.0' commit fcd162bc46928852ae5ebd99dc4a1755748dd9da Merge: 197afdcf4 1e4db1595 Author: Thomas Baumgart Date: Tue Aug 6 12:29:16 2019 +0200 Merge remote-tracking branch 'origin/5.0' commit 197afdcf4c1ae43729b123b576a5635d424e44a1 Author: l10n daemon script Date: Sun Aug 4 05:07:23 2019 +0200 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" commit 44d27e0238a0c904cdd7f07bb4392fd90f4b8ede Author: l10n daemon script Date: Sun Aug 4 02:40:23 2019 +0200 GIT_SILENT made messages (after extraction) commit e72565850d4b4b1e45ead8dfc942382706fa77b2 Merge: e2b08c03e b48fc8588 Author: Luca Beltrame Date: Sun Jul 21 09:11:50 2019 +0200 Merge branch '5.0' commit e2b08c03e75f4a56b9942952c0d784edd89373bf Merge: 0ce282a4b 8aca5bbef Author: Thomas Baumgart Date: Sun Jul 7 15:09:17 2019 +0200 Merge remote-tracking branch 'origin/5.0' commit 0ce282a4b21f8490672cf42905167f6952dfd83c Author: Thomas Baumgart Date: Tue Jul 2 08:42:32 2019 +0200 Select amount when changing focus using the tab/backtab key Commit 8841ae39d15b5ddb916a151d7bc20415862fe34d introduced a problem such that the amount was not selected when the focus was changed to the amountfield using the tab or backtab key. This used to work before with the KMyMoneyEdit object. For the standard transaction editor this was fixed by commit 5008fc800e8806522263a9c9b5cc1cc5d74c7ae5 but there are more locations in the code where this change is necessary. This change adds the fix to cover all locations which show the above problem. BUG: 409371 commit bb624bf6e54f7a27abe08e5a88e95d3ad40e960a Author: Thomas Baumgart Date: Mon Jul 1 18:20:42 2019 +0200 Improve handling of decimal point character in amount edits Pressing the decimal point in an amount edit field with all text selected caused the selection to be removed and the cursor to jump to the end of the amount. This change now forces the text to be replaced with a 0 so that pressing the decimal point with all text selected allows to start entry of a fractional amount without pressing a leading 0. BUG: 409371 commit e9731c67e3764d3d1230fcdf7ecacd427a92162b Merge: 2587ccaab 21ba9b3a7 Author: Thomas Baumgart Date: Wed Jun 26 08:43:59 2019 +0200 Merge remote-tracking branch 'origin/5.0' commit 2587ccaab11991bc98abf82c8999c0dbf4d5f1ee Author: l10n daemon script Date: Tue Jun 25 05:11:09 2019 +0200 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" commit df56201bc969d7a9f9fadd3fcfcb19aa36e8d2f3 Author: l10n daemon script Date: Mon Jun 24 02:45:50 2019 +0200 GIT_SILENT made messages (after extraction) commit 05da4d5d0ce1b11be717cec50c3271e20c228cb3 Author: Thomas Baumgart Date: Fri Jun 21 17:25:19 2019 +0200 Remove unused include statement commit 5a2eb380a5ad77aecb6f3ba286a2c8e5b08a0826 Author: Thomas Baumgart Date: Fri Jun 21 17:21:42 2019 +0200 Simplify MyMoneyPayee API Removed unused ctor and methods commit ef1d8cff1b2621692e4398b47be3775424da9faf Author: l10n daemon script Date: Fri Jun 21 05:26:18 2019 +0200 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" commit 4eb67e9ac887e220b4c6531a350f1755f324a9ee Merge: 2bbdc29bc 686945965 Author: Thomas Baumgart Date: Thu Jun 20 11:07:15 2019 +0200 Merge remote-tracking branch 'origin/5.0' commit 2bbdc29bc9c77a14eaf4e560ad855db1d422c3ee Author: Thomas Baumgart Date: Sun Jun 16 16:12:33 2019 +0200 Improve global storage of standard precision commit c3442d0714964b70a04da21a289bdb8806f1617b Author: Thomas Baumgart Date: Sun Jun 16 16:05:41 2019 +0200 Reimplemented AmountValidator commit 0d17b5b7ceec80ea005712f87f415768eb7d7f31 Author: Thomas Baumgart Date: Sun Jun 16 15:51:34 2019 +0200 Added testcases for AmountValidator commit 885d68311f938a11af0a7ec80f2084198c6175fe Author: Alexander Potashev Date: Wed Jun 12 15:15:36 2019 +0300 doc: Write docbook date in standard format commit 30bead74b3d48fc62369676f5cba6e717aaec50a Author: l10n daemon script Date: Tue Jun 11 05:16:42 2019 +0200 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" commit 5008fc800e8806522263a9c9b5cc1cc5d74c7ae5 Author: Thomas Baumgart Date: Sat Jun 8 15:36:39 2019 +0200 Select amount when changing focus using the tab/backtab key The previous commit showed a problem in the transaction editor such that the amount was not selected when the focus was changed to the amount field using the tab or backtab key. This used to work before with the KMyMoneyEdit object. This change fixes the problem by passing the reason as part of the focus change. commit 8841ae39d15b5ddb916a151d7bc20415862fe34d Author: Jose Arthur Benetasso Villanova Date: Sat Jun 8 14:39:41 2019 +0200 Change KMyMoneyEdit to AmountEdit Summary: Refactor KMyMoney to use just AmountEdit Test Plan: "make test" and explore the interface Reviewers: #kmymoney, tbaumgart Reviewed By: #kmymoney, tbaumgart Subscribers: wojnilowicz, brunourias, tbaumgart Differential Revision: https://phabricator.kde.org/D20887 commit 7611781f32a3040ac434dc1fe1e82619a58bff9f Author: Jonathan Riddell Date: Fri May 24 16:38:53 2019 +0100 update screenshots commit db7ccf17d230edddf7bc36a81a5f77c6b4db06d7 Author: Thomas Baumgart Date: Sun May 19 13:31:55 2019 +0200 Moved payees model closer to storage commit 33a3b33427f332c2f4a6abe7e51e11f84e6f04e1 Merge: 848aee98b 878149473 Author: Thomas Baumgart Date: Sun May 19 11:18:55 2019 +0200 Merge remote-tracking branch 'origin/5.0' commit 848aee98b7c0f12b0625685d095995e80bffdbe0 Merge: 67ad34ca7 582484405 Author: Thomas Baumgart Date: Sun May 12 11:03:50 2019 +0200 Merge remote-tracking branch 'origin/5.0' commit 67ad34ca71513de80fabdb7a7156c8f78751b39d Merge: d6315b9df f9a1d6eec Author: Thomas Baumgart Date: Thu May 9 22:33:49 2019 +0200 Merge remote-tracking branch 'origin/5.0' commit d6315b9df8da799acc4d45c399a25a89849f41e5 Merge: d9a91e40c 6bffb7d0d Author: Pino Toscano Date: Thu May 9 22:02:52 2019 +0200 Merge remote-tracking branch 'origin/5.0' commit d9a91e40c91d54b57d76d968fd1f1baa3869ff5f Author: l10n daemon script Date: Mon May 6 03:09:44 2019 +0200 GIT_SILENT made messages (after extraction) commit 313d9d8e0fe20c23c89d2059498110586ac30e3b Merge: 1ef8d6ebc 8ec3540e4 Author: Thomas Baumgart Date: Sun Apr 21 13:11:44 2019 +0200 Merge remote-tracking branch 'origin/5.0' commit 1ef8d6ebcd1605644e5db9771d618ba4a71e7a54 Merge: 5b599ce3c 9fca9e366 Author: Thomas Baumgart Date: Fri Apr 19 10:18:11 2019 +0200 Merge remote-tracking branch 'origin/5.0' commit 5b599ce3cd8b089bcdf717297120da4013e2430b Merge: cc8c17954 4f18e693e Author: Thomas Baumgart Date: Mon Apr 8 22:27:43 2019 +0200 Merge remote-tracking branch 'origin/5.0' commit cc8c17954443e93e153c9e3bdc7f074b0c304c76 Merge: 36cf87427 65e383769 Author: Thomas Baumgart Date: Sun Apr 7 09:23:47 2019 +0200 Merge remote-tracking branch 'origin/5.0' commit 36cf874272d8158ca1c5f0a096a118de104468f4 Merge: 6af631731 a4a39821b Author: Thomas Baumgart Date: Fri Apr 5 19:53:38 2019 +0200 Merge remote-tracking branch 'origin/5.0' commit 6af63173157ebc8f6ddf3899eea2d8676ece6ebf Author: Thomas Baumgart Date: Sat Mar 30 17:07:10 2019 +0100 Adjust minimum req for ECM to 5.42 commit b6f79662df2a2fc2892d1c8e06aad2efbce3a7b5 Author: l10n daemon script Date: Mon Mar 25 05:51:47 2019 +0100 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" commit fccd937fd6e72078c7498022c0e9ade2d880ca64 Merge: 71c935e04 f4c359840 Author: Thomas Baumgart Date: Thu Mar 14 18:49:16 2019 +0100 Merge remote-tracking branch 'origin/5.0' commit 71c935e042761f4498aa6dce3799938cebeff488 Author: l10n daemon script Date: Thu Mar 14 05:36:18 2019 +0100 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" commit e34d9280956d435faee3503f3e3fd7b090873ad4 Author: l10n daemon script Date: Sun Mar 10 05:33:51 2019 +0100 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" commit b72447fa1f43c9489031a382f52a7f0de77d5156 Author: l10n daemon script Date: Sun Mar 10 03:09:29 2019 +0100 GIT_SILENT made messages (after extraction) commit f07c00d331b001e6d87c62d589e94b3494544a85 Merge: fc6a47d31 59afca03c Author: Thomas Baumgart Date: Thu Mar 7 09:13:55 2019 +0100 Merge remote-tracking branch 'origin/5.0' commit fc6a47d31ee6b50cdea13ea786c6dcbb13263a9d Author: l10n daemon script Date: Thu Mar 7 05:47:47 2019 +0100 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" commit 16d9e051018ab9b021414b2959658542a581f8c1 Merge: d77450301 0467a8011 Author: Thomas Baumgart Date: Tue Mar 5 14:06:20 2019 +0100 Merge remote-tracking branch 'origin/5.0' commit d77450301a51fede5bb61e8ec1bc4314a60c6aee Author: l10n daemon script Date: Sat Mar 2 05:42:36 2019 +0100 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" commit e8708ba8490654e775a5ae3ca980f9e815e5ac87 Merge: 19ced2786 88cad4dc6 Author: Thomas Baumgart Date: Fri Mar 1 10:28:18 2019 +0100 Merge remote-tracking branch 'origin/5.0' commit 19ced2786e0e4f838cc2c0225df35239f9113bae Author: l10n daemon script Date: Mon Feb 25 05:46:27 2019 +0100 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" commit ef7eb6684daf7629e44772a3cb264f1a78b4075c Author: l10n daemon script Date: Sat Feb 16 05:38:11 2019 +0100 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" commit 0a60581791ed4a702c8fd64c6851caeb32a86845 Author: l10n daemon script Date: Thu Feb 14 05:36:36 2019 +0100 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" commit bc380fcff9204c75bd9ca926d4352ccbbaea6fb3 Author: l10n daemon script Date: Wed Feb 13 05:52:24 2019 +0100 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" commit 9a261ba4cbb7596427d6b26dfa924bddfaf1a75f Author: l10n daemon script Date: Sat Feb 9 05:38:07 2019 +0100 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" commit 5dd86af5d79354293a28208f581750c2c4dfe045 Merge: 40ded9da4 1ed8708bd Author: Thomas Baumgart Date: Fri Feb 8 19:46:02 2019 +0100 Merge remote-tracking branch 'origin/5.0' commit 40ded9da490b4fc21a1058fba47d8eb917523fc5 Author: l10n daemon script Date: Thu Feb 7 05:33:48 2019 +0100 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" commit 9a513c36cbcd392f8683081fb253b5f696a85dcb Author: l10n daemon script Date: Wed Feb 6 05:39:39 2019 +0100 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" commit ab0ae7014af2551d3d3fe49379235cb4b6d1af4f Author: l10n daemon script Date: Tue Feb 5 05:32:30 2019 +0100 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" commit 47be5be01db3e1a3332ec34d71c033bcff37f84f Author: l10n daemon script Date: Mon Feb 4 05:24:35 2019 +0100 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" commit 3bb1dc4b52b47648512f1f41476be2e0050ecaaa Author: l10n daemon script Date: Sun Feb 3 05:32:12 2019 +0100 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" commit 4654586dfff8295b34f72c904d43acf8b3bef93d Merge: 339a7028c 8a7fc5bd4 Author: Thomas Baumgart Date: Sat Feb 2 14:54:17 2019 +0100 Merge remote-tracking branch 'origin/5.0' commit 339a7028c06114a6b3864803bb770ab4ef1c4178 Author: l10n daemon script Date: Sat Feb 2 05:25:36 2019 +0100 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" commit ed8b47fd5797eb22fefb676ac4461bac63ab7bec Merge: e3c27df58 e052f1830 Author: Luigi Toscano Date: Fri Feb 1 10:17:54 2019 +0100 Merge remote-tracking branch 'origin/5.0' commit e3c27df58f0a958b949b0aa0a9a6bfe905e80836 Author: Ben Cooksley Date: Fri Feb 1 20:03:52 2019 +1300 Make sure we set VERSION so linuxdeployqt/appimagetool knows how to name the appimage. Previously it did not do this, and we had our own logic to rename the appimages (which is now unnecessary, and is removed in this fix) Ref T10428 commit b6b2cd517af99f25bb5f751dace30bfc359d0096 Merge: d6c0b56d8 778ff2c55 Author: Thomas Baumgart Date: Tue Jan 29 19:35:06 2019 +0100 Merge remote-tracking branch 'origin/5.0' commit d6c0b56d8bd34e3f2227bddea5d65e7702cd3f25 Merge: 715227873 c9bacc5dc Author: Thomas Baumgart Date: Sat Jan 26 16:28:38 2019 +0100 Merge remote-tracking branch 'origin/5.0' commit 7152278733d10ce5bfecc29ebc314d5d5e5bb7ca Author: l10n daemon script Date: Thu Jan 24 05:28:13 2019 +0100 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" commit 522caf0af78c2def39a151d4e49b0c66fe23ec50 Author: l10n daemon script Date: Thu Jan 24 02:59:29 2019 +0100 GIT_SILENT made messages (after extraction) commit dad3f25c548b53467c8ab18615a72864e2a5bdd1 Merge: 13d81a56d 462e70c27 Author: Thomas Baumgart Date: Mon Jan 21 19:36:05 2019 +0100 Merge remote-tracking branch 'origin/5.0' commit 13d81a56dd8fbbcc29cb98378102fb8704aee0af Merge: b17d61f59 bd103f873 Author: Thomas Baumgart Date: Sat Jan 19 16:45:43 2019 +0100 Merge remote-tracking branch 'origin/5.0' commit b17d61f598bb9bf240db41e3136606bb54424c04 Author: Marc Huebner Date: Thu Jan 17 00:32:20 2019 +0100 Display name of equity with strikeout font if the equity account has been closed. Summary: Display name of equity with strikeout font if the equity account has been closed. Test Plan: Open Investment view. Verify closed equity accounts are displayed with strike through font and open equity accounts are displayed with normal font. Close an equity account. Verify the display of the account just closed changed from normal to striked through font. Reopen the equity account. Verify the display of the account just reopened changed from striked through to normal font. Reviewers: #kmymoney, tbaumgart Reviewed By: #kmymoney, tbaumgart Subscribers: #kmymoney Tags: #kmymoney Differential Revision: https://phabricator.kde.org/D16433 commit d98bf0356208edc38b71287514e51301f909f2d7 Merge: d7f9369dc 3939181ec Author: Thomas Baumgart Date: Sun Jan 13 09:31:38 2019 +0100 Merge remote-tracking branch 'origin/5.0' commit d7f9369dcb0a6fb69c6678fde5df9334dd448b2f Merge: 08109ea75 a606f027f Author: Thomas Baumgart Date: Wed Jan 9 20:25:38 2019 +0100 Merge remote-tracking branch 'origin/5.0' commit 08109ea75c3bf855d6f084ae2f0878845be8cafa Merge: 212fa51c8 6ae4b64ac Author: Thomas Baumgart Date: Thu Jan 3 16:54:28 2019 +0100 Merge remote-tracking branch 'origin/5.0' Merged recent changes from the stable branch to master commit 212fa51c8abf6cca252c2e6c43a072adfd75f2b4 Author: l10n daemon script Date: Fri Dec 28 02:54:19 2018 +0100 GIT_SILENT made messages (after extraction) commit 24f43ccc5eeed58925c091e86d241b12996dc11d Author: Thomas Baumgart Date: Mon Dec 17 17:07:46 2018 +0100 Fix display behavior of Enter Schedule Dialog - Remember width of dialog - Place centered on screen - Increase default size BUG: 402200 FIXED-IN: 5.0.3 commit 63c5f9c8109aba02a2f43531fdc7a37ae7db29ae Author: Thomas Baumgart Date: Mon Dec 17 17:05:15 2018 +0100 Don't include unused header file commit e26ad94a7d6ffde18928ce38ff0a5bbaca7eed74 Merge: 050c7d17e a9c6fffc9 Author: Thomas Baumgart Date: Sat Dec 15 14:52:59 2018 +0100 Merge remote-tracking branch 'origin/5.0' commit 050c7d17ee707a3f4b63abb35fa4fc23bc97e444 Author: Thomas Baumgart Date: Sun Dec 9 16:15:56 2018 +0100 Allow to build KMyMoney optionally against Alkimia version 8 commit 6ba86e8d02dc3dc7fc57b66097a5803c96c22571 Author: João Netto Date: Thu Dec 6 12:26:07 2018 +0100 Fixed bug that crashed program when clicking Forecast->Chart Summary: BUG: 400820 Reviewers: #kmymoney, tbaumgart Reviewed By: #kmymoney, tbaumgart Subscribers: tbaumgart Differential Revision: https://phabricator.kde.org/D17368 commit 4adcb509ca70729706f0edb603e9a55b6844040c Author: Thomas Baumgart Date: Mon Dec 3 19:50:45 2018 +0100 Don't react on empty view commit 9c40e86542e9dba947f925d852b1798433d1cfec Author: Thomas Baumgart Date: Sat Dec 1 20:16:15 2018 +0100 Don't update opening transaction if not changed In case the opening transaction did not change after the account editor is left there is no need to update it in the engine causing expensive recalculations. commit 7ddcba4bcd1ea0349859e0af2957b0354f20de8f Author: l10n daemon script Date: Sun Dec 2 03:01:06 2018 +0100 GIT_SILENT made messages (after extraction) commit dffdf76750f74ad6e8741abe5ed4b7380f9b65e3 Author: Michael Kiefer Date: Fri Nov 30 22:47:40 2018 +0100 Add feature to show separate income and expenses in charts In charts income and expense categories were shown in the same direction. This change adds a feature that shows income and expense categories in oposite directions. See https://phabricator.kde.org/D17202 for more details. Signed-off-by: Thomas Baumgart commit 0140f347408ec88bf0fe9d903df0c61930c5ac40 Merge: eb3d509b7 fc251a95c Author: Thomas Baumgart Date: Fri Nov 30 18:08:32 2018 +0100 Merge remote-tracking branch 'origin/5.0' commit eb3d509b71e5540c11e325488c80cbd120a83d55 Author: l10n daemon script Date: Fri Nov 30 05:48:29 2018 +0100 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" commit 40d1b335024cc0cc2ed981e6cf9b43177d7578f7 Author: l10n daemon script Date: Fri Nov 30 03:00:29 2018 +0100 GIT_SILENT made messages (after extraction) commit cfd484f5c9f1fb06a69f7365b26e130a049d1e5e Merge: b99dca460 e3ad0e31f Author: Thomas Baumgart Date: Sun Nov 18 09:55:15 2018 +0100 Merge remote-tracking branch 'origin/5.0' commit b99dca4602b65fe239cd023f67d44c324d6761b8 Author: l10n daemon script Date: Sat Nov 17 05:55:50 2018 +0100 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" commit bda8e4a02e7a92f95073339828b6e6ac32f6b140 Merge: 6c06e3bf4 391b6ffb9 Author: Łukasz Wojniłowicz Date: Sun Nov 4 17:45:38 2018 +0100 Merge branch '5.0' commit 6c06e3bf4358f9baaae98e92f030ecf563fe7ea7 Author: Łukasz Wojniłowicz Date: Sat Nov 3 10:22:04 2018 +0100 Update AppImage dependencies commit c8675659f23c22594b939f5c725634928c50bff1 Author: Łukasz Wojniłowicz Date: Sat Nov 3 10:01:08 2018 +0100 Patch KService for AppImage, try 2 commit 6b49f80dd9db3684652c0e841d805218d583cd3d Merge: d0e7eeaf5 73d31fcde Author: Thomas Baumgart Date: Sun Oct 28 10:32:07 2018 +0100 Merge remote-tracking branch 'origin/5.0' commit d0e7eeaf543bfcee53203b19910d393490c47b79 Author: l10n daemon script Date: Sat Oct 27 05:50:05 2018 +0200 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" commit df3615e477740a3ff70398d20321ee575a1ec319 Merge: 036016b21 cf0ead3cf Author: Thomas Baumgart Date: Fri Oct 26 17:38:48 2018 +0200 Merge remote-tracking branch 'origin/5.0' commit 036016b21494d605317ad74fe8520b2fdd25a458 Author: l10n daemon script Date: Fri Oct 26 05:46:49 2018 +0200 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" commit a60a5248ae5306b2adb84a1279c1e7c44fe27826 Author: Łukasz Wojniłowicz Date: Thu Oct 25 17:06:29 2018 +0200 Copy OpenSSL libs from correct location commit 22cba80545f3b925cc2fc122a77ef578b5a83332 Author: Łukasz Wojniłowicz Date: Wed Oct 24 17:01:07 2018 +0200 Build OpenSSL 1.1.1 for AppImage commit 1a610ef4d23cb5828489619d80eb530068a91285 Author: Łukasz Wojniłowicz Date: Wed Oct 24 16:23:48 2018 +0200 Patch KService for AppImage Otherwise KService won't find KCModules. commit 98d7cb787daabf8b1bac50358a35f6e36d35e233 Author: Łukasz Wojniłowicz Date: Sun Oct 21 13:50:05 2018 +0200 Update AppImage dependencies commit 384f54d1e9021ecc41b7078effd379e655a97eaa Author: Łukasz Wojniłowicz Date: Sun Oct 21 09:01:41 2018 +0200 Update AppImage dependencies commit 21edd9a84053fad24b7d3698a1c13ea2f3bffcc9 Author: l10n daemon script Date: Sun Oct 21 05:48:34 2018 +0200 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" commit ed2444618a3ee654f7a9967d7a02c58721667f6a Merge: 4204fb001 a45470125 Author: Thomas Baumgart Date: Fri Oct 19 08:54:25 2018 +0200 Merge remote-tracking branch 'origin/5.0' commit 4204fb00123a828ecc8b69f11ca2f70df62656ce Author: Łukasz Wojniłowicz Date: Thu Oct 18 19:22:26 2018 +0200 Disable own OpenSSL build for AppImage commit d60b80992c7e5f45dab22d75dd55e343a8e0aa11 Author: Łukasz Wojniłowicz Date: Tue Oct 16 19:06:17 2018 +0200 Revert "Downgrade OpenSSL for AppImage" This reverts commit 348df35f3156922b7862e2ab65f787d1097e8463. commit cb9c35e221e36fce55a254525da6aaee9af84eda Author: Łukasz Wojniłowicz Date: Tue Oct 16 19:05:02 2018 +0200 Update AppImage dependencies commit ff0a4ce1f9ed3f325c4493338f3fb2ba1019b017 Author: Łukasz Wojniłowicz Date: Sun Oct 14 13:29:05 2018 +0200 Build Pepper Plugins for AppImage commit 348df35f3156922b7862e2ab65f787d1097e8463 Author: Łukasz Wojniłowicz Date: Sun Oct 14 05:34:10 2018 +0200 Downgrade OpenSSL for AppImage commit 540905dacfbe60d8b621cb76b1210d00f29467c1 Merge: bbb67511d 98320a4ae Author: Thomas Baumgart Date: Sat Oct 13 16:46:14 2018 +0200 Merge remote-tracking branch 'origin/5.0' commit bbb67511dd740026ac9dc543655b9be234ad98a0 Author: Łukasz Wojniłowicz Date: Thu Oct 11 16:23:57 2018 +0200 Update AppImage dependencies commit 6c995b367108e432c572b5c7aac8032bb8ef9f2a Merge: 402c0c269 a3e124ea1 Author: Thomas Baumgart Date: Thu Oct 11 20:58:36 2018 +0200 Merge remote-tracking branch 'origin/5.0' commit 402c0c269e9b0ba2e21a3c03e3e34f632a574794 Author: l10n daemon script Date: Wed Oct 10 06:19:51 2018 +0200 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" commit 2ef5fa964608418be10f66d99abf8f957e5f0b1a Author: l10n daemon script Date: Wed Oct 10 03:55:40 2018 +0200 GIT_SILENT made messages (after extraction) commit ebccb8fa326739915232a73badf0cffc347ad609 Author: Łukasz Wojniłowicz Date: Mon Oct 8 21:30:46 2018 +0200 Fix installing of ncurses's pc file commit 7eba821e004feeb186be79a1ae6459092196bf34 Author: Łukasz Wojniłowicz Date: Mon Oct 8 19:14:51 2018 +0200 Fix ncurses build commit 981084c6d0b5743bb4b2695235ca68e7c3a93822 Author: Łukasz Wojniłowicz Date: Tue Oct 2 18:52:16 2018 +0200 Update AppImage dependencies commit 58f6b9c63576fed17201170461c5b085662d3237 Merge: ac21b0ded 85cc72af5 Author: Thomas Baumgart Date: Sun Oct 7 11:21:43 2018 +0200 Merge remote-tracking branch 'origin/5.0' commit ac21b0ded669feffe94e893a15cf8571db6b4621 Author: Thomas Baumgart Date: Sat Oct 6 13:26:11 2018 +0200 Fix krazy warnings commit d8263aaf3bc9053e2f689a140111df8130642fad Merge: 407717c60 9373aeb22 Author: Thomas Baumgart Date: Sat Oct 6 13:20:42 2018 +0200 Merge remote-tracking branch 'origin/5.0' commit 407717c6029b43daf6925876a5213b1967e98e4d Merge: b775f19e0 1784b2c38 Author: Thomas Baumgart Date: Sat Oct 6 09:27:30 2018 +0200 Merge remote-tracking branch 'origin/5.0' commit b775f19e001420778c8399861eca7516f2bbcb71 Author: Thomas Baumgart Date: Mon Oct 1 19:24:32 2018 +0200 Fix build on Windows and FreeBSD commit b35d01050827b7e9996ba9004f41a6d67ded4e6c Merge: 4ca80b519 8c8b53a9c Author: Thomas Baumgart Date: Mon Oct 1 18:53:27 2018 +0200 Merge remote-tracking branch 'origin/5.0' commit 4ca80b5193d981e217d64d5e2c1ddd75101f3973 Merge: 5512296d6 7d30bb0f4 Author: Thomas Baumgart Date: Sun Sep 30 14:18:36 2018 +0200 Merge remote-tracking branch 'origin/5.0' Include recent fixes on the 5.0 branch in master commit 5512296d660eab013d65566ec78307042e98c739 Author: Łukasz Wojniłowicz Date: Sun Sep 30 12:57:09 2018 +0200 Fix QWebEngine on Qt 5.11 This patch fixes blank pages when QWebEngine is used. commit df6efe4a32611983a009d57e7c4aeea6ac1af081 Author: Łukasz Wojniłowicz Date: Sun Sep 30 12:38:01 2018 +0200 Try to fix plugins in AppImage commit 7ef63951f723cb4d1f6c1b1dd627c755e3357fd6 Author: Łukasz Wojniłowicz Date: Wed Sep 26 20:19:03 2018 +0200 Avoid QStringBuilder for AppImage commit 74d713b985c55b8ba8d608d42cac9b77a6ab2327 Author: Yuri Chornoivan Date: Wed Sep 26 21:16:58 2018 +0300 Fix minor EBN issues and typos commit edd0e5dd7da5bd62620343d1df8a4cf66a7aaa0b Author: Łukasz Wojniłowicz Date: Tue Sep 25 19:30:54 2018 +0200 Try to fix AppImage commit 716f2e7b15f756de98fe8aa64ada199ab94e0372 Author: Łukasz Wojniłowicz Date: Mon Sep 24 16:52:07 2018 +0200 Try to fix AppImage build commit 4ff4216fe41e57212fc5233d8e682bc6bd16b394 Author: Łukasz Wojniłowicz Date: Sun Sep 23 14:37:16 2018 +0200 Fix previous patch commit a27d1f322e80186aeceb2f9e8723e29fd56847a7 Author: Łukasz Wojniłowicz Date: Wed Sep 19 19:28:16 2018 +0200 Adjust some standard paths for AppImage Differential Revision: https://phabricator.kde.org/D15604 commit c7f7cec866acfd569a27e1921da9355392485684 Merge: b580ddeab cc670b1a8 Author: Ralf Habacker Date: Thu Sep 20 22:10:55 2018 +0200 Merge remote-tracking branch 'origin/5.0' commit b580ddeabc5440aab1b71a4a8e3ecbc2a5fab272 Author: Łukasz Wojniłowicz Date: Mon Sep 17 16:14:42 2018 +0200 Always build xmlhelper XML storage backend is not yet a plugin so xmlhelper should be built unconditionally for now. commit 0b75da0f0a640e5c913274b5d9439f3994810755 Author: Łukasz Wojniłowicz Date: Sun Sep 16 07:10:19 2018 +0200 Don't use host for aqbanking commit 326fdcfd7b7657261732e4fef244e237a1902b77 Author: Łukasz Wojniłowicz Date: Wed Sep 12 16:48:22 2018 +0200 Update AppImage dependencies commit 25d39a493f4157f1c1ad700ee349fb7ce17b24ac Author: Łukasz Wojniłowicz Date: Tue Sep 11 19:54:20 2018 +0200 Update AppImage dependencies commit 95ef0cee6a104c38c5836d6fa6748b81553bd82e Author: Łukasz Wojniłowicz Date: Mon Sep 10 18:03:27 2018 +0200 Revert "Don't use host for aqbanking" This reverts commit 90212a2b052e70120ec25a6be96e5aa548db58c8. commit 90212a2b052e70120ec25a6be96e5aa548db58c8 Author: Łukasz Wojniłowicz Date: Sun Sep 9 11:56:03 2018 +0200 Don't use host for aqbanking commit d5ae75a2d7886b467a209dab23ece8f1c2175064 Author: Łukasz Wojniłowicz Date: Sun Sep 9 11:26:38 2018 +0200 Build xml static as well commit 88fdda8b21bf43290ddc61906bdbf46aaa01b08f Author: Łukasz Wojniłowicz Date: Sun Sep 9 08:10:43 2018 +0200 Fix akonadi on Qt 5.11 commit 0d52935b7237fa802cf55fb8aaed3c32465aaddd Author: Łukasz Wojniłowicz Date: Sat Sep 8 08:56:00 2018 +0200 Update AppImage dependencies commit 0ff52bc8a4c3d935470bed2ed9d90690f174f511 Author: Łukasz Wojniłowicz Date: Sat Sep 8 06:49:17 2018 +0200 Disable most features for AppImage Differential Revision: https://phabricator.kde.org/D15343 commit 99224435b6daf3488984375e848555f2958f5bea Merge: c20b607d3 93a87bc81 Author: Thomas Baumgart Date: Sat Sep 8 15:18:57 2018 +0200 Merge remote-tracking branch 'origin/5.0' commit c20b607d330b32c3eaca4e3e3fe0e2df93e68cd9 Merge: 2c998ce4b 98976cfdb Author: Thomas Baumgart Date: Wed Sep 5 20:16:26 2018 +0200 Merge remote-tracking branch 'origin/5.0' commit 2c998ce4bab87ead83f500a85a1019d8dd0fea8d Author: Łukasz Wojniłowicz Date: Wed Sep 5 17:50:35 2018 +0200 Fix SQLCipher during AppImage build commit 76984cf9130a6f42b3428b87204fffd1723ba909 Author: Łukasz Wojniłowicz Date: Mon Sep 3 17:20:51 2018 +0200 Build QWebEngine for AppImage commit ad7e6b3ea759437a525480dfda2e8fee1004d9b9 Author: l10n daemon script Date: Mon Sep 3 05:46:42 2018 +0200 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" commit 01363e81b9a3ee4ec48c7b8bff3a4b0d38c5fac5 Merge: 489e4d72a a8949682c Author: Thomas Baumgart Date: Sun Sep 2 20:36:13 2018 +0200 Merge remote-tracking branch 'origin/5.0' commit 489e4d72a6bb4308cc42368fdb261606b5615d38 Author: Łukasz Wojniłowicz Date: Sun Sep 2 14:49:21 2018 +0200 Fix home screen background on QWebEngine When KMyMoney is compiled with QWebEngine and theme is dark then background on home screen is white instead of being dark. This patch adds background color to the loaded texture. commit db91014b167a86fbedf774c6366c1217446d386b Author: Łukasz Wojniłowicz Date: Sun Sep 2 12:19:06 2018 +0200 Add more AppImage dependencies