1
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-14 02:52:12 +01:00
Commit Graph

4226 Commits

Author SHA1 Message Date
David Rosca
7c07af64fe
AdBlockManager: Temporarily remove url interceptor when updating matcher 2018-05-26 20:11:02 +02:00
David Rosca
42f70c5252
Add missing config.h include for HAVE_QTWEBENGINE_5_10 define 2018-05-26 20:09:39 +02:00
Anmol Gautam
ae16c64290 Added sorting in cookie filter list
Reviewers: drosca

Reviewed By: drosca

Subscribers: falkon

Tags: #falkon

Differential Revision: https://phabricator.kde.org/D13109
2018-05-26 00:15:00 +05:30
Jyri Tuomisto
326be38a45
Allow whitelisted cookies to be kept
Keep whitelisted cookies from being deleted when deleteCookiesOnClose is true

Differential Revision: https://phabricator.kde.org/D13097
2018-05-25 09:31:51 +02:00
Tobias C. Berner
37a79e3ad4 Use IMPORTED_TARGET for GnomeKeyring.
Summary:
Otherwise we would need to append also GNOME_KEYRING_LIBRARY_DIRS to
link_directories.

```
/usr/bin/ld: cannot find -lgnome-keyring
c++: error: linker command failed with exit code 1 (use -v to see invocation)
ninja: build stopped: subcommand failed.
```

Reviewers: #falkon, #automotive, kkofler, drosca

Subscribers: falkon

Tags: #falkon

Differential Revision: https://phabricator.kde.org/D12980
2018-05-19 14:26:50 +02:00
l10n daemon script
277003fa1d 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-05-16 07:34:51 +02:00
l10n daemon script
aca4f6c0a9 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-05-16 05:26:16 +02:00
David Rosca
148d2d94c1
Use QTWEBENGINE_VERSION instead of QT_VERSION
Allows to build against separate QtWebEngine releases.
2018-05-14 13:53:05 +02:00
David Rosca
e01024942f
Merge branch 'Falkon/3.0' 2018-05-14 13:32:58 +02:00
David Rosca
e8fa25e058
WebSearchBar: Set as focus proxy of engines button
BUG: 394091
FIXED-IN: 3.0.2
2018-05-14 13:29:02 +02:00
Kevin Kofler
774dbf93de KWalletPasswords, GnomeKeyringPasswords: Implement migration from QupZilla
Implement migration of passwords stored in KWallet or GNOME Keyring from
QupZilla to Falkon.

The logic is the same as for the profiles: If no "Falkon" folder exists,
but a "QupZilla" folder exists, we read all the data from the "QupZilla"
folder and write it to the "Falkon" folder. (In GNOME Keyring, those are
not actually folders, but application attributes on the entries, but the
logic is the same.)

In GnomeKeyringPasswordBackend, a storeEntry helper method is introduced
to avoid duplicating code.

Reviewed By: drosca
Differential Revision: https://phabricator.kde.org/D12846
2018-05-13 12:21:05 +02:00
Kevin Kofler
d06a0d60e0 Fix the fix for #391300 to require only QtWebEngine 5.10, not Qt 5.10
QtWebEngine can be newer than the rest of Qt (e.g., on Fedora 27).

This fixes the version check in WebView::savePageAs to use a macro
defined in config.h.cmake based on the version of QtWebEngineWidgets
rather than relying on QT_VERSION, which is the version of QtCore.

Reviewed By: drosca
Differential Revision: https://phabricator.kde.org/D12833
CCBUG: 391300
2018-05-12 13:29:39 +02:00
David Rosca
4bf77cd4d1
Version 3.0.1 2018-05-08 16:17:08 +02:00
David Rosca
5c557c8484
Preferences: Add checkboxes to spellcheck language list 2018-05-08 11:56:06 +02:00
David Rosca
3ad6b80d49
Merge branch 'Falkon/3.0' 2018-05-08 11:39:13 +02:00
David Rosca
4454ac714c
NavigationBar: Focus webview when navigating back/forward
BUG: 393834
FIXED-IN: 3.0.1
2018-05-08 11:35:39 +02:00
David Rosca
6e3da02d7d
ClosedTabsManager: Save and restore parent tab
BUG: 393976
FIXED-IN: 3.0.1
2018-05-08 11:26:25 +02:00
David Rosca
7fce81feaa
Merge branch 'Falkon/3.0' 2018-05-03 13:42:10 +02:00
David Rosca
9375b474ba
BrowserWindow: Track webview that initiated html fullscreen
Fixes issue where it wouldn't be possible to leave fullscreen
with F11 shortcut after closing webview that was in html fullscreen.

