Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-13 10:32:11 +01:00
Code Releases Activity
6,234 Commits 24 Branches 54 Tags 50 MiB
3a55d8d163
Commit Graph

4603 Commits

Author SHA1 Message Date
l10n daemon script
1e1a3f8be2 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"
 2021-08-19 01:13:28 +00:00
l10n daemon script
1c2c8ab982 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"
 2021-07-15 01:14:50 +00:00
Pino Toscano
9bebc144ac Stop installing app icon in pixmaps location 
The /usr/share/pixmaps location is considered a legacy location for
application icons; since the application icons are already installed in
the global XDG hicolor theme, then simply stop installing the 128px one
in the legacy pixmaps location.

Copy the 128px icon from the hicolor directory instead, as it is the
same.
 2021-05-16 21:14:08 +02:00
Juraj Oravec
64f85f5e89
Enable ScreenCaptureEnabled only for QtWE 5.13.2+ 
Similar to:
a733fa9fd0

Maybe we should also take the same approach and reject instead of
disabling the feature.

Signed-off-by: Juraj Oravec <jurajoravec@mailo.com>
 2021-04-05 18:26:25 +02:00
Juraj Oravec
f7b372098e
Implement QtWE ScreenCaptureEnabled option 
BUG: 431004

Signed-off-by: Juraj Oravec <jurajoravec@mailo.com>
 2021-04-05 17:54:30 +02:00
Juraj Oravec
fb03989114 Implement html5 permissions for screen sharing 
Introduced in QtWebEngine 5.10

BUG: 431004

Signed-off-by: Juraj Oravec <jurajoravec@mailo.com>
 2021-04-05 17:40:36 +02:00
Juraj Oravec
2b64efc7f7
GIT_SILENT Fix password autofill after d8a706f3 
Signed-off-by: Juraj Oravec <jurajoravec@mailo.com>
 2021-03-17 08:17:45 +01:00
Patrick Flynn
c978521e33 Added context menu item to bookmarks toolbar for creating folder 2021-03-16 20:19:08 +00:00
Mikalai Ahnioŭ
742b20154b Use new setUrlRequestInterceptor() method 
removes deprecation warning during compilation 
when building against Qt 5.13 or later
 2021-03-06 21:39:20 +00:00
Ahmad Samir
5d0c9bb238 [KWalletPasswordBackend] Port KWallet::readEntryList() to KWallet::entriesList() 
Currently the code is conditional so as to keep it building against
older kwallet versions.
 2021-03-06 18:10:25 +00:00
Mikalai Ahnioŭ
1cf46c9f10 Merge branch 'mikolajp/falkon-master' 
Rebasing to current master
 2021-03-06 20:38:25 +03:00
Juraj Oravec
79b356cce5 VerticalTabs - Accept click event on tree collapse 
Very often when the tree collapse/expand button was pressed apart from
expected function the dragging of the tab group started.

Signed-off-by: Juraj Oravec <jurajoravec@mailo.com>
 2021-03-06 00:49:42 +00:00
Juraj Oravec
d8a706f3a9 Add filter to preferences extensions page 
Developed by: Yehor Tsyba @malibushko

BUG: 408312
 2021-03-06 00:25:32 +00:00
l10n daemon script
1ccd81ecf1 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"
 2020-12-29 06:14:58 +01:00
Antonio Rojas
9fac57e8fe Fix PyFalkon build with shiboken 5.15.2 
Prevent Qz::sessionVersion form being wrapped, since it is not exported in the shared library.

BUG: 429414
 2020-11-20 21:52:34 +01:00
l10n daemon script
ba4f184781 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"
 2020-11-05 06:29:54 +01:00
l10n daemon script
a661ac27d4 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"
 2020-11-01 06:34:37 +01:00
l10n daemon script
02bf543919 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"
 2020-10-29 06:36:15 +01:00
l10n daemon script
94a635c348 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"
 2020-10-15 06:12:19 +02:00
Juraj Oravec
d00d385ea6 Revert "Fix white flashes" 
This reverts commit 4ebeb509b7.

This commit is causing rendering errors as described in bugreport
https://bugs.kde.org/show_bug.cgi?id=426486
 2020-09-13 21:41:10 +02:00
Alva Snædís
4ebeb509b7 Fix white flashes 2020-09-05 20:28:22 +00:00
l10n daemon script
9d8a727f9f 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"
 2020-09-05 06:13:09 +02:00
l10n daemon script
6fe0f76294 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"
 2020-09-04 06:00:13 +02:00
Nicolas Fella
5ed4e01ce0 Fix page sharing via Purpose 
Purpose expects a list of URLs, not a single URL
 2020-08-26 01:20:45 +02:00
l10n daemon script
501678d0d8 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"
 2020-08-07 05:48:05 +02:00
l10n daemon script
cc6fc7a4fa 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"
 2020-07-29 06:01:26 +02:00
l10n daemon script
3bb9314603 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"
 2020-06-24 05:54:22 +02:00
