Diffusion Calligra 247826f3f9ba

Merge remote-tracking branch 'origin/master' into calligra-gemini-leinir
247826f3f9ba
Actions

Authored by leinir on Aug 30 2017, 12:36 PM.

Description

Merge remote-tracking branch 'origin/master' into calligra-gemini-leinir

Details

Committed

leinir

Aug 30 2017, 12:36 PM

Parents

R8:81e595dda4fe: Merge remote-tracking branch 'origin/master' into calligra-gemini-leinir
R8:0122e3d5435e: Plan: --warnings

Branches

Unknown

Tags

Unknown

leinir committed R8:247826f3f9ba: Merge remote-tracking branch 'origin/master' into calligra-gemini-leinir (authored by leinir).Aug 30 2017, 12:36 PM

leinir mentioned this in R8:1bbb6e00022b: Port Calligra Gemini for 3.x.Nov 8 2017, 2:17 PM

Merged Changes

Commit		Author	Details	Committed
0122e3d5435e		danders	Plan: --warnings	Aug 30 2017
82ab23bef9ce		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Aug 30 2017
32691721e43b		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Aug 29 2017
de78671e4406		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Aug 27 2017
81d95706e750		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Aug 26 2017
2c55c1c6017d		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Aug 25 2017
f1319499fae5		danders	Plan: Make calendars scope not editable	Aug 24 2017
047464b82aa4		danders	Plan: Missing ifdef PLAN_USE_KREPORT	Aug 24 2017
4e15d65ff0ea	D7431	progwolff	Add RTF support to Okular	Aug 24 2017
9d3982b36b30	D7327	asturmlechner	Don't enter test subdirectories if BUILD_TESTING=OFF	Aug 23 2017
6676205ceb7d		danders	Plan: Improve config dialog	Aug 23 2017
85ccb1142778		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Aug 23 2017
302adb77dd12	D7449	danders	Spellcheck: Improve markup of missspelled words when dropcaps is used	Aug 22 2017
ba61bed8a061		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Aug 21 2017
f1a5fb41fa25		ltoscano	Merge remote-tracking branch 'origin/calligra/3.0'	Aug 20 2017
a92a6fca3593		ltoscano	Fix .desktop: Qt5 apps use -qwindowtitle, not -caption	Aug 20 2017
0e22af4c7b3b		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Aug 20 2017
e74d401f0d4a		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Aug 19 2017
d7d3e71f2505		pino	typo fixes	Aug 18 2017
a8bcb526cebb		jriddell	update screenshot url	Aug 18 2017
801a04910559		jriddell	update screenshot url	Aug 18 2017
90764d5b33d6		jriddell	add missing comment as required by appstream http://metadata.neon.kde.	Aug 17 2017
0aa341712645		danders	Plan: --warning	Aug 15 2017
068fd77787cd		danders	Plan: Clazy fixes	Aug 15 2017
9ab0841adc2b		danders	Plan: Clazy fixes	Aug 15 2017
3df6ed1dd537		danders	Plan: Clazy fixes	Aug 15 2017
61d6b941d908		danders	Clazy fixes	Aug 15 2017
d27f7792f499		danders	Clazy fizes	Aug 15 2017
1d56bfb17596	D7303	danders	SpellCheck: Fix markup rebasing when simple edits are done (one char added)	Aug 14 2017
0817ba0ec435		pino	Merge remote-tracking branch 'origin/calligra/3.0'	Aug 13 2017
278b8cf9b236		pino	add few more categories to applications' desktop files	Aug 13 2017
cba8df09b3a2		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Aug 13 2017
f6a182dabc45		danders	Remove some qInfo leftovers	Aug 9 2017
c2208d86e3a2		danders	TestBlockLayout unit test: Expand tests and make them less dependent on a…	Aug 9 2017
78507cfce6b8		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Aug 6 2017
eed0a249da0a		l10n daemon script	GIT_SILENT made messages (after extraction)	Aug 4 2017
57f399a711e7		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Jul 26 2017
c042a7c5dc10		l10n daemon script	GIT_SILENT made messages (after extraction)	Jul 26 2017
744a7c3b750b		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Jul 16 2017
58edbf1f160d		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Jul 11 2017
b8ef3582c446		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Jul 10 2017
6356dad64ff8		l10n daemon script	GIT_SILENT made messages (after extraction)	May 22 2017
199418d74f75		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	May 16 2017
763b022aab9a		l10n daemon script	GIT_SILENT made messages (after extraction)	May 16 2017
99d10e032e87		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	May 14 2017
c7468326ebfc		l10n daemon script	GIT_SILENT made messages (after extraction)	May 14 2017