BUG: 393797
FIXED-IN: 3.0.1
2018-05-03 13:41:55 +02:00
Anmol Gautam
b6edd26ca0 Use security state icon in popup location bar
Reviewers: drosca

Reviewed By: drosca

Subscribers: falkon

Tags: #falkon

Differential Revision: https://phabricator.kde.org/D12666
2018-05-02 21:41:34 +05:30
l10n daemon script
7689b73daa 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-05-02 07:39:45 +02:00
David Rosca
94eb3161af
Merge branch 'Falkon/3.0' 2018-05-01 13:10:31 +02:00
David Rosca
c71ca333e8
PyFalkon: Fix build with latest PySide2
Add support for scheme handlers as PySide2 added QtWebEngineCore module.
2018-05-01 13:07:47 +02:00
David Rosca
3787a606d3
Rewrite internal sites to use user scripts instead of embedded code
It is no longer needed to setup web channel on unsafe js world
for internal pages, and thus it fixes issue where registering web
channel could fail in some cases.

BUG: 391875
FIXED-IN: 3.0.1
2018-05-01 13:02:46 +02:00
l10n daemon script
4809dfacaa 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-05-01 05:43:21 +02:00
David Rosca
d1fad353d0
PyFalkon: Fix build with latest PySide2
Add support for scheme handlers as PySide2 added QtWebEngineCore module.
2018-04-29 20:19:14 +02:00
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
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
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
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
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
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
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
David Rosca
6dc8624a93
LocationBar: Update icon after requesting url load
BUG: 392747
FIXED-IN: 3.0.1
2018-04-06 18:47:18 +02:00
l10n daemon script
4815b584f6 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-06 05:22:55 +02:00
l10n daemon script
d7a8464726 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-04 05:18:30 +02:00
l10n daemon script
31a65927fa 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-03 05:27:48 +02:00
David Rosca
daf5be1dba
Enable KWallet passwords backend by default inside KDE session
BUG: 391304
FIXED-IN: 3.1.0
2018-04-02 15:05:26 +02:00
David Rosca
ec1c2c8031
Plugins: Load KDE Frameworks Integration by default inside KDE session 2018-04-02 10:28:44 +02:00
Anmol Gautam
fb95cc81d6
Add support for Drag (on) and Drop (off) the bookmark toolbar
Differential Revision: https://phabricator.kde.org/D11664
2018-04-02 10:14:29 +02:00
l10n daemon script
b1dc68d09e 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-02 05:12:42 +02:00
David Rosca
c09b6f632c
Merge branch 'Falkon/3.0' 2018-03-31 17:18:27 +02:00
David Rosca
b6fa82aa8e
DownloadManager: Don't try to close not restored tabs
BUG: 392565
FIXED-IN: 3.0.1
2018-03-31 17:16:55 +02:00
David Rosca
f10ef7d0aa
AdBlock: Open AdBlock dialog with plugin settings button 2018-03-31 17:11:50 +02:00
David Rosca
96f17baa46
Rename KDESupport -> KDEFrameworksIntegration plugin 2018-03-31 16:55:50 +02:00
David Rosca
05fa1338d8
KDESupport: Use KCrash for crash reporting 2018-03-31 16:43:41 +02:00
David Rosca
05772edbee
Merge branch 'Falkon/3.0' 2018-03-31 15:43:22 +02:00
David Rosca
7c078ad70e
ProfileManager: Implement profile migration from QupZilla 2018-03-31 15:42:55 +02:00
David Rosca
3dae3edff5
QzTools: Add copyRecursively and removeRecursively 2018-03-31 15:08:06 +02:00
David Rosca
b0b4b2b268
Merge branch 'Falkon/3.0' 2018-03-31 12:18:23 +02:00
David Rosca
93af3896ee
WebView: Use direct url download when contents is not web page
Directly download file when contents is not a web page, eg. image,
text file, video, ...

Requires building against QtWebEngine 5.10.

CCBUG: 391300
2018-03-31 12:17:41 +02:00
David Rosca
d7dc9ba9f6
WebView: Don't show "Show image" action when showing image 2018-03-31 11:06:28 +02:00
David Rosca
94e1421d30
DownloadManager: Set default download path to Downloads folder
BUG: 391300
FIXED-IN: 3.0.1
2018-03-31 10:26:04 +02:00
Anmol Gautam
fc6f6cddd2
Fix focus and move cursor to end in SpeedDial
Focusing #formUrl without reseting its value doesnt moves the cursor to end.