l10n daemon script
6765b10f8d 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"
 2020-06-18 05:39:07 +02:00
l10n daemon script
6e4afc466c 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"
 2020-06-17 14:06:46 +02:00
Mikalai Ahnioŭ
c3d0fc0e0e Correct the sorting for cookies white- and black- lists 
The previous solution has no effect on entries which already exist in the lists.
As a result the lists are not sorted. It is only functional when the lists were
initially empty, which is a sub-optimal case.

Test plan: open Cookies Manager, switch to Cookie Filtering tab, see the items being alphabetically sorted
 2020-04-17 17:26:06 +03:00
Heiko Becker
c9aad1ec0a Merge remote-tracking branch 'origin/Falkon/3.1' 2020-03-30 22:27:25 +02:00
Heiko Becker
2ca83509db Fix build with Qt 5.15 
QPainterPath is no longer included via qtransform.h (since
5.15.0-beta2, 50d2acdc93b4de2ba56eb67787e2bdcb21dd4bea in qtbase.git).
 2020-03-29 12:54:08 +02:00
Puneeth Chanda
e4b468e233 Prompt user when KWallet is disabled 
Summary: From now, when the user saves the password by clicking remember he will get a notification that the password is saved.

Reviewers: SGOrava, drosca

Reviewed By: SGOrava, drosca

Subscribers: drosca, alukichev, falkon

Tags: #falkon

Differential Revision: https://phabricator.kde.org/D26932
 2020-02-15 16:19:02 +01:00
Juraj Oravec
0e25b116cb SearchBar - Show number of matches found on page search 
Summary: BUG: 395429

Test Plan: Open searchbar on webpage and type some text which is present on the page

Reviewers: #falkon, drosca

Reviewed By: #falkon, drosca

Subscribers: drosca, falkon

Tags: #falkon

Differential Revision: https://phabricator.kde.org/D27095
 2020-02-15 15:32:32 +01:00
l10n daemon script
b577df4466 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"
 2020-02-12 10:08:15 +01:00
l10n daemon script
e0ea9fd04c 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"
 2020-02-12 06:06:11 +01:00
Juraj Oravec
4b7a38680b Speeddial: decode initialScript data as Utf8 
Summary:
BUG: 406095

Solution based on:
https://developer.mozilla.org/en-US/docs/Web/API/WindowBase64/Base64_encoding_and_decoding#Solution_4_%E2%80%93_escaping_the_string_before_encoding_it

Test Plan: Add webpage with title which contains Utf8 character (e.g. ľščťžýáíéúäô) into speeddial

Reviewers: #falkon, drosca

Reviewed By: #falkon, drosca

Subscribers: falkon, drosca

Tags: #falkon

Differential Revision: https://phabricator.kde.org/D27081
 2020-02-01 10:36:51 +01:00
Puneeth Chanda
1cecd14fd0 Fix crash when KWallet is not available. 
Summary:
Bug 398767
Currently, when the user clicks //remember password// when KWallet is disabled, **falkon** gets crashed.
This patch fixes the crash by checking if `KWallet` object is created and only then it adds to the folder.
The following functions are fixed:

  - addEntry

  - Update Entry

  - updateLastUsed

  - removeEntry

  - removeAll

Reviewers: SGOrava, drosca

Reviewed By: SGOrava, drosca

Subscribers: drosca, falkon

Tags: #falkon

Differential Revision: https://phabricator.kde.org/D26872
 2020-01-24 14:15:11 +01:00
Alexander Lukichev
90664879c5 Option for internal PDFium-based viewer on Qt 5.13+ 
Summary:
Qt 5.13+ has a built-in PDFium-based PDF viewer enabled in
QWebEngineSettings by default. There is no way to disable it at
run time by the user, and leaving it "as is" changes the browser's
behavior, depending on which version of Qt is installed on a
target system. The built-in plugin currently has quite a limited
functionality and, e.g., misses ability to download the document
being viewed.

This adds a checkbox in Preferences->Browsing->Web configuration
to enable/disable usage of internal Qt's PDF viewer on systems
with Qt 5.13 and above.

The feature uses Pepper plugin API (PPAPI) of QtWebEngine. The
corresponding checkbox's text has been renamed to better reflect
its impact on QtWebEngine's operation ("Allow Pepper Plugins
(Flash plugin)" -> "Enable Pepper plugin API (PPAPI)").

To clarify dependency of internal PDF viewer on PPAPI, the
checkbox gets disabled when the user unchecks "Enable Pepper
plugin API (PPAPI)" checkbox. Also, the dependency is mentioned
in its text.

Reviewers: #falkon, SGOrava

Reviewed By: #falkon, SGOrava

Subscribers: pshaw, SGOrava, falkon, alukichev

Tags: #falkon

Differential Revision: https://phabricator.kde.org/D26753
 2020-01-21 21:00:24 +01:00
Juraj Oravec
2a0f092436 Handle web push notifications with Falkon notification system 
Summary:
Add basic support for web notifications with icon, title and body text.

