Merge remote-tracking branch 'origin/4.8'
8dfd9f5f310a
Actions

Authored by habacker on Jun 20 2017, 1:11 PM.

Description

Merge remote-tracking branch 'origin/4.8'

Conflicts:
CMakeLists.txt
kmymoney/dialogs/settings/ksettingskmymoney.h
kmymoney/dialogs/settings/ksettingsschedules.cpp
kmymoney/dialogs/transactioneditor.cpp
kmymoney/kmymoney.cpp
kmymoney/main.cpp
kmymoney/mymoney/CMakeLists.txt
kmymoney/mymoney/payeeidentifier/tests/payeeidentifier-test.h
kmymoney/mymoney/storage/kmymoney-sqlstorageplugin.desktop
kmymoney/org.kde.kmymoney.appdata.xml
kmymoney/plugins/csvimport/redefinedlg.cpp
kmymoney/plugins/csvimport/symboltabledlg.cpp
kmymoney/plugins/csvimport/symboltabledlg.h
kmymoney/plugins/kbanking/mymoneybanking.cpp
kmymoney/plugins/kbanking/mymoneybanking.h
kmymoney/plugins/kmymoney-onlinetaskui.desktop
kmymoney/plugins/kmymoney-payeeidentifierdelegate.desktop
kmymoney/plugins/ofximport/ofximporterplugin.cpp
kmymoney/plugins/ofximport/ofxpartner.cpp
kmymoney/plugins/onlinejobpluginmockup/kmm_onlinejobpluginmockup.desktop
kmymoney/plugins/onlinetasks/sepa/CMakeLists.txt
kmymoney/plugins/weboob/kmm_weboob.desktop
kmymoney/views/kmymoneyview.cpp
kmymoney/widgets/kaccounttemplateselector.cpp
kmymoney/widgets/kmymoneydateinput.cpp
kmymoney/widgets/kmymoneydateinput.h
libkdchart/kdablibfakes/src/KDABLibFakes.h
libkgpgfile/CMakeLists.txt

git branch master has been compiled with this merge applied.

Approved by tbaumgart@kde.org.

Details

Committed

habacker

Jun 20 2017, 5:09 PM

Parents

R261:dd770434613d: Make debug output of parsed fields from online web price quotes more visible by…
R261:e60a1688d941: Keep focus on ledger after editing a transaction

Branches

Unknown

Tags

Unknown

habacker committed R261:8dfd9f5f310a: Merge remote-tracking branch 'origin/4.8' (authored by habacker).Jun 20 2017, 5:09 PM

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

