Diffusion digiKam 765ba3fa6b0e

Merge branch 'master' into gsoc18-exporttools-o2
765ba3fa6b0e
Actions

Authored by cgilles on Jun 13 2018, 4:08 AM.

Description

Merge branch 'master' into gsoc18-exporttools-o2

Details

Committed

cgilles

Jun 13 2018, 4:08 AM

Parents

R482:5be6cb290fe6: Merge branch 'master' of git.kde.org:digikam
R482:c1fcd6b855ac: Correct errors from statistic check Smugmug: handle invalid album name in…

Branches

Unknown

Tags

Unknown

cgilles committed R482:765ba3fa6b0e: Merge branch 'master' into gsoc18-exporttools-o2 (authored by cgilles).Jun 13 2018, 4:08 AM

Merged Changes

Commit	Author	Details	Committed
5be6cb290fe6	cgilles	Merge branch 'master' of git.kde.org:digikam	Jun 13 2018
e0772761a4c0	cgilles	update internal labraw to last stable 0.18.12	Jun 13 2018
167b473a5a8d	l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Jun 13 2018
eba2047ee93b	l10n daemon script	GIT_SILENT made messages (after extraction)	Jun 13 2018
6c43d05fc0ac	mqualmann	revert "replace deprecated Qt time function" because Qt-5.6 is not supported	Jun 12 2018
3500c5a5d0a3	mqualmann	change album face scan settings	Jun 12 2018
7ff770af4569	mqualmann	polish	Jun 11 2018
515812614cbc	mqualmann	polish	Jun 11 2018
11249a971538	mqualmann	polish i18n	Jun 11 2018
1f7be4dca91a	mqualmann	add function to scan a single album for faces CCBUG: 275671 CCBUG: 395236	Jun 11 2018
f0c2f7f4c1be	mqualmann	optimize auto rotate after download #2	Jun 11 2018
65d4de45dfcd	mqualmann	do not remove this image informations from the DB if clean up by rescan file	Jun 11 2018
a90b86536ce9	mqualmann	optimize auto rotate after download	Jun 10 2018
77c30fcdd936	mqualmann	if compiled with QWebEngine, we can use the internal browser	Jun 10 2018
ec7077a98ce8	mqualmann	polish	Jun 10 2018
a4e58272d42f	mqualmann	do not connect this signal/slot, the function only serves to move one item in…	Jun 10 2018
7d5bc3c578b2	cgilles	update	Jun 7 2018
07d9968bd0eb	l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Jun 7 2018
b63212e549d6	mqualmann	just for fun, a little bit faster now 1 second on a loop that lasts 1 minute	Jun 6 2018
796e6b026ec0	mqualmann	polish	Jun 5 2018
a46df9ab2ae6	mqualmann	polish	Jun 5 2018
aaee9b486054	mqualmann	polish and const	Jun 5 2018
559b08ad4dfc	mqualmann	polish	Jun 5 2018
c8e5a47c192e	mqualmann	polish	Jun 5 2018
a5efd233506f	mqualmann	fix possible null date when uploading image	Jun 5 2018
fbd7f0bb73a4	mqualmann	remove unused declaration	Jun 5 2018
c17ed99a400d	sfrei	fix as followup to 6681aba89a229d95aa1037af5f62b8fd3c2ddf03	Jun 5 2018
7c156d994174	mqualmann	polish	Jun 4 2018
fd7fc35db7fe	mqualmann	store fractional second in MySQL as in SQlite for newly created database	Jun 4 2018
79a5a2c7cec8	mqualmann	replace deprecated Qt time function	Jun 4 2018
722e63efc265	mqualmann	update	Jun 4 2018
67976d43fb7c	mqualmann	add page up and down shortcuts to the right sidebar BUGS: 394988 FIXED-IN: 6.0.0	Jun 4 2018

Changes (41)

				Path	Packages
	M			NEWS
	M			core/app/items/digikamimageview.h
	M			core/app/views/digikamview.cpp
	M			core/data/database/dbconfig.xml.cmake.in
	M			core/data/htmlgallery/themes/blueframes/blueframes.desktop
	M			core/data/htmlgallery/themes/cleanframes/cleanframes.desktop
	M			core/data/htmlgallery/themes/dateframes/dateframes.desktop
	M			core/data/htmlgallery/themes/details/details.desktop
	M			core/data/htmlgallery/themes/elegant/elegant.desktop
	M			core/data/htmlgallery/themes/floatingcards/floatingcards.desktop
	M			core/data/htmlgallery/themes/frames/frames.desktop
	M			core/data/htmlgallery/themes/s0/s0.desktop
	M			core/data/htmlgallery/themes/simplerounded/simplerounded.desktop
	M			core/data/htmlgallery/themes/simpleslides/simpleslides.desktop
	M			core/data/htmlgallery/themes/vanilla/vanilla.desktop
	M			core/libs/album/albumselectiontreeview.cpp
	M			core/libs/album/albumselectiontreeview.h
	M			core/libs/database/coredb/coredb.cpp
	M			core/libs/database/models/imagefiltermodel.cpp
	M			core/libs/database/models/imagefiltermodel.h
	M			core/libs/database/models/imagefiltersettings.cpp
	M			core/libs/database/models/imagefiltersettings.h
	M			core/libs/database/models/imagethumbnailmodel.cpp
	M			core/libs/database/models/imagethumbnailmodel.h
	M			core/libs/dmetadata/dmetadata.cpp
	M			core/libs/imageproperties/imagepropertiesgpstab.cpp
	M			core/libs/rawengine/libraw/COPYRIGHT
	M			core/libs/rawengine/libraw/Changelog.txt
	M			core/libs/rawengine/libraw/LICENSE.CDDL
	M			core/libs/rawengine/libraw/LICENSE.LGPL
	M			core/libs/rawengine/libraw/internal/dcraw_common.cpp
	M			core/libs/rawengine/libraw/libraw/libraw_version.h
	M			core/showfoto/main/org.kde.showfoto.appdata.xml
	M			core/utilities/facemanagement/facegroup.cpp
	M			core/utilities/import/backend/camiteminfo.cpp
	M			core/utilities/import/backend/umscamera.cpp
	M			core/utilities/import/backend/umscamera.h
	M			core/utilities/import/main/importui.cpp
	M			core/utilities/import/models/importimagemodel.cpp
	M			core/utilities/import/views/importiconview.cpp
	M			core/utilities/maintenance/facesdetector.cpp