FEATURE: 409045

Test Plan: Fire some notifications from webpage

Reviewers: #falkon

Subscribers: falkon

Tags: #falkon

Differential Revision: https://phabricator.kde.org/D26452
 2020-01-20 20:39:59 +01:00
l10n daemon script
50c2cebdd6 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"
 2020-01-13 09:36:25 +01:00
Juraj Oravec
903c29cb09
GreaseMonkey: Use QTWEBENGINEWIDGETS_VERSION to check for the current version 
Signed-off-by: Juraj Oravec <sgd.orava@gmail.com>
 2020-01-06 11:45:10 +01:00
Juraj Oravec
6974f8c254 GreaseMonkey: Fix detecting *.user.js urls 
Test Plan: Try to install userscript from http://greasyfork.org/

Reviewers: #falkon, drosca

Reviewed By: #falkon, drosca

Subscribers: falkon

Tags: #falkon

Differential Revision: https://phabricator.kde.org/D26436
 2020-01-05 19:39:46 +01:00
Juraj Oravec
c934e40440
Use QString::chopped() only for Qt 5.10+ 
https://github.com/KDE/falkon/pull/6

Signed-off-by: Juraj Oravec <sgd.orava@gmail.com>
 2020-01-01 12:08:37 +01:00
Juraj Oravec
d45e51a4e5
Port from deprecated QDir::operator=(const QString&) > QDir::setPath() 
Signed-off-by: Juraj Oravec <sgd.orava@gmail.com>
 2019-12-31 19:41:28 +01:00
Juraj Oravec
14719b3ec3
Port from deprecated QPalette::background() > QPalette::window() 
Signed-off-by: Juraj Oravec <sgd.orava@gmail.com>
 2019-12-31 18:52:59 +01:00
Juraj Oravec
03b2880f8b
Port from deprecated QPalette::foreground() > QPalette::windowText() 
Signed-off-by: Juraj Oravec <sgd.orava@gmail.com>
 2019-12-31 18:35:21 +01:00
Juraj Oravec
de200c77c4
Port from deprecated QFontMetrics::width() > QFontMetrics::horizontalAdvance() 
Signed-off-by: Juraj Oravec <sgd.orava@gmail.com>
 2019-12-31 15:38:48 +01:00
Juraj Oravec
168f61c602
Port from deprecated QListWidget::setItemHidden() > QListWidgetItem::setHidden() 
Signed-off-by: Juraj Oravec <sgd.orava@gmail.com>
 2019-12-31 12:15:40 +01:00
Juraj Oravec
6c56304aed
Port from deprecated QLineEdit::getTextMargins() > QLineEdit::textMargins() 
Signed-off-by: Juraj Oravec <sgd.orava@gmail.com>
 2019-12-31 12:04:22 +01:00
Juraj Oravec
cf6a0b46ef
Port from QListWidget::setItemSelected > QListWidgetItem::setSelected 
Signed-off-by: Juraj Oravec <sgd.orava@gmail.com>
 2019-12-31 11:36:07 +01:00
Juraj Oravec
7a1558e173
Port from deprecated QTreeView::sortByColumn(int) 
QTreeView::sortByColumn(int) > QTreeView::sortByColumn(int column, Qt::SortOrder order)

Signed-off-by: Juraj Oravec <sgd.orava@gmail.com>
 2019-12-31 10:50:52 +01:00
Juraj Oravec
b82752a31e
Port from deprecated QTableView::sortByColumn(int) 
QTableView::sortByColumn(int) > QTableView::sortByColumn(int column, Qt::SortOrder order)

Signed-off-by: Juraj Oravec <sgd.orava@gmail.com>
 2019-12-31 10:47:57 +01:00
Juraj Oravec
018b8d1a28
adblock: port foreach -> range-based for 
Signed-off-by: Juraj Oravec <sgd.orava@gmail.com>
 2019-12-30 21:46:37 +01:00
Juraj Oravec
e34933b5d7
app: port foreach -> range-based for 
Signed-off-by: Juraj Oravec <sgd.orava@gmail.com>
 2019-12-30 21:29:24 +01:00
Juraj Oravec
ef48b4725e
tools: port foreach -> range-based for 
Signed-off-by: Juraj Oravec <sgd.orava@gmail.com>
 2019-12-30 21:21:06 +01:00
Juraj Oravec
7f654409c5
webengine: port foreach -> range-based for 
Signed-off-by: Juraj Oravec <sgd.orava@gmail.com>
 2019-12-30 21:06:39 +01:00
Juraj Oravec
9b6f187282
network: port foreach -> range-based for 
Signed-off-by: Juraj Oravec <sgd.orava@gmail.com>
 2019-12-30 20:59:30 +01:00
Juraj Oravec
991e0b952e
navigation: port foreach -> range-based for 
Signed-off-by: Juraj Oravec <sgd.orava@gmail.com>
 2019-12-30 20:49:01 +01:00
