Diffusion Calligra 76a0a0938abf

Merge branch 'master' into calligra-gemini-leinir
76a0a0938abf
Actions

Authored by leinir on Nov 8 2017, 12:21 PM.

Description

Merge branch 'master' into calligra-gemini-leinir

Details

Committed

leinir

Nov 8 2017, 12:21 PM

Parents

R8:8c40c5cc2a2a: Add the GeminiMainWindow library
R8:ff8ecadad90a: Fix the include's case (or clang will complain)

Branches

Unknown

Tags

Unknown

leinir committed R8:76a0a0938abf: Merge branch 'master' into calligra-gemini-leinir (authored by leinir).Nov 8 2017, 12:21 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
8c40c5cc2a2a	leinir	Add the GeminiMainWindow library	Nov 8 2017
a5583f91a99d	l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Nov 8 2017
7a4c47f7e67e	l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Nov 7 2017
ff5da12fd910	l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Oct 31 2017
0490f583c4fc	l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Oct 30 2017
0d88dbcfcb42	danders	Plan: Properly cleanup when removing accounts, expand unit testing	Oct 27 2017
6d695f174997	yurchor	Fix minor typo	Oct 27 2017
c22b52be35a2	l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Oct 27 2017
cb38b4b50d10	danders	Plan: Fix some potential crashes/leaks in Accounts + unit tests	Oct 26 2017
1f3dde3d80d7	danders	Plan: More context help	Oct 26 2017
bdf1882e8475	danders	Plan: Open manual directly in browser without using khelpcenter	Oct 26 2017
68d909706064	l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Oct 24 2017
bd9ef705538f	l10n daemon script	GIT_SILENT made messages (after extraction)	Oct 24 2017
b86686d6583a	yurchor	Fix minor typos	Oct 21 2017
825a4de3c506	danders	Plan: Use semantic markup	Oct 20 2017
bdfa83a2d367	danders	Plan: Improve TaskModules handling	Oct 20 2017
18f203ab4e5b	yurchor	Fix minor typos	Oct 19 2017
6fa3ff11e418	danders	Plan: Add links handling to what's this	Oct 18 2017
eb46538217f6	danders	Plan: Give user more control over external resource assignments	Oct 18 2017
5a50c834bf23	l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Oct 17 2017
82782d78f262	danders	Plan: Fix loading appointments of shared resources from other projects	Oct 16 2017
fd1f8ffa1e14	danders	Plan: Improve help info on startup page	Oct 16 2017
4a60c55a984f	danders	Plan: Improve report generator	Oct 16 2017
e4b1daac3693	danders	Plan: Fix freeze when loading shared projects	Oct 16 2017
13c6ac962a66	danders	Plan: Fix crash when creating new project from current project	Oct 16 2017
893132cd5e46	l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Oct 16 2017
a16e8f698d48	l10n daemon script	GIT_SILENT made messages (after extraction)	Oct 16 2017

Changes (64)

				Path	Packages
	M			extras/filemanagertemplates/TextDocument.desktop
	M			filters/karbon/xaml/karbon_xaml_export.desktop
	M			filters/words/msword-odf/words_msword_thumbnail.desktop
	M			gemini/lib/CMakeLists.txt
	M			gemini/lib/GeminiMainWindow.cpp
	M			gemini/lib/GeminiMainWindow.h
	M			gemini/lib/GeminiModeSwitchEvent.h
	M			karbon/data/org.kde.karbon.appdata.xml
	M			karbon/stencils/Cisco/government_building.desktop
	M			karbon/stencils/Cisco/university.desktop
	M			karbon/stencils/Cisco/wireless.desktop
	M			karbon/stencils/Cisco/wireless_bridge.desktop
	M			karbon/stencils/Cisco/wireless_connectivity.desktop
	M			karbon/stencils/Cisco/wireless_location_appliance.desktop
	M			karbon/stencils/Cisco/wireless_router.desktop
	M			karbon/stencils/Cisco/wireless_transport.desktop
	M			karbon/stencils/Scenegraph/callback.desktop
	M			libs/flake/flake.desktop
	M			libs/text/texteditingplugin.desktop
	M			plan/about/aboutpage.cpp
	M			plan/kptmaindocument.cpp
	M			plan/kptmaindocument.h
	M			plan/kptpart.cpp
	M			plan/kptpart.h
	M			plan/kptview.cpp
	M			plan/kptview.h
	M			plan/kptviewlist.cpp
	M			plan/kptviewlistdocker.cpp
	M			plan/libs/kernel/kptaccount.cpp
	M			plan/libs/kernel/kptaccount.h
	M			plan/libs/kernel/kptcommand.cpp
	M			plan/libs/kernel/kptcommand.h
	M			plan/libs/kernel/kptproject.cpp
	M			plan/libs/kernel/kptproject.h
	A			plan/libs/kernel/tests/AccountsCommandTester.cpp
	P			plan/libs/kernel/tests/AccountsCommandTester.h Copied from plan/libs/kernel/tests/AccountsTester.h
	M			plan/libs/kernel/tests/AccountsTester.cpp
	P			plan/libs/kernel/tests/AccountsTester.h Copied to plan/libs/kernel/tests/AccountsCommandTester.h
	M			plan/libs/kernel/tests/CMakeLists.txt
	M			plan/libs/models/kptnodeitemmodel.cpp
	M			plan/libs/models/kptnodeitemmodel.h
	M			plan/libs/ui/CMakeLists.txt
	A			plan/libs/ui/WhatsThis.cpp
	A			plan/libs/ui/WhatsThis.h
	M			plan/libs/ui/kptmainprojectdialog.cpp
	M			plan/libs/ui/kptmainprojectdialog.h
	M			plan/libs/ui/kptmainprojectpanel.cpp
	M			plan/libs/ui/kptmainprojectpanel.h
	M			plan/libs/ui/kptmainprojectpanelbase.ui
	M			plan/libs/ui/kpttaskeditor.cpp
	M			plan/libs/ui/kpttaskeditor.h
	M			plan/libs/ui/kptviewbase.h
	M			plan/libs/ui/reportsgenerator/ReportsGeneratorView.cpp
	M			plan/libs/ui/reportsgenerator/ReportsGeneratorView.h
	M			plan/libs/ui/welcome/WelcomeView.cpp
	M			plan/libs/ui/welcome/WelcomeView.h
	M			plan/libs/ui/welcome/WelcomeView.ui
	M			plan/workpackage/org.kde.calligraplanwork.desktop
	M			plugins/semanticitems/event/calligra_semanticitem_event.desktop
	M			sheets/functions/kspreaddatabasemodule.desktop
	M			sheets/functions/kspreadengineeringmodule.desktop
	M			sheets/functions/kspreadreferencemodule.desktop
	M			stage/templates/odf/kde_events.desktop
	M			words/app/org.kde.calligrawords.appdata.xml