Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-11 09:32:12 +01:00
Code Releases Activity
5,307 Commits 24 Branches 54 Tags 50 MiB
0c30443e84
Commit Graph

5307 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
1d03b5d44b 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-19 08:02:14 +02:00
l10n daemon script
45658dc521 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-19 06:05:46 +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
3760a9ffd1
AppImage: Bundle KWindowSystem plugins 2018-05-09 18:11:57 +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
68ff092b4c
Update AppImage build Dockerfile 2018-05-07 13:33:52 +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
dd8d8b9007
Add Dockerfile for building AppImage 2018-05-01 22:59:49 +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
19e2c4ed76 GIT_SILENT made messages (after extraction) 2018-04-27 06:14:01 +02:00
l10n daemon script
e36d092c08 GIT_SILENT made messages (after extraction) 2018-04-27 03:32:10 +02:00
Razi Alavizadeh
33172fcdbe QzToolsTest: Close the opened test file before trying to remove it 2018-04-26 13:50:05 +04:30
l10n daemon script
dd60458d6a SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2018-04-24 05:25:10 +02:00
l10n daemon script
5043a7675d SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2018-04-23 07:16:55 +02:00
David Rosca
a5ba6df966
Merge branch 'Falkon/3.0' 2018-04-22 18:55:29 +02:00
David Rosca
ad2466f2fa
WebView: Fix finding correct rwhvqt 
Focus proxy is actually set only after adding it to the layout, so without
the timer it would pick old rwhvqt.

BUG: 393398
 2018-04-22 18:53:49 +02:00