Commit	Author	Details	Committed
dd770434613d	habacker	Make debug output of parsed fields from online web price quotes more visible by…	Jun 20 2017
9df677f601a2	l10n daemon script	SVN_SILENT made messages (.desktop file)	Jun 8 2017
f235a5b236d3	habacker	Fix bug having multiple opening balance accounts on template import.	Jun 7 2017
e01a94f28c77	habacker	Add support to use a dedicated opening balance account.	Jun 7 2017
4752fe77a8a5	l10n daemon script	SVN_SILENT made messages (.desktop file)	Jun 5 2017
c32e890e9c79	christiand	Removed outdated german bankdata	May 31 2017
778da317b2ee	habacker	Fix "xea2kmt-all does not map all language directories correctly".	May 29 2017
f977258a5b02	habacker	xea2kmt: Indention fix.	May 29 2017
cafa55deba4f	habacker	xea2kmt: Fix bug overwriting GnuCashAccountTemplateReader::inFileName.	May 29 2017
b447041778f2	habacker	Add import statements and ofx transactions log option to "support" tab of…	May 29 2017
32b6ba96347d	habacker	Fix coverity CID 85170: Uninitialized pointer field	May 29 2017
07fd25a40422	habacker	Fix coverity CID 85311: Uninitialized scalar field	May 29 2017
530efa77c49d	l10n daemon script	SVN_SILENT made messages (.desktop file)	May 27 2017
e3518c21142d	l10n daemon script	SVN_SILENT made messages (.desktop file)	May 26 2017
439f01b5fb53	habacker	Fix 'Opening balance account is untranslated'.	May 25 2017
dc0351fb5d28	habacker	Fix 'Exported templates does not have any title and description'.	May 25 2017
1268cc14a939	l10n daemon script	SVN_SILENT made messages (.desktop file)	May 25 2017
9f34e58c8f20	christiand/pino	Updated onlineJobPluginMockup	May 24 2017
c78183f18201	christiand/asturmlechner	Removed national credit transfers	May 23 2017
6d235f2cd835	habacker	Fix 'duplicated symbol' compile error on Windows.	May 23 2017
29644005792b	habacker	Fix coverity CID 85266: Uninitialized scalar field	May 19 2017
b64331f45f30	habacker	Fix coverity CID 85267: Uninitialized scalar field	May 19 2017
5e105583ef8c	habacker	Fix coverity CID 85290: Uninitialized scalar field	May 19 2017
3c61e9732923	habacker	Fix coverity CID 85198: Uninitialized scalar field	May 19 2017
3d1f6f0e2d0b	habacker	Fix coverity CID 85143: Uninitialized scalar field	May 19 2017
d38c3dfe1a77	habacker	Fix coverity CID 85168, 85340: Uninitialized scalar field	May 19 2017
d29f4a2bc0f3	habacker	Fix bug unpacking source rpm.	May 19 2017
42112d9a0b96	habacker	Add windows release script.	May 19 2017
45171a88156b	habacker	Update kmt.dtd.	May 18 2017
de56889e5b0b	habacker	Add Language code behind country entry in template list.	May 18 2017
55fe575c474c	habacker	Fix display of languages imported from gnucash for which not language name is…	May 18 2017
c2d8bca163c2	habacker	Import top level accounts with name specified too.	May 18 2017
0643aeb38f63	habacker	Show all gnucash provided template accounts.	May 18 2017
7a3673f1c2b4	habacker	Misc fixes. Not sure if required or not.	May 18 2017
bda676a62ecc	habacker	Show more accounts in account tab of report settings dialog.	May 18 2017
67d5ee7055dd	habacker	Add equity accounts to asset and liability reports.	May 18 2017
fc8f5fad17d1	habacker	Display vat account assignment dialog in vat tab for all accounts.	May 18 2017
5b4c8e14d8bc	habacker	Fix not displayed equity accounts when enabled in settings->general->filter.	May 18 2017
9836a5052ff0	habacker	Add application icon used in Windows explorer.	May 17 2017
6fc7077b6ee9	habacker	Remove duplicate call to KDE4_ADD_LIBRARY.	May 17 2017
fbd612529ed8	tbaumgart	Update memo in the other split if requested	May 14 2017
53879797bc19	tbaumgart	Close report's tab when deleting it from TOC	May 14 2017
224289bc9f7c	l10n daemon script	SVN_SILENT made messages (.desktop file)	May 12 2017
d680526083f9	tbaumgart	Fix handling of online job cache handling	May 1 2017
f66defd9461b	tbaumgart	Fix crash when removing online jobs	May 1 2017
8f5bf4e46058	l10n daemon script	GIT_SILENT made messages (after extraction)	Mar 20 2017
2575049f9fb4	tbaumgart	Update aboutData record for Allen Anderson	Mar 5 2017
cf5579b4a63b	l10n daemon script	SVN_SILENT made messages (.desktop file)	Feb 23 2017
9c360433f523	tbaumgart	Add support for new Belarusian Ruble	Jan 25 2017
0f53af053f64	tbaumgart	Correct interpretation of return code	Jan 25 2017

Changes (46)

		Path