Differential Revision: https://phabricator.kde.org/D11765
2018-03-30 17:33:57 +02:00
David Rosca
eb09774455
Add Q_OBJECT to StatusBar and TipLabel
Makes it possible to style them with style sheets.
2018-03-30 10:25:43 +02:00
David Rosca
6f9e6c5405
Merge branch 'Falkon/3.0' 2018-03-30 09:39:30 +02:00
David Rosca
525b929d38
Remove favicons from browsedata.sql
There are no default bookmarks now so it's not needed anymore.
2018-03-30 09:39:03 +02:00
David Rosca
04341b0981
Change homepage to falkon.org 2018-03-30 09:38:26 +02:00
David Rosca
b03e79f9a5
LocationBar: Only complete domain when not empty
This actually fixes issue where pasting text in the middle
of text would remove everything after pasted text.
2018-03-30 09:23:38 +02:00
l10n daemon script
680b07008a 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-03-30 05:23:04 +02:00
David Rosca
d329db7a08
Merge branch 'Falkon/3.0' 2018-03-28 18:56:26 +02:00
David Rosca
2f6cd7a559
LocationBar: Fix resolving correct LoadAction when url contains %20
BUG: 392445
FIXED-IN: 3.0.1
2018-03-28 18:54:26 +02:00
Anmol Gautam
fe4f523fe4
Add icons in clear history option in back and forward buttons
Add icon which is also shown in tools > clear_recent_history

Differential Revision: https://phabricator.kde.org/D11756
2018-03-27 21:35:04 +02:00
David Rosca
7595cef9ee
Windows: Fix app description text 2018-03-27 14:31:55 +02:00
David Rosca
593c276685
Merge branch 'Falkon/3.0' 2018-03-27 14:31:40 +02:00
David Rosca
822449a955
Windows: Fix app description text 2018-03-27 12:00:14 +02:00
David Rosca
c53cf4b32e
Merge branch 'Falkon/3.0' 2018-03-27 10:43:03 +02:00
Razi Alavizadeh
c8844db302 Preferences: Hide default browser check-box and push-button in portable mode. 2018-03-26 16:59:36 +04:30
Razi Alavizadeh
c704c5351c Windows: Fix compile issue 2018-03-26 12:04:27 +04:30
l10n daemon script
4c7f7cfc2e 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-03-26 05:08:41 +02:00
David Rosca
34a9faa5c1
DataPaths: Fix paths in portable mode 2018-03-25 21:10:32 +02:00
David Rosca
7d210ecf31
Add support for setting portable mode from falkon.conf
[Config]
Portable=true

in falkon.conf in the same directory as executable will
force running in portable mode.
2018-03-25 20:55:04 +02:00
David Rosca
2eeee848b7
Windows: Show taskbar progress on browser window in download manager
It will now show progress even when download manager window is not
opened, as download manager is no longer automatically opened when
starting new download.
2018-03-25 20:38:48 +02:00
David Rosca
162f09901d
Merge branch 'Falkon/3.0' 2018-03-25 09:13:44 +02:00
David Rosca
ba3563362d
TabIcon: Avoid infinite loop when trying to change size from resize event
Instead call updateIcon delayed after setting tab button which achieves
resizing TabIcon to correct size too.

