Diffusion Falkon 90757e884658

Merge branch 'master' into anmolgautam
90757e884658
Actions

Authored by anmolgautam on Jul 22 2018, 1:50 PM.

Description

Merge branch 'master' into anmolgautam

Details

Committed

anmolgautam

Jul 22 2018, 1:50 PM

Parents

R875:d5fc3ebc8881: Merge branch 'Falkon/3.0'
R875:7a0ff29ec4b5: Changed documentation for setting icon/pixmap in QML plugins

Branches

Unknown

Tags

Unknown

anmolgautam committed R875:90757e884658: Merge branch 'master' into anmolgautam (authored by anmolgautam).Jul 22 2018, 1:50 PM

Merged Changes

Commit		Author	Details	Committed
d5fc3ebc8881		drosca	Merge branch 'Falkon/3.0'	Jul 22 2018
a7d2f8757919		drosca	FalkonSchemeHandler: Make sure to load data on main thread	Jul 22 2018
bd0d5cabdc37		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Jul 21 2018
cff2b68ce9b3		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Jul 20 2018
6357e983131e	D14197	SGOrava/drosca	RunAction: Close UI file after it is loaded	Jul 19 2018
6556ade5c98a	D14214	SGOrava/drosca	[Feature] [Vertical Tabs] Add "Unload Tree" to Tab Tree drop-down menu	Jul 19 2018
aca5cb0e1cf8		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Jul 19 2018
82c8d50f9a7f	D14155	SGOrava/drosca	[Feature] Add python plugin MiddleClickLoader	Jul 17 2018
1cc053c7f1a0		drosca	Merge branch 'Falkon/3.0'	Jul 8 2018
95e2232d39c0		drosca	DownloadManager: Don't try to percent decode filenames	Jul 8 2018
53e0a4376252		drosca	NavigationBar: Correctly reconnect to page actions	Jul 8 2018
9fd53c75fafb		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Jul 7 2018
f6f2d7c78496		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Jul 7 2018
db10e175f0b2		mlaurent	Add more QSL + nullptr	Jul 6 2018
07b4dd4f6e60		mlaurent	Add sime QLS + nullptr	Jul 5 2018
0a744919e56f		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Jul 3 2018
5ca5bc73848c		l10n daemon script	GIT_SILENT made messages (after extraction)	Jul 3 2018
06020d96158e		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Jul 3 2018
1c6f5bd8e2f1		l10n daemon script	GIT_SILENT made messages (after extraction)	Jul 3 2018
60b7cbd9b6b0	D13736	chrstphrchvz/drosca	Fix location of Info.plist file for macOS build	Jun 27 2018
3bc9e66596ed		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Jun 26 2018
286f329109ed		l10n daemon script	GIT_SILENT made messages (after extraction)	Jun 26 2018
034365355a3e		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Jun 26 2018
086d572e2543		l10n daemon script	GIT_SILENT made messages (after extraction)	Jun 26 2018
683a3d0bf9d0		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Jun 22 2018
9a725b3c62a4		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Jun 22 2018
e53e4d1b070f		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Jun 20 2018
ede9015884ad		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Jun 20 2018
633748a815de		drosca	Merge branch 'Falkon/3.0'	Jun 18 2018
4c83ba3d6c60		drosca	PyFalkon: Fix build with PySide2 release	Jun 18 2018
90d5c5b3d652		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Jun 17 2018
86513219366f		l10n daemon script	GIT_SILENT made messages (after extraction)	Jun 17 2018
0e96dd33c24c		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Jun 17 2018
73123c72c296		l10n daemon script	GIT_SILENT made messages (after extraction)	Jun 17 2018
42df5403bedc		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Jun 14 2018
62839a6d4ee8		l10n daemon script	GIT_SILENT made messages (after extraction)	Jun 13 2018

Changes (89)

		Path