Juraj Oravec
aa039b8579
session: port foreach -> range-based for 
Signed-off-by: Juraj Oravec <sgd.orava@gmail.com>
 2019-12-30 20:40:50 +01:00
Juraj Oravec
da73eb5c77
sidebar: port foreach -> range-based for 
Signed-off-by: Juraj Oravec <sgd.orava@gmail.com>
 2019-12-30 20:35:42 +01:00
Juraj Oravec
1a3f887145
tabwidget: port foreach -> range-based for 
Signed-off-by: Juraj Oravec <sgd.orava@gmail.com>
 2019-12-30 20:31:03 +01:00
Juraj Oravec
f02cb62b7b
plugins: port foreach -> range-based for 
Signed-off-by: Juraj Oravec <sgd.orava@gmail.com>
 2019-12-30 20:25:31 +01:00
Juraj Oravec
5efc0e8d9d
opensearch: port foreach -> range-based for 
Signed-off-by: Juraj Oravec <sgd.orava@gmail.com>
 2019-12-30 20:15:32 +01:00
Juraj Oravec
c4b6ae9019
bookmarks: port foreach -> range-based for 
Signed-off-by: Juraj Oravec <sgd.orava@gmail.com>
 2019-12-30 19:50:58 +01:00
Juraj Oravec
40c06eaaae
autofill: port foreach -> range-based for 
Signed-off-by: Juraj Oravec <sgd.orava@gmail.com>
 2019-12-30 19:16:12 +01:00
Juraj Oravec
ea75f18c5b
preferences: port foreach -> range-based for 
Signed-off-by: Juraj Oravec <sgd.orava@gmail.com>
 2019-12-30 19:00:40 +01:00
Juraj Oravec
6c14547656
history: port foreach -> range-based for 
Signed-off-by: Juraj Oravec <sgd.orava@gmail.com>
 2019-12-30 18:32:20 +01:00
Juraj Oravec
d242ac51ab
siteinfo: port foreach -> range-based for 
Signed-off-by: Juraj Oravec <sgd.orava@gmail.com>
 2019-12-30 18:02:07 +01:00
Juraj Oravec
8bc38860bf
downloadmanager: port foreach -> range-based for 
Signed-off-by: Juraj Oravec <sgd.orava@gmail.com>
 2019-12-30 17:55:52 +01:00
Juraj Oravec
1457cfc1fd
CookieManager: port foreach -> range-based for 
Signed-off-by: Juraj Oravec <sgd.orava@gmail.com>
 2019-12-30 17:50:55 +01:00
Juraj Oravec
169f7cba65
cookiejar: port foreach -> range-based for 
Signed-off-by: Juraj Oravec <sgd.orava@gmail.com>
 2019-12-30 17:50:26 +01:00
Juraj Oravec
def38a2da4
TabManager: port foreach -> range-based for 
Signed-off-by: Juraj Oravec <sgd.orava@gmail.com>
 2019-12-30 17:36:35 +01:00
Juraj Oravec
9330f8cc04
FCM: port foreach -> range-based for 
Signed-off-by: Juraj Oravec <sgd.orava@gmail.com>
 2019-12-30 17:20:44 +01:00
Juraj Oravec
9bcfeb3cd7
GM: port foreach -> range-based for 
Signed-off-by: Juraj Oravec <sgd.orava@gmail.com>
 2019-12-30 17:05:24 +01:00
Juraj Oravec
c9a6a51285
KDEFI: Constify for arguments 
Signed-off-by: Juraj Oravec <sgd.orava@gmail.com>
 2019-12-30 17:03:50 +01:00
Juraj Oravec
7f567b8536
SBI: Fix typo 
Signed-off-by: Juraj Oravec <sgd.orava@gmail.com>
 2019-12-30 16:32:08 +01:00
Juraj Oravec
6370bcf6c8
KDEFI: port foreach -> range-based for 
Signed-off-by: Juraj Oravec <sgd.orava@gmail.com>
 2019-12-30 16:28:38 +01:00
Juraj Oravec
52370301aa
PIM: Fix typo, missing brackets around if 
Signed-off-by: Juraj Oravec <sgd.orava@gmail.com>
 2019-12-30 16:24:00 +01:00
Juraj Oravec
be4d55795f
PIM: port foreach -> range-based for 
Signed-off-by: Juraj Oravec <sgd.orava@gmail.com>
 2019-12-30 16:22:20 +01:00
Juraj Oravec
ff94cf69da
StatusBarIcons: port foreach -> range-based for 
Signed-off-by: Juraj Oravec <sgd.orava@gmail.com>
 2019-12-30 16:00:28 +01:00
Luigi Toscano
9de051fb20 Merge remote-tracking branch 'origin/Falkon/3.1' 2019-12-16 00:36:11 +01:00
Luigi Toscano
f1b7661b1f Update a few internal KDE URLs 
Use the generic redirect commits.kde.org insteaf of:
- projects.kde.org, which has been obsolete for a while;
- cgit.kde.org, which is not a future-proof URL anyway.
 2019-12-16 00:34:12 +01:00
