David Rosca
9a03f197ca
PyFalkon: Fix generating bindings for signals
...
Regression from 1c4a8ddd6f
2019-01-26 16:12:53 +01:00
l10n daemon script
8bcaefe351
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-01-25 05:33:00 +01:00
David Rosca
0389da311c
Fix leaking QWebEngineUrlRequestJob reply
...
BUG: 403129
FIXED-IN: 3.1.0
2019-01-23 17:41:20 +01:00
David Rosca
1c4a8ddd6f
PyFalkon: Fix build with PySide 5.12
...
BUG: 402947
FIXED-IN: 3.1.0
2019-01-23 15:55:29 +01:00
l10n daemon script
caf1380774
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-01-21 05:18:24 +01:00
Anmol Gautam
da53d20287
fixed settings spelling in gm_manager
...
Reviewers: drosca
Reviewed By: drosca
Subscribers: SGOrava, falkon
Tags: #falkon
Differential Revision: https://phabricator.kde.org/D18327
2019-01-18 00:03:16 +05:30
Laurent Montel
4c9d503699
Const'ify
2019-01-11 07:40:51 +01:00
Laurent Montel
4de3e4c703
Fix some clazy warnings
2019-01-08 13:28:02 +01:00
l10n daemon script
2528ed2163
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-01-06 05:29:16 +01:00
Nicolas Fella
51323c62e3
Fix build
...
Summary: BUG: 402401
Test Plan: Builds
Reviewers: drosca
Reviewed By: drosca
Subscribers: falkon
Tags: #falkon
Differential Revision: https://phabricator.kde.org/D17811
2018-12-31 16:27:41 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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