M		contrib/xea2kmt-all
M		kmymoney/converter/mymoneyqifreader.cpp
M		kmymoney/converter/mymoneystatementreader.cpp
M		kmymoney/converter/mymoneytemplate.cpp
M		kmymoney/converter/mymoneytemplate.h
M		kmymoney/converter/webpricequote.cpp
M		kmymoney/dialogs/CMakeLists.txt
M		kmymoney/dialogs/kfindtransactiondlg.cpp
M		kmymoney/dialogs/knewaccountdlg.cpp
M		kmymoney/dialogs/knewaccountdlg.h
M		kmymoney/dialogs/knewaccountdlgdecl.ui
P		kmymoney/dialogs/ktemplateexportdlg.cpp Copied from kmymoney/wizards/newloanwizard/editintrowizardpage.cpp
P		kmymoney/dialogs/ktemplateexportdlg.h Copied from kmymoney/mymoney/tests/mymoneybalancecache-test.h
A		kmymoney/dialogs/ktemplateexportdlg.ui
M		kmymoney/dialogs/settings/ksettingsgeneral.cpp
M		kmymoney/dialogs/settings/ksettingsgeneral.h
M		kmymoney/dialogs/settings/ksettingsgeneraldecl.ui
M		kmymoney/kmymoney.cpp
M		kmymoney/kmymoney.kcfg
M		kmymoney/mymoney/mymoneyfile.cpp
M		kmymoney/mymoney/mymoneyfile.h
M		kmymoney/mymoney/mymoneyreport.cpp
M		kmymoney/mymoney/storage/mymoneystorageanon.cpp
M		kmymoney/mymoney/tests/mymoneyfile-test.cpp
M		kmymoney/plugins/csvexport/csvwriter.cpp
M		kmymoney/plugins/ofximport/dialogs/kofxdirectconnectdlg.cpp
M		kmymoney/plugins/ofximport/ofxpartner.cpp
M		kmymoney/reports/objectinfotable.cpp
M		kmymoney/reports/pivottable.cpp
M		kmymoney/reports/tests/reportstestcommon.cpp
M		kmymoney/reports/tests/reportstestcommon.h
M		kmymoney/templates/de_DE/skr03.kmt
M		kmymoney/templates/de_DE/skr04.kmt
M		kmymoney/templates/kmt.dtd
M		kmymoney/views/kgloballedgerview.cpp
M		kmymoney/views/kpayeesview.cpp
M		kmymoney/widgets/kaccounttemplateselector.cpp
M		kmymoney/widgets/kmymoneybriefschedule.cpp
M		kmymoney/widgets/kmymoneycalculator.cpp
M		kmymoney/widgets/kmymoneycurrencyselector.cpp
M		kmymoney/widgets/kmymoneymvccombo.cpp
M		kmymoney/widgets/registeritem.cpp
M		libkgpgfile/kgpgfile.cpp
A	(dir)	maintainer/
A		maintainer/release-windows-packages
M		tools/xea2kmt.cpp

Merge remote-tracking branch 'origin/4.8'8dfd9f5f310aActions

Description

Details

Merged Changes

Changes (46)

R261:8dfd9f5f310a

contrib/xea2kmt-all

kmymoney/converter/mymoneyqifreader.cpp

kmymoney/converter/mymoneystatementreader.cpp

kmymoney/converter/mymoneytemplate.cpp

kmymoney/converter/mymoneytemplate.h

kmymoney/converter/webpricequote.cpp

kmymoney/dialogs/CMakeLists.txt

kmymoney/dialogs/kfindtransactiondlg.cpp

kmymoney/dialogs/knewaccountdlg.cpp

kmymoney/dialogs/knewaccountdlg.h

kmymoney/dialogs/knewaccountdlgdecl.ui

kmymoney/dialogs/ktemplateexportdlg.cpp

kmymoney/dialogs/ktemplateexportdlg.h

kmymoney/dialogs/ktemplateexportdlg.ui

kmymoney/dialogs/settings/ksettingsgeneral.cpp

kmymoney/dialogs/settings/ksettingsgeneral.h

kmymoney/dialogs/settings/ksettingsgeneraldecl.ui

kmymoney/kmymoney.cpp

kmymoney/kmymoney.kcfg

kmymoney/mymoney/mymoneyfile.cpp

kmymoney/mymoney/mymoneyfile.h

kmymoney/mymoney/mymoneyreport.cpp

kmymoney/mymoney/storage/mymoneystorageanon.cpp

kmymoney/mymoney/tests/mymoneyfile-test.cpp

kmymoney/plugins/csvexport/csvwriter.cpp

kmymoney/plugins/ofximport/dialogs/kofxdirectconnectdlg.cpp

kmymoney/plugins/ofximport/ofxpartner.cpp

kmymoney/reports/objectinfotable.cpp

kmymoney/reports/pivottable.cpp

kmymoney/reports/tests/reportstestcommon.cpp

kmymoney/reports/tests/reportstestcommon.h

kmymoney/templates/de_DE/skr03.kmt

kmymoney/templates/de_DE/skr04.kmt

kmymoney/templates/kmt.dtd

kmymoney/views/kgloballedgerview.cpp

kmymoney/views/kpayeesview.cpp

kmymoney/widgets/kaccounttemplateselector.cpp

kmymoney/widgets/kmymoneybriefschedule.cpp

kmymoney/widgets/kmymoneycalculator.cpp

kmymoney/widgets/kmymoneycurrencyselector.cpp

kmymoney/widgets/kmymoneymvccombo.cpp

kmymoney/widgets/registeritem.cpp

libkgpgfile/kgpgfile.cpp

maintainer/release-windows-packages

tools/xea2kmt.cpp

Merge remote-tracking branch 'origin/4.8'
8dfd9f5f310a
Actions