Tobias C. Berner
3efda1bda4 Add Intl_LIBRARIES and Intl_INCLUDE_DIRS to FalkonPrivate 
Summary: See https://build.kde.org/view/OS%20-%20FreeBSD/job/Extragear/job/falkon/job/stable-kf5-qt5%20FreeBSDQt5.13/13/console

Reviewers: #freebsd, aacid, drosca

Reviewed By: drosca

Subscribers: falkon

Tags: #falkon

Differential Revision: https://phabricator.kde.org/D26007
 2019-12-14 22:46:52 +01:00
Albert Astals Cid
95790ce9e5 Merge remote-tracking branch 'origin/Falkon/3.1' 2019-12-14 00:32:31 +01:00
Albert Astals Cid
29f96b7504 Fix lupdate warnings 
Summary:
Class 'XXX' lacks Q_OBJECT macro

If you use tr() in a class it needs Q_OBJECT

Test Plan: It builds

Reviewers: drosca

Reviewed By: drosca

Subscribers: falkon

Tags: #falkon

Differential Revision: https://phabricator.kde.org/D25911
 2019-12-14 00:32:16 +01:00
l10n daemon script
c2b4350521 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"
 2019-12-03 05:37:17 +01:00
Laurent Montel
bbde5c6955 Add missing include in last qt5.14 2019-12-02 13:30:36 +01:00
Laurent Montel
f64811b77f convert setMargin 2019-11-27 21:25:21 +01:00
David Rosca
2d5bf8d45f
Merge branch 'Falkon/3.1' 2019-10-31 11:23:40 +01:00
David Rosca
bfb9420cbb
PyFalkon: Fix C linkage issues 
BUG: 413093
FIXED-IN: 3.1.1
 2019-10-31 10:37:24 +01:00
David Rosca
7b404e73a8
CookieManager: Add support for selecting more than one cookie at once 
Summary:
When manually cleaning cookies, it is very convenient to be able to delete
a bunch of them at once, when we do not want to delete all cookies.

Reviewers: #falkon, drosca

Reviewed By: #falkon, drosca

Subscribers: falkon

Tags: #falkon

Differential Revision: https://phabricator.kde.org/D24967
 2019-10-31 10:15:12 +01:00
Juraj Oravec
8f2cf86117
Set current tab as parent for duplicated tab 
Summary: BUG: 408518

Test Plan: Duplicate tab, the change is visible in TreeView of Vertical Tabs plugin.

Reviewers: #falkon, drosca

Reviewed By: #falkon, drosca

Subscribers: falkon, drosca

Tags: #falkon

Differential Revision: https://phabricator.kde.org/D24933
 2019-10-31 10:14:09 +01:00
l10n daemon script
1363b848a5 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"
 2019-09-30 08:39:50 +02:00
Laurent Montel
c772438470 GIT_SILENT: minor qstring optimization 2019-09-13 08:03:02 +02:00
l10n daemon script
74e55c59d3 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"
 2019-09-05 09:04:23 +02:00
l10n daemon script
8b4d2556a0 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"
 2019-08-31 08:46:56 +02:00
l10n daemon script
821b1c6f81 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"
 2019-08-30 09:20:27 +02:00
Christoph Cullmann
44e753fc9f Added QLoggingCategory to Falkon 
Summary:
Getting to know how the application works i needed a way to investigate some bits and pieces in the code. That's why I created the following patch.
Debug lines can be created with the following code:

`qCDebug(FALKON_PRIVATE_LOG) << "testing 123, testing";`

and debug lines can be activated with the runtime flag:

` QT_LOGGING_RULES="org.kde.falkon.debug=true"`

Reviewers: #falkon, drosca

Reviewed By: #falkon, drosca

Subscribers: cullmann, falkon

Tags: #falkon

Differential Revision: https://phabricator.kde.org/D21770
 2019-08-24 17:19:53 +02:00
l10n daemon script
1162a5cf20 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"
 2019-08-24 08:41:15 +02:00
l10n daemon script
220e609d47 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"
 2019-08-24 05:01:51 +02:00
l10n daemon script
6f1c729906 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"
 2019-08-13 05:19:36 +02:00
l10n daemon script
677380520c 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"
 2019-08-06 08:27:21 +02:00
l10n daemon script
310a2e2d2d 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"
 2019-08-06 04:49:17 +02:00
Pino Toscano
ae7fff8695 Merge remote-tracking branch 'origin/Falkon/3.1' 2019-06-30 11:29:30 +02:00
Pino Toscano
070bce531c i18n: use https for bugs.kde.org 2019-06-30 11:26:59 +02:00
l10n daemon script
c89de7f463 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"
 2019-06-24 05:03:22 +02:00
l10n daemon script
6ae5f0e9e5 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"
 2019-06-23 18:39:57 +02:00
l10n daemon script
3fdd1d95d3 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"
 2019-06-21 08:51:00 +02:00
