Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2025-09-10 16:47:54 +02:00
Code Releases Activity
5,469 Commits 35 Branches 69 Tags 78 MiB
v3.1.0
Commit Graph

4269 Commits

Author SHA1 Message Date
David Rosca
47f2a1697c
AdBlockManager: Parse also invalid abp: urls 
Some sites (like filterlists.com) serves invalid abp urls:

    abp:subscribe?location=https%3A%2F%2Ffoo.com&title=AakList

Make sure the "amp;title" key will be parsed as title.

BUG: 397716
FIXED-IN: 3.1.0
 2018-12-24 20:39:55 +01:00
David Rosca
fe45d36cda
VerticalTabs: Close tree if middle clicking on collapsed item 
BUG: 399217
FIXED-IN: 3.1.0
 2018-12-24 15:18:40 +01:00
David Rosca
53d35dbdbd
BookmarksToolBarButton: Don't show empty title in tooltip 
BUG: 399233
FIXED-IN: 3.1.0
 2018-12-24 15:08:49 +01:00
David Rosca
956b99c1cb
BrowserWindow: Use LoadRequest in loadAddress 
BUG: 396609
FIXED-IN: 3.1.0
 2018-12-24 15:03:30 +01:00
David Rosca
cbb322c1a5
X11: Add --wmclass command line option 
BUG: 400753
FIXED-IN: 3.1.0
 2018-12-24 14:47:43 +01:00
David Rosca
51eb65ecec
SearchToolBar: Ignore old search callbacks 
BUG: 401343
FIXED-IN: 3.1.0
 2018-12-24 14:05:29 +01:00
David Rosca
9e7011cbed
DownloadManager: Start download timer when download is created 
Since we block in download options / file dialogs and QtWebEngine
download is already running, it will report invalid (faster) download
speed.

BUG: 401661
FIXED-IN: 3.1.0
 2018-12-24 13:55:46 +01:00
David Rosca
a6c266b6c6
SpeedDial: Base64 encode initial script 
Fixes parse errors when there is html encoded quote char.

BUG: 402024
FIXED-IN: 3.1.0
 2018-12-24 13:41:36 +01:00
l10n daemon script
0684603930 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-12-24 05:18:23 +01:00
Giacomo Barazzetti
77e928569a Create new bookmark items near the current one (over it) 
Summary:
Currently in the bookmarks manager the user can create new items via the contextual menu, so a position is implicitly chosen, but the new items are always inserted at the first position in the list.

This change aims to add new items just before the current (selected) one. If the selected item is a folder the behavior is unchanged (the new item will be inserted at the first position in that folder).

Test Plan:
- Select a separator/url item
- Add a new item (separator/url/folder)
- The new item is inserted just before the previously selected one

Reviewers: #falkon, drosca

Reviewed By: #falkon, drosca

Subscribers: cullmann, falkon

Tags: #falkon

Differential Revision: https://phabricator.kde.org/D14930
 2018-12-12 22:21:33 +01:00
David Rosca
4ff7ccc737
Don't include qmlpluginloader.h in plugin.sh 
Actually much better fix for PyFalkon build error.
 2018-12-12 19:05:26 +01:00
David Rosca
eefd9cd046
Revert "Fix PyFalkon build" 
This reverts commit 3ea935b143.
 2018-12-12 19:03:25 +01:00
David Rosca
3ea935b143
Fix PyFalkon build 2018-12-12 19:02:12 +01:00
David Rosca
d25c34901c
Use QTWEBENGINEWIDGETS_VERSION for determining QtWebEngine version 2018-12-12 18:57:56 +01:00
Björn Feber
3b51982c5d Fix unreadable Falkon logo text when using a dark theme 
Summary:
BUG: 400262
https://bugs.kde.org/show_bug.cgi?id=400262

This puts a light rounded rectangle behind the logo, so the logo text is readable when using a dark theme.
{F6451049}

Test Plan: Open the about window (Application Menu -> About Falkon).

Reviewers: #falkon, drosca

Reviewed By: #falkon, drosca

Subscribers: drosca, falkon, #falkon

Tags: #falkon

Differential Revision: https://phabricator.kde.org/D17307
 2018-12-11 21:02:12 +01:00
Björn Feber
f43250f880 Fix hardcoded private browsing icon 
Summary:
BUG: 397078

