Diffusion KTouch f6dbef90518c

Merge Branch 'master' into 'homescreen-ng'
f6dbef90518c
Actions

Authored by gottfried on Mar 9 2019, 5:37 PM.

Description

Merge Branch 'master' into 'homescreen-ng'

Conflicts:
src/core/profiledataaccess.cpp
src/core/resourcedataaccess.cpp
src/qml/common/DetailedRadioButton.qml

Details

Committed

gottfried

Mar 9 2019, 5:37 PM

Parents

R336:fc01b9b147cf: Fix Build Because of Missing Include
R336:d9b49c523576: Update Basque Course

Branches

Unknown

Tags

Unknown

gottfried committed R336:f6dbef90518c: Merge Branch 'master' into 'homescreen-ng' (authored by gottfried).Mar 9 2019, 5:37 PM

Merged Changes

Commit		Author	Details	Committed
d9b49c523576		gottfried	Update Basque Course	Feb 24 2019
3d978a90b06e		gottfried	Update it2 Course	Feb 24 2019
0631c779a334		mlaurent	fix some clazy warning	Jan 9 2019
7d55d059ba24		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Jan 6 2019
8598e4af1054		gottfried	Add New Italian Course	Jan 2 2019
95022ae54219		l10n daemon script	GIT_SILENT made messages (after extraction)	Dec 26 2018
050c942d9b6f		l10n daemon script	GIT_SILENT made messages (after extraction)	Dec 17 2018
3bc3a83540c0		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Dec 14 2018
ced3adbd3db6		mlaurent	Merge remote-tracking branch 'origin/Applications/18.12'	Dec 13 2018
66ad48e3d85e		mlaurent	Fix mem leak found by asan	Dec 13 2018
c9c4667b6c64		l10n daemon script	GIT_SILENT made messages (after extraction)	Dec 12 2018
a324d71dc635		l10n daemon script	GIT_SILENT made messages (after extraction)	Dec 12 2018
e674bcdc1da9		mlaurent	GIT_SILENT: use https here	Dec 10 2018
83660e965870		cfeck	GIT_SILENT Upgrade KDE Applications version to 18.12.0.	Dec 4 2018
4a3ced7bc64c		l10n daemon script	GIT_SILENT made messages (after extraction)	Dec 3 2018
18745b4dbf3c		l10n daemon script	GIT_SILENT made messages (after extraction)	Dec 3 2018
d311ca2cbe7a		cfeck	GIT_SILENT Upgrade KDE Applications version to 18.11.90.	Nov 26 2018
83f20988afb8		l10n daemon script	GIT_SILENT made messages (after extraction)	Nov 17 2018
4f74711d3641		l10n daemon script	GIT_SILENT made messages (after extraction)	Nov 17 2018
3be27a23b902		l10n daemon script	GIT_SILENT made messages (after extraction)	Nov 14 2018
0ea0d67c7424		l10n daemon script	GIT_SILENT made messages (after extraction)	Nov 14 2018
20fae7ced90c		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Nov 13 2018
9d3acf6b5030		aacid	GIT_SILENT Upgrade KDE Applications version to 19.03.70.	Nov 10 2018
297ffc318fd0		aacid	GIT_SILENT Upgrade KDE Applications version to 18.03.70.	Nov 9 2018
24e3004d04ad		aacid	GIT_SILENT Upgrade KDE Applications version to 18.11.80.	Nov 9 2018
1b4cf4cdcd54		l10n daemon script	GIT_SILENT made messages (after extraction)	Nov 8 2018
869337c4e4a2		aacid	Add donation url to appdata	Nov 7 2018
6d25434ae2b5		yurchor	Add caption to the screenshot	Nov 6 2018
7bd07180dfb5		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Oct 10 2018
13937ddddb2f		l10n daemon script	GIT_SILENT made messages (after extraction)	Oct 10 2018
5d588ad51e50		yurchor	Fix minor EBN issue and typo	Oct 1 2018
20101c1a2f47		mlaurent	Use QuickCompiler when possible	Sep 20 2018
07a95f1dfc97		gottfried	Add New Italian Course and Update Keyboard Layout	Sep 4 2018
ea4c41a5549b		aacid	GIT_SILENT Upgrade KDE Applications version to 18.11.70.	Jul 16 2018
d91da529f5bc		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Apr 23 2018
5813fa339e21		l10n daemon script	GIT_SILENT made messages (after extraction)	Apr 22 2018
015cb7828d75		aacid	GIT_SILENT Upgrade KDE Applications version to 18.07.70.	Mar 19 2018
c1be358e716a	D11473	blandauer/aacid	course de1. corrections 'Übung 2'	Mar 19 2018
e9c8a60e2ad4	D11401	blandauer/aacid	Corrections course de1	Mar 17 2018
1fada1951495		l10n daemon script	GIT_SILENT made messages (after extraction)	Mar 13 2018

Changes (52)

				Path	Packages
	M			CMakeLists.txt
	M			COPYING.DOC
	M			data/courses/CMakeLists.txt
	M			data/courses/de1.xml
	M			data/courses/es4.xml
	M			data/courses/it.xml
	A			data/courses/it2.xml
	M			data/data.xml
	M			data/keyboardlayouts/it.xml
	M			org.kde.ktouch.appdata.xml
	M			org.kde.ktouch.desktop
	M			src/CMakeLists.txt
	M			src/application.cpp
	M			src/bindings/stringformatter.cpp
	M			src/bindings/utils.cpp
	M			src/bindings/utils.h
	M			src/core/abstractkey.cpp
	M			src/core/course.cpp
	M			src/core/dbaccess.cpp
	M			src/core/key.cpp
	M			src/core/keyboardlayout.cpp
	M			src/core/keychar.cpp
	M			src/core/profiledataaccess.cpp
	M			src/core/resourcedataaccess.cpp
	M			src/core/specialkey.cpp
	M			src/core/trainingstats.cpp
	M			src/core/userdataaccess.cpp
	M			src/customlessoneditordialog.cpp
	M			src/declarativeitems/lessonpainter.cpp
	M			src/declarativeitems/preferencesproxy.cpp
	M			src/declarativeitems/traininglinecore.cpp
	M			src/editor/abstracteditor.cpp
	M			src/editor/abstracteditor.h
	M			src/editor/courseeditor.cpp
	M			src/editor/keyboardlayouteditor.cpp
	M			src/editor/keyboardlayoutpropertieswidget.cpp
	M			src/editor/lessontexteditor.cpp
	M			src/editor/newcoursewidget.cpp
	M			src/editor/newkeyboardlayoutwidget.cpp
	M			src/editor/newresourceassistant.cpp
	M			src/editor/resourceeditor.cpp
	M			src/editor/resourceeditorwidget.cpp
	M			src/editor/resourcetemplatewidget.cpp
	M			src/editor/resourcetypeswidget.cpp
	M			src/ktouchcontext.cpp
	M			src/main.cpp
	M			src/mainwindow.cpp
	M			src/models/charactersmodel.cpp
	M			src/models/errorsmodel.cpp
	M			src/models/learningprogressmodel.cpp
	M			src/models/lessonmodel.cpp
	M			src/models/resourcemodel.cpp