l10n daemon script
483f5f70b5 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"
 2019-06-19 08:52:28 +02:00
l10n daemon script
d6c4cfeb74 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"
 2019-06-19 05:21:30 +02:00
Juraj Oravec
dfb3d2357d
Vertical Tabs: Add child tab with middle click on "New Tab" button 
Summary:
BUG: 393656

Reviewers: #falkon, drosca

Reviewed By: #falkon, drosca

Subscribers: drosca, falkon

Tags: #falkon

Differential Revision: https://phabricator.kde.org/D21664
 2019-06-10 12:07:26 +02:00
Juraj Oravec
493421dd84
RunAction: Fix string conversion from bytestring, correct codestyle 
Summary:
- Fix action execution when url wrongly converted to string as bytestring.
  This resulted in not working actions (loading b"b"url"")
- Make codestyle more pythonic
- Remove not required imports
- Configue dialog:
 - Set label weight to bold in QtDesigner (UI file)
 - Make listview scroll per pixel

Reviewers: #falkon, drosca

Reviewed By: #falkon, drosca

Subscribers: falkon

Tags: #falkon

Differential Revision: https://phabricator.kde.org/D21718
 2019-06-10 12:07:15 +02:00
David Rosca
4b85dab3d7
Vertical tabs: Draw unloaded tabs with "Disabled" color palette 
Summary: BUG: 405833

Reviewers: #falkon

Subscribers: falkon

Tags: #falkon

Differential Revision: https://phabricator.kde.org/D21548
 2019-06-03 17:42:42 +02:00
David Rosca
721d203366
Merge branch 'Falkon/3.1' 2019-06-01 10:28:17 +02:00
David Rosca
107e75b469
Hello Python: Remove semicolons from sidebar.py (E703) 
Reviewers: #falkon, cullmann

Reviewed By: #falkon, cullmann

Subscribers: cullmann, falkon

Tags: #falkon

Differential Revision: https://phabricator.kde.org/D21386
 2019-06-01 10:26:40 +02:00
l10n daemon script
44c85c7f65 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"
 2019-05-30 08:26:40 +02:00
l10n daemon script
2887d87ed5 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"
 2019-05-30 05:09:20 +02:00
l10n daemon script
cc248c72c8 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"
 2019-05-25 08:42:22 +02:00
David Rosca
3075477492
IconProvider: Add mutex around icon cache 
BUG: 406972
FIXED-IN: 3.1.1
 2019-05-24 21:47:20 +02:00
David Rosca
2098d69ad1
PyFalkon: Fix build with clang 
BUG: 407734
FIXED-IN: 3.2.0
 2019-05-20 15:21:09 +02:00
David Rosca
fb09c266a7
VerticalTabs: Corectly recognize tree collapse / expand button 
Summary:
In treeview when the tab has no children the collapse / expand button
is not visible but the control logic still thought that is is.
By clicking on place where this button normaly is nothing happens
and user has to click again somewhere else to change the selected tab.

Test Plan:
In treeview mode check the function of collapse / expand button when visible and invisible.

  - Visible: Expand / collapse the tree
  - Not visible: Select tab

Reviewers: #falkon, drosca

Reviewed By: #falkon, drosca

Subscribers: falkon

Tags: #falkon

Differential Revision: https://phabricator.kde.org/D21304
 2019-05-20 15:03:28 +02:00
David Rosca
bb8a3a799f
RunAction plugin: set alternatingRowColors for listWidget 
Summary:
Before:
{F6824266}
After:
{F6824265}

Reviewers: #falkon, drosca

Reviewed By: #falkon, drosca

Subscribers: falkon

Tags: #falkon

Differential Revision: https://phabricator.kde.org/D21227
 2019-05-20 15:03:11 +02:00
l10n daemon script
fbf7f956ff 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"
 2019-05-12 05:52:11 +02:00
l10n daemon script
8e57d0895c 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"
 2019-05-11 09:01:28 +02:00
Nicolas Fella
e3cca98e0d Fix name and set desktop entry for notifications 
Summary: With the Plasma notification rewrite the name passed with the notification is user-visible, so use "Falkon" instead of "falkon here". Also pass the desktop entry. This allows Plasma to embed the app icon in the notification

Test Plan:
Before:
{F6815655}
After:
{F6815657}

Reviewers: #falkon, drosca

Reviewed By: #falkon, drosca

Subscribers: kossebau, broulik, falkon

Tags: #falkon

Differential Revision: https://phabricator.kde.org/D21087
 2019-05-09 10:07:38 +02:00
l10n daemon script
8393f62ad4 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"
 2019-05-04 08:50:18 +02:00
l10n daemon script
5614a32d5c 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"
 2019-05-03 08:53:24 +02:00
l10n daemon script
3bc0c165af 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"
 2019-05-03 05:50:54 +02:00
l10n daemon script
0d5e79a8a9 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"
 2019-04-24 09:02:26 +02:00
l10n daemon script
d636dff966 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"
 2019-04-24 05:52:57 +02:00