Fixes the hardcoded private browsing icon in the Falkon application menu.

Test Plan: Open the Falkon application menu on the top right.

Reviewers: #falkon, drosca

Reviewed By: #falkon, drosca

Subscribers: ngraham, drosca, falkon, #falkon

Tags: #falkon

Differential Revision: https://phabricator.kde.org/D17288
 2018-12-11 20:55:59 +01:00
Nicolas Fella
7bca744cab Enable page sharing 
Summary:
Use the new ShareUrl support from Purpose to share pages. ATM only sending the page via KDE Connect and Email is supported, but more can be added easily by extending Purpose.

{F6449845}

Depends on D17285
Bug: 393543

Test Plan: Send page to phone via KDE Connect

Reviewers: #falkon, drosca

Reviewed By: #falkon, drosca

Subscribers: drosca, falkon

Tags: #falkon

Differential Revision: https://phabricator.kde.org/D17286
 2018-12-04 04:00:44 +01:00
l10n daemon script
519764f421 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-12-03 05:29:37 +01:00
l10n daemon script
d9a926a620 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-11-23 05:34:04 +01:00
l10n daemon script
9e56be5194 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-11-17 05:55:31 +01:00
l10n daemon script
5614914d14 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-11-12 05:48:03 +01:00
Remya Krishnan
cda838a35e
Adblock uses outdated Spanish filters (Filtros Naucópicos) 
Summary:
Replaced the link to a filter set with Easylist Spanish, that is changed
the outdated Spanish filters into the updated one.

BUG 392836

Reviewers: drosca

Reviewed By: drosca

Subscribers: drosca, falkon

Tags: #falkon

Differential Revision: https://phabricator.kde.org/D16656
 2018-11-04 16:15:49 +01:00
l10n daemon script
6df8ac4c7d 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-10-28 04:53:16 +01:00
l10n daemon script
ddc19c7320 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-10-27 05:49:44 +02:00
Patrick Flynn
c85f4f8894
Replace Qt foreach with C++ foreach 
Summary: This replaces three Qt foreach loops I found in the tabwidget with C++ foreach loops. There were already newer foreach loops near the bottom, so this makes things consistent in the entire file.

Reviewers: drosca

Reviewed By: drosca

Subscribers: falkon

Tags: #falkon

Differential Revision: https://phabricator.kde.org/D16238
 2018-10-24 17:17:11 +02:00
l10n daemon script
14f88fb46c 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-10-23 06:01:07 +02:00
l10n daemon script
116ba93b79 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-10-22 05:54:15 +02:00
Yuri Chornoivan
fc5ba5f5f2 Fix minor typos 2018-10-21 18:14:27 +03:00
l10n daemon script
42e0c865b2 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-10-17 06:32:51 +02:00
David Rosca
a039da158a
Update to latest upstream QtSingleApplication 2018-10-15 20:39:47 +02:00
Patrick Flynn
6d445edb44
Context menu for statusbar 
Summary:
This adds a simple context menu to the statusbar;
the only option it has is "Hide", which obviously hides
the statusbar the same way as if you were to go the view menu.

Reviewers: drosca

Reviewed By: drosca

Subscribers: drosca, falkon

Tags: #falkon

Differential Revision: https://phabricator.kde.org/D16158
 2018-10-15 20:23:44 +02:00
Christophe CURIS
907e2e4938
Fix crash during download when the main window have been closed 
Summary:
Falkon has a feature to automatically close the tab that was specifically
opened for the file to download, because this kind of tab has no useful
purpose to the user.

In the case where the main window would have been closed, Falkon
would crash de-referencing the now NULL pointer to the main window.

This patch adds a simple check to do nothing in this case, as there is no
tab to close anyway.

Reviewers: #falkon, drosca

Reviewed By: #falkon, drosca

Subscribers: drosca, falkon, #falkon

Tags: #falkon

Differential Revision: https://phabricator.kde.org/D14711
 2018-10-15 18:19:43 +02:00
l10n daemon script
b44134fd07 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-10-10 06:19:06 +02:00
l10n daemon script
c6109d11ad 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-10-06 05:44:51 +02:00
l10n daemon script
cda74effe3 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-10-05 05:52:10 +02:00
Nicolas Fella
3365b52d1c Add icon to Fullscreen action 
Summary: {F6301440}