Changes (87)

				Path	Packages
	M			CalligraProducts.cmake
	M			README.PACKAGERS
	M			extras/okularodpgenerator/okularApplication_odp_calligra.desktop
	M			extras/okularodtgenerator/okularApplication_odt_calligra.desktop
	M			filters/stage/powerpoint/CMakeLists.txt
	M			filters/stage/powerpoint/okularApplication_powerpoint_calligra.desktop
	M			filters/stage/pptx/okularApplication_pptx_calligra.desktop
	M			filters/words/docx/import/okularApplication_docx_calligra.desktop
	P			filters/words/msword-odf/okularApplication_doc_calligra.desktop Copied to filters/words/rtf/import/okularApplication_rtf_calligra.desktop
	M			filters/words/rtf/import/CMakeLists.txt
	A			filters/words/rtf/import/OkularRtfGeneratorPlugin.cpp
	A			filters/words/rtf/import/libokularGenerator_rtf.json
	P			filters/words/rtf/import/okularApplication_rtf_calligra.desktop Copied from filters/words/msword-odf/okularApplication_doc_calligra.desktop
	A			filters/words/rtf/import/okularRtf_calligra.desktop
	M			filters/words/wordperfect/import/okularApplication_wpd_calligra.desktop
	M			flow/part/org.kde.calligraflow.desktop
	M			karbon/data/org.kde.karbon.appdata.xml
	M			karbon/data/org.kde.karbon.desktop
	M			karbon/stencils/Flags/cambodia.desktop
	M			karbon/stencils/Flags/fiji.desktop
	M			karbon/stencils/Flags/kyrgyzstan.desktop
	M			karbon/stencils/Flags/turkmenistan.desktop
	M			karbon/stencils/Optics/scope.desktop
	M			libs/flake/CMakeLists.txt
	M			libs/flake/svg/SvgParser.cpp
	M			libs/odf/CMakeLists.txt
	M			libs/pageapp/CMakeLists.txt
	M			libs/pigment/CMakeLists.txt
	M			libs/pigment/KoColorConversionTransformationFactory.h
	M			libs/pigment/KoColorSpaceFactory.cpp
	M			libs/rdf/CMakeLists.txt
	M			libs/store/CMakeLists.txt
	M			libs/text/CMakeLists.txt
	M			libs/text/KoTextBlockData.cpp
	M			libs/text/KoTextBlockData.h
	M			libs/text/KoTextEditor_p.h
	M			libs/textlayout/CMakeLists.txt
	M			libs/textlayout/KoTextLayoutArea.cpp
	M			libs/textlayout/RunAroundHelper.cpp
	M			libs/textlayout/tests/TestBlockLayout.cpp
	M			libs/textlayout/tests/TestBlockLayout.h
	M			libs/widgets/CMakeLists.txt
	M			libs/widgetutils/CMakeLists.txt
	M			plan/CMakeLists.txt
	M			plan/ConfigWorkVacationPanel.ui
	M			plan/calligraplansettings.kcfg
	M			plan/kptview.cpp
	M			plan/libs/kernel/CMakeLists.txt
	M			plan/libs/kernel/kpteffortcostmap.h
	M			plan/libs/kernel/kptmap.h
	M			plan/libs/kernel/kptnode.cpp
	M			plan/libs/kernel/kptnode.h
	M			plan/libs/kernel/kptproject.cpp
	M			plan/libs/kernel/kptproject.h
	M			plan/libs/kernel/kptschedule.h
	M			plan/libs/kernel/kpttask.cpp
	M			plan/libs/kernel/kpttask.h
	M			plan/libs/kernel/kptxmlloaderobject.h
	M			plan/libs/models/CMakeLists.txt
	M			plan/libs/models/kptcalendarmodel.cpp
	M			plan/libs/models/kptnodeitemmodel.cpp
	M			plan/libs/ui/kptcalendareditor.cpp
	M			plan/org.kde.calligraplan.desktop
	M			plan/plugins/schedulers/rcps/CMakeLists.txt
	M			plan/plugins/schedulers/tj/CMakeLists.txt
	M			plan/plugins/scripting/CMakeLists.txt
	M			plan/workpackage/org.kde.calligraplanwork.desktop
	M			plugins/chartshape/CMakeLists.txt
	M			plugins/colorengines/lcms2/CMakeLists.txt
	M			plugins/formulashape/CMakeLists.txt
	M			plugins/karbonplugins/tools/KarbonPatternEditStrategy.cpp
	M			plugins/musicshape/CMakeLists.txt
	M			plugins/musicshape/core/CMakeLists.txt
	M			plugins/textediting/autocorrection/calligra_textediting_autocorrect.desktop
	M			plugins/textediting/spellcheck/CMakeLists.txt
	M			plugins/textediting/spellcheck/SpellCheck.cpp
	M			plugins/textediting/spellcheck/SpellCheck.h
	M			sheets/CMakeLists.txt
	M			sheets/data/templates/HomeFamily/VacationChecklist.desktop
	M			sheets/org.kde.calligrasheets.desktop
	M			stage/app/org.kde.calligrastage.desktop
	M			stage/part/CMakeLists.txt
	M			stage/part/KPrShapeAnimations.h
	M			stage/part/animations/KPrShapeAnimation.h
	M			stage/part/tests/MockShapeAnimation.h
	M			words/app/org.kde.calligrawords.desktop
	M			words/part/CMakeLists.txt