Fixes high cpu load from last commit.
2018-03-25 09:09:58 +02:00
David Rosca
beab61606d
Merge branch 'Falkon/3.0' 2018-03-24 23:05:40 +01:00
David Rosca
fcf274b768
TabIcon: Force resize to correct size
Fixes tab icon taking full space even when hidden on restored
tabs with empty icon with windows theme.
2018-03-24 23:04:14 +01:00
David Rosca
9ee1fc9c59
Merge branch 'Falkon/3.0' 2018-03-24 21:47:53 +01:00
David Rosca
6cd1e7e31a
Preferences: Correctly set show bookmarks toolbar disabled by default 2018-03-24 21:47:24 +01:00
David Rosca
265c67f173
Require KF518n only with downloaded translations 2018-03-24 08:09:42 +01:00
David Rosca
fd8cc0b356
PyFalkon: Add basictest 2018-03-23 18:05:54 +01:00
David Rosca
18cf0ce480
PyFalkon: Add pyfalkontestrunner for tests 2018-03-23 17:56:53 +01:00
David Rosca
bf0043e16c
Export WebTab::SavedTab 2018-03-23 12:09:21 +01:00
David Rosca
588018e338
Only link to libcrypto 2018-03-23 12:07:52 +01:00
David Rosca
4d434fabe6
Properly find and link to OpenSSL libs 2018-03-23 11:16:19 +01:00
David Rosca
572fb29537
Windows: Set exe version with CMake configure file 2018-03-23 10:36:15 +01:00
David Rosca
231e14046f
Windows: Update page exe icons with new Falkon icon 2018-03-23 09:49:18 +01:00
David Rosca
dfea1a125c
Windows: Update registered capabilities
All registered file types now have same title "Falkon HTML Document"
and all registered protocols "Falkon URL".
Also added ftp protocol.
2018-03-23 09:26:40 +01:00
David Rosca
f247f6fa43
Merge branch 'Falkon/3.0' 2018-03-22 20:12:04 +01:00
David Rosca
5adddb9880
BookmarksToolbar: Fix setting minimum height of toolbar 2018-03-22 20:04:40 +01:00
l10n daemon script
91059a3fb3 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-03-22 05:17:51 +01:00
l10n daemon script
34550e08f1 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-03-21 05:30:17 +01:00
David Rosca
9c0f047d2c
Merge branch 'Falkon/3.0' 2018-03-20 13:57:35 +01:00
David Rosca
fbb48f28fd
LocationBar: Don't reset site icon when starting load
Fixes losing "secured" icon when navigating to subpages of https sites.
2018-03-20 13:56:30 +01:00
Anmol Gautam
8e88d43200
VerticalTabs: Open new tab with double and middle click in free space
Differential Revision: https://phabricator.kde.org/D11466
2018-03-20 13:51:31 +01:00
David Rosca
0a23bc9145
CookieJar: Adapt to changes in QtWebEngine 5.11 2018-03-20 13:43:57 +01:00
l10n daemon script
738cc1d55f 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-03-20 05:20:56 +01:00
l10n daemon script
46bed4a478 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-03-18 05:08:44 +01:00
David Rosca
9dd9e24e10
Merge branch 'Falkon/3.0' 2018-03-17 17:56:52 +01:00
David Rosca
48d87d7a0e
RestoreManager: Fix restoring nested crashed sessions 2018-03-17 17:56:35 +01:00
David Rosca
f80b0bcbb5
Merge branch 'Falkon/3.0' 2018-03-17 13:58:46 +01:00
David Rosca
dc131ddfee
NavigationBar: Fix syncing back/forward buttons state with web history
BUG: 391331
FIXED-IN: 3.0.1
2018-03-17 13:55:35 +01:00
David Rosca
69bccb046f
Merge branch 'Falkon/3.0' 2018-03-16 21:19:48 +01:00
David Rosca
081ff20722
FancyTabWidget: Don't draw tab title
This hides tab text in BrowsingLibrary as it would often get elided
due to insufficient space in tab bar. It's not possible to resize
the tab bar to fit the tab text as the text can be very long depending
on translation, so the only way to solve it is to just hide the text.
2018-03-16 21:19:27 +01:00
David Rosca
370ddf79ef
AdBlockSubscription: Fix leak when reloading subscription 2018-03-16 21:04:53 +01:00
David Rosca
36c31e3373
Merge branch 'Falkon/3.0' 2018-03-16 20:47:33 +01:00
David Rosca
49c028740e
LocationCompleter: Remove all originalText handling
Instead move the original text (original text from locationbar)
directly into model item.
2018-03-16 20:45:31 +01:00
David Rosca
37b34b4989
Merge branch 'Falkon/3.0' 2018-03-16 19:10:52 +01:00
David Rosca
6d26d67db4
LocationCompleter: Add search/visit item immediately
Instead of waiting until first refresh job finishes, add search/visit
item immediately on complete request and also update m_originalText.

This fixes issue where accepting the typed completion before the refresh
job finished resulting in searching for old typed text (from last
finished refresh job).
2018-03-16 19:08:55 +01:00
David Rosca
76eee703da
Merge branch 'Falkon/3.0' 2018-03-16 16:13:00 +01:00
Anmol Gautam
5c5dc20c6d
SpeedDial: Add 'overflow-y: auto' for '#overlay-edit'
Summary: When Falkon is not in maximized state, the edit overlay didn't display full content (displays just the image) due to missing `overflow-y: auto` in `#overlay-edit` in speed-dial.

Reviewers: drosca, #falkon

Reviewed By: drosca, #falkon

Tags: #falkon

Differential Revision: https://phabricator.kde.org/D11317
2018-03-16 16:12:18 +01:00
David Rosca
933dadc6b2
KDESupport: Add basic support for KIO
BUG: 391924
FIXED-IN: 3.1.0
2018-03-16 16:06:47 +01:00
David Rosca
72b7bf65de
Rename KWalletPasswords plugin to KDESupport 2018-03-16 16:01:03 +01:00
David Rosca
954cfeefd6
WebView: Only show source code action on supported schemes 2018-03-16 15:34:27 +01:00
David Rosca
6241e8d37f
LocationBar: Use WebPage::supportedSchemes to find which schemes to load 2018-03-16 15:31:37 +01:00
David Rosca
e6601baf1f
WebPage: Add supportedSchemes() 2018-03-16 15:31:07 +01:00
l10n daemon script
ee026bd40e 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-03-15 05:21:21 +01:00