M		autotests/adblocktest.cpp
M		autotests/cookiestest.cpp
M		autotests/databaseencryptedpasswordbackendtest.cpp
M		autotests/databasepasswordbackendtest.cpp
M		autotests/passwordbackendtest.cpp
M		autotests/sqldatabasetest.cpp
M		linux/appdata/org.kde.falkon.appdata.xml
M		linux/applications/org.kde.falkon.desktop
M		src/lib/3rdparty/fancytabwidget.cpp
M		src/lib/3rdparty/fancytabwidget.h
M		src/lib/3rdparty/qtsingleapplication/qtlocalpeer.cpp
M		src/lib/3rdparty/squeezelabelv2.cpp
M		src/lib/3rdparty/squeezelabelv2.h
M		src/lib/3rdparty/stylehelper.cpp
M		src/lib/adblock/adblockaddsubscriptiondialog.cpp
M		src/lib/adblock/adblockdialog.cpp
M		src/lib/adblock/adblockdialog.h
M		src/lib/adblock/adblockicon.cpp
M		src/lib/adblock/adblockmanager.cpp
M		src/lib/adblock/adblockmanager.h
M		src/lib/adblock/adblockrule.cpp
M		src/lib/adblock/adblockrule.h
M		src/lib/adblock/adblocksubscription.cpp
M		src/lib/adblock/adblocksubscription.h
M		src/lib/adblock/metadata.desktop
M		src/lib/app/browserwindow.cpp
M		src/lib/app/mainapplication.cpp
M		src/lib/app/qzcommon.h
M		src/lib/autofill/autofillicon.cpp
M		src/lib/autofill/autofillicon.h
M		src/lib/autofill/autofillwidget.cpp
M		src/lib/autofill/autofillwidget.h
M		src/lib/autofill/passwordbackends/databaseencryptedpasswordbackend.cpp
M		src/lib/autofill/passwordbackends/databasepasswordbackend.cpp
M		src/lib/autofill/passwordmanager.cpp
M		src/lib/autofill/passwordmanager.h
M		src/lib/bookmarks/bookmarkitem.cpp
M		src/lib/bookmarks/bookmarkitem.h
M		src/lib/bookmarks/bookmarks.cpp
M		src/lib/bookmarks/bookmarks.h
M		src/lib/bookmarks/bookmarksimport/bookmarksimportdialog.cpp
M		src/lib/bookmarks/bookmarksimport/chromeimporter.cpp
M		src/lib/bookmarks/bookmarksmanager.cpp
M		src/lib/data/breeze-fallback/index.theme
M		src/lib/downloads/downloadmanager.cpp
M		src/lib/navigation/navigationbar.cpp
M		src/lib/network/schemehandlers/falkonschemehandler.cpp
M		src/lib/network/schemehandlers/falkonschemehandler.h
M		src/lib/tools/qztools.h
M		src/main/CMakeLists.txt
M		src/plugins/AutoScroll/metadata.desktop
M		src/plugins/FlashCookieManager/metadata.desktop
M		src/plugins/GnomeKeyringPasswords/metadata.desktop
M		src/plugins/GreaseMonkey/metadata.desktop
M		src/plugins/KDEFrameworksIntegration/metadata.desktop
M		src/plugins/MouseGestures/metadata.desktop
M		src/plugins/PIM/metadata.desktop
M		src/plugins/PyFalkon/pyfalkon_global.h
M		src/plugins/StatusBarIcons/metadata.desktop
M		src/plugins/StatusBarIcons/sbi_networkicondialog.cpp
M		src/plugins/StatusBarIcons/sbi_networkmanager.cpp
M		src/plugins/TabManager/metadata.desktop
M		src/plugins/TestPlugin/metadata.desktop
M		src/plugins/VerticalTabs/metadata.desktop
M		src/plugins/VerticalTabs/tabtreeview.cpp
M		src/scripts/CMakeLists.txt
M		src/scripts/hellopython/metadata.desktop
A	(dir)	src/scripts/middleclickloader/
A		src/scripts/middleclickloader/Messages.sh
A		src/scripts/middleclickloader/__init__.py
A		src/scripts/middleclickloader/mcl_handler.py
A		src/scripts/middleclickloader/mcl_loadmode.py
A		src/scripts/middleclickloader/mcl_settings.py
A		src/scripts/middleclickloader/mcl_settings.ui
A		src/scripts/middleclickloader/metadata.desktop
M		src/scripts/runaction/actions/dictionary.desktop
M		src/scripts/runaction/actions/googleimagesearch.desktop
M		src/scripts/runaction/actions/mpv.desktop
M		src/scripts/runaction/actions/tineyeimagesearch.desktop
M		src/scripts/runaction/actions/translate.desktop
M		src/scripts/runaction/actions/w3.desktop
M		src/scripts/runaction/actions/yandeximagesearch.desktop
M		src/scripts/runaction/metadata.desktop
M		src/scripts/runaction/settingsdialog.py
M		tests/benchmarks/adblockparserule.cpp
M		themes/chrome/metadata.desktop
M		themes/linux/metadata.desktop
M		themes/mac/metadata.desktop
M		themes/windows/metadata.desktop