1
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 18:56:34 +01:00
Commit Graph

5387 Commits

Author SHA1 Message Date
Anmol Gautam
7f5f3a8bfc corrected windowId(s) for qml plugins 2018-06-03 18:24:03 +05:30
Anmol Gautam
a9a65be17a Added qml tabs api tests and improved qmll tabs api 2018-06-03 11:43:39 +05:30
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
Anmol Gautam
28f639a203 Added addTab to & changed return type to bool of Tabs API 2018-06-01 11:44:15 +05:30
Anmol Gautam
2a1a8395db Added Clipboard API tests 2018-05-31 21:57:40 +05:30
Anmol Gautam
7843707f3a Added search method in Tabs API 2018-05-31 21:43:47 +05:30
Anmol Gautam
a6f19f95f3 Merge remote-tracking branch 'origin' into anmolgautam 2018-05-31 15:11:01 +05:30
Anmol Gautam
7b52c25caa resolved pull conflict 2018-05-31 15:07:45 +05:30
Anmol Gautam
75a48ae325 Created Tabs API 2018-05-31 15:04:10 +05:30
Anmol Gautam
90b7bed8a2 Created Notifications & Clipboard APIs 2018-05-30 15:27:42 +05:30
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
Anmol Gautam
8e7dc4e103 improved code 2018-05-28 22:54:57 +05:30
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
Anmol Gautam
be46b0f84c added autotests for qml cookies api 2018-05-25 01:10:33 +05:30
Anmol Gautam
a729ccf7bf Created Cookies API 2018-05-24 22:50:27 +05:30
Anmol Gautam
59d1cc22f5 Merge remote-tracking branch 'origin' into anmolgautam 2018-05-23 20:34:55 +05:30
Anmol Gautam
2d6953df0d added autotests for qml history api 2018-05-23 20:33:54 +05:30
Anmol Gautam
6351c859cb changed parameter type of deleteUrl 2018-05-23 19:30:42 +05:30
Anmol Gautam
30c9322b76 Created History API 2018-05-23 00:32:49 +05:30
Anmol Gautam
50d0f97812 Added tests for TopSites API 2018-05-22 11:30:04 +05:30
Anmol Gautam
0d957b42c2 Created TopSites API 2018-05-22 11:04:26 +05:30
Anmol Gautam
b4aee2523c organised directory structure of qml api 2018-05-21 20:08:28 +05:30
Anmol Gautam
6a2bd18009 added autotests for qml bookmarks api 2018-05-21 16:47:26 +05:30
Anmol Gautam
1a0859527f Converted Q_INVOKABLE to Q_PROPERTY in QmlBookmarkTreeNode 2018-05-21 10:25:18 +05:30
David Rosca
52d4e3583b
Fix build 2018-05-20 10:19:38 +02:00
Anmol Gautam
a6373bd3c9 Added helloqml plugin 2018-05-19 22:43:30 +05:30
Anmol Gautam
4d4971630a Updated bookmarks plugins api 2018-05-19 22:20:12 +05:30
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
Anmol Gautam
5166f1c879 Created bookmarks api for qml extensions 2018-05-18 14:30:02 +05:30
Anmol Gautam
123e093c56 Merge branch 'master' of git://anongit.kde.org/falkon into anmolgautam 2018-05-16 23:49:15 +05:30
Anmol Gautam
f09238115f added permission to allow plugins in private mode 2018-05-16 23:46:24 +05:30
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
Anmol Gautam
9d9766dc13 make getter-setter private in QQmlPluginInterface 2018-05-16 01:41:01 +05:30
Anmol Gautam
f9ac0727c5 moved logic for QML plugins from Plugins to QmlPluginLoader 2018-05-15 20:16:47 +05:30
Anmol Gautam
30cc7a8b89 added support to load/unload QML plugins
Following methods are exposed to qml 1) init 2) unload 3) testPlugin. Also logic to load QML plugins is implemented.
2018-05-15 16:34:57 +05:30
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