l10n daemon script
05b63efb59 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"
 2019-04-23 09:11:22 +02:00
l10n daemon script
3bf1f80e85 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"
 2019-04-23 06:05:39 +02:00
David Rosca
ee4dbad676
Merge branch 'Falkon/3.1' 2019-04-22 09:50:50 +02:00
David Rosca
66d6e81e23
main: Remove backtrace handler 2019-04-22 09:46:39 +02:00
David Rosca
f38265230d
SideBarManager: Clear active sidebar upon close 
BUG: 406724
FIXED-IN: 3.1.1
 2019-04-21 11:21:29 +02:00
David Rosca
b9fb89a31c
Remove GnomeKeyringPasswords plugin 
Modern distributions no longer have the deprecated library in repos.
 2019-04-21 11:03:35 +02:00
David Rosca
9828237159
Plugins: Use embedded JSON metadata for shared library plugins 
It is no longer needed to load the library to retrieve metadata.
 2019-04-21 11:03:26 +02:00
David Rosca
92721449c0
VerticalTabs: Also override Ctrl+PgUp/PgDown shortcuts 2019-04-20 19:26:00 +02:00
David Rosca
dc3063fc63
Fix loading Python/QML extensions on startup 2019-04-20 16:54:06 +02:00
David Rosca
0b261874cb
Merge branch 'Falkon/3.1' 2019-04-20 16:15:29 +02:00
David Rosca
514097ef4c
BookmarksManager: Don't allow to create bookmark without parent 
BUG: 406433
FIXED-IN: 3.1.1
 2019-04-20 14:08:44 +02:00
David Rosca
3137cdfca2
Merge branch 'Falkon/3.1' 2019-04-20 12:10:35 +02:00
David Rosca
8e4328b03c
QmlUserScript: Automatically install/uninstall underlying script 2019-04-20 11:52:28 +02:00
David Rosca
a8d43ed0c8
QmlStaticData: Prevent deleting singletons by QML engine 2019-04-20 11:23:16 +02:00
David Rosca
231101151e
QmlPluginLoader: Fallback to main.qml as entrypoint if not set 2019-04-20 10:54:01 +02:00
David Rosca
10eb20c162
QmlExtensionScheme: Fix warning about QQmlParserStatus qobject_cast 2019-04-20 10:46:53 +02:00
David Rosca
8e5c478c90
Preferences: Add links to KDE store for installing themes/extensions 2019-04-20 10:23:30 +02:00
David Rosca
f792104be5
ThemeManager: Implement removing locally installed themes 2019-04-20 10:18:48 +02:00
David Rosca
b5988bbe1f
Merge branch 'Falkon/3.1' 2019-04-20 09:34:40 +02:00
David Rosca
eb4b68fdd9
MainApplication: Create private browsing QWebEngineProfile without parent 
Fixes crash on shutdown
 2019-04-20 09:33:44 +02:00
l10n daemon script
c5e1aab96a 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"
 2019-04-20 09:03:19 +02:00
l10n daemon script
e4299fb85c 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"
 2019-04-20 06:00:37 +02:00
David Rosca
d2d3d45932
Don't use subfolders for QML/Python extensions 2019-04-19 11:38:15 +02:00
David Rosca
ff9c70dccb
Fix build with QtWebEngine 5.9 2019-04-18 16:34:59 +02:00
David Rosca
5e6f92f7bc
OcsSupport: Add initial support for downloading themes/extensions 2019-04-18 16:25:27 +02:00
David Rosca
13449605eb
QmlPlugin: Change entrypoint to always be main.qml 2019-04-18 11:52:44 +02:00
David Rosca
7a562a4847
Plugins: Implement removing locally installed plugins 2019-04-18 11:52:25 +02:00
David Rosca
a3e320fb47
KWalletPasswordBackend: Add overrides 2019-04-18 10:54:22 +02:00
David Rosca
e44ba37063
Merge branch 'Falkon/3.1' 2019-04-18 10:24:47 +02:00
David Rosca
232eaa54bd
KDEFrameworksIntegration: Create Purpose menu in init 2019-04-17 16:28:45 +02:00
Saish Mhatre
e66835b4bf
Added focus for searchbar in history sidebar & bookmark sidebar 
Summary:
After Adding Focus , user can directly search after pressing ctrl+h in history sidebar
& ctrl+shift+b in bookmark sidebar
BUG: 393948

Reviewers: #falkon, drosca

Reviewed By: #falkon, drosca

Subscribers: SGOrava, falkon, #falkon

Tags: #falkon

Differential Revision: https://phabricator.kde.org/D20022
 2019-04-10 17:11:47 +02:00
l10n daemon script
6e98af2f1c 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"
 2019-04-10 09:15:23 +02:00
l10n daemon script
61f3cd89a1 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"
 2019-04-08 08:42:31 +02:00
l10n daemon script
ae495bcc60 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"
 2019-04-08 05:48:04 +02:00
l10n daemon script
bde26dc861 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"
 2019-04-06 05:57:30 +02:00