Reviewers: #falkon, drosca

Reviewed By: #falkon, drosca

Subscribers: falkon

Tags: #falkon

Differential Revision: https://phabricator.kde.org/D15925
 2018-10-04 18:52:09 +02:00
Nicolas Fella
1f2b2bf819 Add icon to Web Search action 
Summary: {F6301476}

Reviewers: #falkon, drosca

Reviewed By: #falkon, drosca

Subscribers: falkon

Tags: #falkon

Differential Revision: https://phabricator.kde.org/D15926
 2018-10-04 18:51:26 +02:00
l10n daemon script
32948ddd02 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-10-04 05:51:46 +02:00
Nicolas Fella
75f3d58718 Add icon to DownloadManager action 
Summary: {F6301242}

Reviewers: #falkon, drosca

Reviewed By: #falkon, drosca

Subscribers: falkon

Tags: #falkon

Differential Revision: https://phabricator.kde.org/D15921
 2018-10-03 16:33:27 +02:00
l10n daemon script
ce21076452 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-10-03 06:07:51 +02:00
Anmol Gautam
0abde8b755 Added HelloQml Extension 
Reviewers: drosca

Reviewed By: drosca

Subscribers: falkon

Tags: #falkon

Differential Revision: https://phabricator.kde.org/D14519
 2018-10-02 03:07:32 +05:30
Anmol Gautam
011df43851 set resizeMode for QQuickWidget in sidebar 
Reviewers: drosca

Reviewed By: drosca

Subscribers: falkon

Tags: #falkon

Differential Revision: https://phabricator.kde.org/D15886
 2018-10-02 03:02:36 +05:30
l10n daemon script
853baa8232 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-09-30 05:50:04 +02:00
Anmol Gautam
7c570c93db fixed build for qt versions < 5.11 
Summary: Build is broken because QWebEngineRequestJob::initiator is added in 5.11. This patch fixes the build with Qt < 5.11.

Reviewers: drosca

Reviewed By: drosca

Subscribers: falkon

Tags: #falkon

Differential Revision: https://phabricator.kde.org/D15832
 2018-09-29 20:44:46 +05:30
Anmol Gautam
5daddc4c6c Add QML Extensions API 
Summary: Add QML Extensions API

Reviewers: drosca

Reviewed By: drosca

Subscribers: falkon

Tags: #falkon

Differential Revision: https://phabricator.kde.org/D14774
 2018-09-29 00:47:47 +05:30
l10n daemon script
f3a1622326 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-09-24 05:40:20 +02:00
l10n daemon script
e1c4da47a9 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-08-25 05:37:27 +02:00
l10n daemon script
cf5c14872e 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-08-18 05:41:40 +02:00
l10n daemon script
5722f9f996 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-08-16 05:29:28 +02:00
l10n daemon script
099901f0a6 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-08-08 05:44:02 +02:00
l10n daemon script
d1400db7d6 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-08-05 05:29:00 +02:00
l10n daemon script
10574667b1 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-07-26 05:43:51 +02:00
David Rosca
d5fc3ebc88
Merge branch 'Falkon/3.0' 2018-07-22 15:19:36 +02:00
David Rosca
a7d2f87579
FalkonSchemeHandler: Make sure to load data on main thread 
QIODevice::read is called on WebEngine IO thread.
 2018-07-22 15:17:04 +02:00
l10n daemon script
bd0d5cabdc 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-07-21 05:32:15 +02:00
l10n daemon script
cff2b68ce9 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-07-20 05:26:58 +02:00
Juraj Oravec
6357e98313
RunAction: Close UI file after it is loaded 
Summary: It is good practice to close files which are no longer needed.

Reviewers: #falkon, drosca

Reviewed By: #falkon, drosca

Subscribers: falkon

Tags: #falkon

Differential Revision: https://phabricator.kde.org/D14197
 2018-07-19 17:38:31 +02:00
Juraj Oravec
6556ade5c9
[Feature] [Vertical Tabs] Add "Unload Tree" to Tab Tree drop-down menu 
FEATURE: 394247

Reviewers: #falkon, drosca

Reviewed By: #falkon, drosca

Subscribers: drosca, falkon

Tags: #falkon

Differential Revision: https://phabricator.kde.org/D14214
 2018-07-19 17:36:54 +02:00
