1
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-16 03:52:10 +01:00
Commit Graph

6419 Commits

Author SHA1 Message Date
Anmol Gautam
61beda4fa2 prevent ssl error dialog by website domain
Summary: BUG: 393162

Reviewers: drosca, #falkon

Reviewed By: drosca, #falkon

Subscribers: falkon

Tags: #falkon

Differential Revision: https://phabricator.kde.org/D12522
2018-04-29 19:05:36 +05:30
David Rosca
c15b112a4c
Merge branch 'Falkon/3.0' 2018-04-29 13:16:42 +02:00
David Rosca
bc26e9377c
VerticalTabs: Preserve exapnded state of items inside collapsed parent
BUG: 393567
FIXED-IN: 3.0.1
2018-04-29 12:52:30 +02:00
David Rosca
d55d071507
VerticalTabs: Don't force open sidebar when opening new window
Only automatically open the sidebar after the plugin is enabled
from Preferences.

BUG: 393629
FIXED-IN: 3.0.1
2018-04-29 10:05:55 +02:00
l10n daemon script
a8c662281d SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2018-04-27 07:18:56 +02:00
l10n daemon script
19e2c4ed76 GIT_SILENT made messages (after extraction) 2018-04-27 06:14:01 +02:00
l10n daemon script
e36d092c08 GIT_SILENT made messages (after extraction) 2018-04-27 03:32:10 +02:00
Razi Alavizadeh
33172fcdbe QzToolsTest: Close the opened test file before trying to remove it 2018-04-26 13:50:05 +04:30
l10n daemon script
dd60458d6a SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2018-04-24 05:25:10 +02:00
l10n daemon script
5043a7675d SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2018-04-23 07:16:55 +02:00
David Rosca
a5ba6df966
Merge branch 'Falkon/3.0' 2018-04-22 18:55:29 +02:00
David Rosca
ad2466f2fa
WebView: Fix finding correct rwhvqt
Focus proxy is actually set only after adding it to the layout, so without
the timer it would pick old rwhvqt.

BUG: 393398
2018-04-22 18:53:49 +02:00
David Rosca
1290354f14
Use QOverload::of instead of qOverload
Fixes build with MSVC

BUG: 393395
2018-04-22 16:51:05 +02:00
David Rosca
452d332cfd
Merge branch 'Falkon/3.0' 2018-04-22 16:11:21 +02:00
David Rosca
af89a1b8d4
WebViewTest: Adjust expected loadFinished signal count 2018-04-22 16:10:58 +02:00
David Rosca
f61a957ca0
Merge branch 'Falkon/3.0' 2018-04-22 15:52:34 +02:00
David Rosca
9f0817ca71
WebView: Fix finding rwhvqt with QtWebEngine 5.11 2018-04-22 15:51:58 +02:00
David Rosca
1d74b41420
WebView: Don't prevent tabbing out of webview with QtWebEngine 5.11
QTBUG-67043 which caused losing focus is now fixed.
2018-04-22 15:33:43 +02:00
David Rosca
53919ce9de
CookieJar: Clear filter function in destructor
Fixes possible crash when cookieFilter is called after CookieJar
was destroyed.
2018-04-22 15:30:16 +02:00
l10n daemon script
75d5f5d552 SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2018-04-21 07:16:56 +02:00
l10n daemon script
08a3fe5476 GIT_SILENT made messages (after extraction) 2018-04-21 06:15:24 +02:00
l10n daemon script
3f48bdf5db SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2018-04-21 05:30:07 +02:00
David Rosca
8034ace416
Merge branch 'Falkon/3.0' 2018-04-18 10:11:05 +02:00
David Rosca
82a9c398a6
AutoSaver: Save when app is about to quit
Fixes changes not being saved in classes where saving is done in destructor,
like SpeedDial.
2018-04-18 10:09:07 +02:00
David Rosca
30f5cd2d7e
SpeedDial: Allow to save settings when there are no pages 2018-04-18 10:08:58 +02:00
l10n daemon script
1b065536b0 SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2018-04-18 07:35:32 +02:00
l10n daemon script
71f788310d SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2018-04-18 05:39:34 +02:00
l10n daemon script
a62fb97ed8 GIT_SILENT made messages (after extraction) 2018-04-17 06:17:22 +02:00
l10n daemon script
d823347e08 GIT_SILENT made messages (after extraction) 2018-04-17 03:32:07 +02:00
l10n daemon script
d1ab287dc0 SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2018-04-15 07:11:07 +02:00
Jonathan Riddell
7761a05f22 Tell releaseme that po is already taken care of 2018-04-12 12:23:51 +01:00
Anmol Gautam
62334cf8ab
added missing icons in menus
Differential Revision: https://phabricator.kde.org/D12104
2018-04-11 18:34:51 +02:00
David Rosca
751ef3988d
Merge branch 'Falkon/3.0' 2018-04-11 18:34:00 +02:00
David Rosca
17d45d718c
WebPage: Use load finished workaround unconditionally
It seems to be broken, again, with QtWebEngine 5.11.

BUG: 392885
FIXED-IN: 3.0.1
2018-04-11 18:32:12 +02:00
David Rosca
8d1a8671ea
IconProvider: Add memory cache for imageForUrl
During page load there may be a lot of requests for page favicon
until the page favicon is actually loaded.
Using cache (last 100 results) will reduce multiple database
queries during page load to at most one.
2018-04-11 18:24:10 +02:00
David Rosca
977bce9886
IconProvider: Use SqlQueryJob to save icons to database
Also use INSERT OR REPLACE instead of two separate queries.
2018-04-11 18:24:10 +02:00
David Rosca
e61352c70c
History: Use SqlQueryJob when adding history entry
This is called every time page finishes loading and as such
would block main thread during normal browsing.

Also remove urlIsStored as it is not used anywhere.
2018-04-11 18:24:10 +02:00
David Rosca
8a5c69b8a1
Add SqlQueryJob to run queries on separate thread 2018-04-11 18:24:09 +02:00
l10n daemon script
63f5fdd3d7 SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2018-04-11 06:59:04 +02:00
l10n daemon script
0d2776a261 SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2018-04-11 05:05:41 +02:00
l10n daemon script
e90d45ee1e SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2018-04-10 07:14:41 +02:00
l10n daemon script
62c8ff085b SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2018-04-10 05:32:53 +02:00
l10n daemon script
ba16c67115 SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2018-04-09 07:08:34 +02:00
l10n daemon script
cba0f0cfb4 SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2018-04-09 05:17:05 +02:00
l10n daemon script
a703947e87 SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2018-04-08 07:15:22 +02:00
l10n daemon script
6af3a8e1d9 SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2018-04-08 05:28:19 +02:00
l10n daemon script
e0f390e986 SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2018-04-07 07:11:21 +02:00
l10n daemon script
a931002465 GIT_SILENT made messages (after extraction) 2018-04-07 06:08:19 +02:00
David Rosca
19684a73cf
LocationBar: Update icon after requesting url load
BUG: 392747
FIXED-IN: 3.0.1
2018-04-06 18:50:26 +02:00
David Rosca
f6f54efc59
Fix building PyFalkon tests 2018-04-06 18:49:40 +02:00