David Rosca
cb30ecb994
Merge branch 'Falkon/3.1' 2019-04-05 20:40:15 +02:00
l10n daemon script
f322c4ed94 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"
 2019-04-04 09:01:22 +02:00
l10n daemon script
4c2b453573 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"
 2019-04-02 09:00:21 +02:00
l10n daemon script
95661276c5 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"
 2019-04-01 08:54:43 +02:00
Anmol Gautam
3150def9fc added pause/resume for downloads 
Summary: Added button to pause/resume download from the download manager

Reviewers: drosca

Reviewed By: drosca

Subscribers: falkon

Tags: #falkon

Differential Revision: https://phabricator.kde.org/D20037
 2019-03-31 18:03:39 +05:30
l10n daemon script
2a7176946b 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"
 2019-03-31 09:30:03 +02:00
l10n daemon script
739f0d20d6 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"
 2019-03-28 08:45:05 +01:00
David Rosca
479933e095
PyFalkon: Fix build with Qt 5.12.2 
BUG: 405833
FIXED-IN: 3.1.1
 2019-03-25 11:38:27 +01:00
l10n daemon script
2743002b2d 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"
 2019-03-25 08:53:45 +01:00
l10n daemon script
dc140a7053 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"
 2019-03-24 08:25:04 +01:00
l10n daemon script
f712500b2c 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"
 2019-03-23 09:02:28 +01:00
l10n daemon script
1f1978751f 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"
 2019-03-23 06:07:37 +01:00
David Rosca
63aa4028a4
SearchToolBar: Remove warning message that no results were found 2019-03-22 14:01:20 +01:00
l10n daemon script
d729117adb 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"
 2019-03-22 08:32:02 +01:00
l10n daemon script
c3dce2aa80 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"
 2019-03-21 08:45:27 +01:00
David Rosca
067155d53a
NetworkManager: Fix QtWebEngine warning about registering schemes 2019-03-20 12:01:01 +01:00
David Rosca
797e4c12a2
QML Plugins: Fix exporting i18n functions 2019-03-20 11:53:31 +01:00
David Rosca
2c5314ce93
Fix MSVC build 2019-03-20 11:11:36 +01:00
David Rosca
2853a1ee88
Version 3.1.0 2019-03-19 18:01:52 +01:00
Carl Schwan
9601e8ad34
Use a searchbar similar to the one in okular 
Summary: {F6674717}

Reviewers: #falkon, #vdg, drosca

Reviewed By: #falkon, drosca

Subscribers: drosca, loh.tar, SGOrava, falkon

Tags: #falkon

Differential Revision: https://phabricator.kde.org/D19625
 2019-03-14 13:56:40 +01:00
David Rosca
945b4f7626
BookmarksIcon: Re-check bookmark when page url changes 
BUG: 402239
FIXED-In: 3.1.0
 2019-03-14 11:34:21 +01:00
David Rosca
1a81c0c821
Add ProtocolHandlerDialog 
It is now possible to remove previously registered protocol handlers.
 2019-03-14 11:14:25 +01:00
Anmol Gautam
a154ef5480 fix context menu on falkon:speeddial 
Summary: Function addSpeedDial and others are not in scope so they didn't worked when called via javascript. So, I have removed the anonymous function which is wrapping those functions.

Reviewers: drosca

Reviewed By: drosca

Subscribers: falkon

Tags: #falkon

Differential Revision: https://phabricator.kde.org/D19564
 2019-03-06 21:40:39 +05:30
David Rosca
b87ccf714c
Fix all override warnings 2019-03-01 17:08:50 +01:00
David Rosca
66857748c2
Remove old pagescreen.ui 2019-03-01 16:44:30 +01:00
David Rosca
e4252d56ef
Add some missing overrides 2019-03-01 16:42:50 +01:00
David Rosca
bf9b7667f7
Fix build with QtWebEngine < 5.11 2019-03-01 16:26:16 +01:00
David Rosca
3f4dd627be
UserAgentDialog: Disable word wrap in table widget 
BUG: 404885
FIXED-IN: 3.1.0
 2019-03-01 16:16:16 +01:00
Laurent Montel
ec8217035f Remove deprecated method 2019-03-01 08:49:55 +01:00
David Rosca
102bd219b7
QtSingleApplication: Add DBus backend for Linux 
It should be more reliable than lockfile.

BUG: 404494
FIXED-IN: 3.1.0
 2019-02-19 11:13:11 +01:00
l10n daemon script
1553ab3c1b 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"
 2019-02-16 05:37:34 +01:00
David Rosca
eac5673656
Register custom schemes with QtWebEngine 5.12 2019-02-14 08:53:27 +01:00
David Rosca
b508ed2260
WebHitTestResult: Expect null href attribute 
Patch by Eugene Shalygin

BUG: 404320
 2019-02-14 08:44:42 +01:00
l10n daemon script
8ffd2f20df 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"
 2019-02-13 05:51:49 +01:00