l10n daemon script
aca5cb0e1c 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-07-19 05:21:21 +02:00
Juraj Oravec
82c8d50f9a
[Feature] Add python plugin MiddleClickLoader 
Summary:
This plugin loads text from selection clipboard in tab after pressing mouse middle button (pressing mouse wheel).
Url / text from selection clipboard can be loaded in: Current Tab, New Tab, New Window
There is an option to use only valid url otherwise it will search using default search engine.

FEATURE: 395688

Reviewers: #falkon, drosca

Subscribers: falkon

Tags: #falkon

Differential Revision: https://phabricator.kde.org/D14155
 2018-07-17 12:12:45 +02:00
David Rosca
1cc053c7f1
Merge branch 'Falkon/3.0' 2018-07-08 21:05:36 +02:00
David Rosca
95e2232d39
DownloadManager: Don't try to percent decode filenames 
QtWebEngine no longer percent encode it, so actually trying
to decode it produces invalid results.

BUG: 395424
FIXED-IN: 3.0.2
 2018-07-08 20:43:44 +02:00
David Rosca
53e0a43762
NavigationBar: Correctly reconnect to page actions 
BUG: 395828
FIXED-IN: 3.0.2
 2018-07-08 20:34:58 +02:00
l10n daemon script
9fd53c75fa 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-07-07 06:57:28 +02:00
l10n daemon script
f6f2d7c784 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-07-07 05:15:57 +02:00
Laurent Montel
db10e175f0 Add more QSL + nullptr 2018-07-06 08:20:47 +02:00
Laurent Montel
07b4dd4f6e Add sime QLS + nullptr 2018-07-05 13:58:00 +02:00
l10n daemon script
0a744919e5 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-07-03 07:10:33 +02:00
l10n daemon script
06020d9615 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-07-03 05:28:07 +02:00
Christopher Chavez
60b7cbd9b6
Fix location of Info.plist file for macOS build 
Differential Revision: https://phabricator.kde.org/D13736
 2018-06-27 17:41:44 +02:00
l10n daemon script
3bc9e66596 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-06-26 07:19:13 +02:00
l10n daemon script
034365355a 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-06-26 05:38:12 +02:00
l10n daemon script
683a3d0bf9 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-06-22 07:04:43 +02:00
l10n daemon script
9a725b3c62 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-06-22 05:22:41 +02:00
l10n daemon script
e53e4d1b07 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-06-20 07:44:39 +02:00
l10n daemon script
ede9015884 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-06-20 05:45:06 +02:00
David Rosca
633748a815
Merge branch 'Falkon/3.0' 2018-06-18 13:40:15 +02:00
David Rosca
4c83ba3d6c
PyFalkon: Fix build with PySide2 release 2018-06-18 13:39:46 +02:00
l10n daemon script
90d5c5b3d6 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-06-17 07:21:48 +02:00
l10n daemon script
0e96dd33c2 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-06-17 05:29:07 +02:00
l10n daemon script
42df5403be 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-06-14 07:47:42 +02:00
l10n daemon script
b8bb4dfa31 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-06-13 05:35:07 +02:00
David Rosca
7b2ff16004
Merge branch 'Falkon/3.0' 2018-06-12 09:14:26 +02:00
David Rosca
9f0f688ee8
Use QTWEBENGINE_VERSION instead of QT_VERSION 
Fixes build against separate QtWebEngine releases.
 2018-06-12 09:10:02 +02:00
l10n daemon script
cd15b7008c 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-06-06 07:29:50 +02:00
l10n daemon script
0c30443e84 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-06-06 05:35:48 +02:00
l10n daemon script
f1fdfa57ab 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-06-02 07:40:51 +02:00
l10n daemon script
6fca2d6cef 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-06-02 05:39:44 +02:00
David Rosca
72547e0bd9
Merge branch 'Falkon/3.0' 2018-06-01 12:59:09 +02:00
David Rosca
35d8f25fd4
GreaseMonkey: Return undefined when value was not found in GM_getValue 2018-06-01 12:58:48 +02:00
l10n daemon script
5ba2dce127 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-29 07:28:55 +02:00
l10n daemon script
fa7aa25a5d 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-29 05:34:41 +02:00
David Rosca
0f1c46d0e7
Merge branch 'Falkon/3.0' 2018-05-26 20:13:17 +02:00
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