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

6139 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
5ca5bc7384 GIT_SILENT made messages (after extraction) 2018-07-03 06:03:46 +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
1c6f5bd8e2 GIT_SILENT made messages (after extraction) 2018-07-03 03:23:47 +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
286f329109 GIT_SILENT made messages (after extraction) 2018-06-26 06:15:41 +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
086d572e25 GIT_SILENT made messages (after extraction) 2018-06-26 03:24:35 +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
8651321936 GIT_SILENT made messages (after extraction) 2018-06-17 06:14:42 +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
73123c72c2 GIT_SILENT made messages (after extraction) 2018-06-17 03:29:09 +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
62839a6d4e GIT_SILENT made messages (after extraction) 2018-06-13 06:24:24 +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
c252de4bdd GIT_SILENT made messages (after extraction) 2018-06-13 03:38:24 +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
Razi Alavizadeh
29fbbf5dc4 Windows: Warn user about needed hotfix 
BUG: 394905
FIXED-IN: 3.0.2
 2018-06-06 23:42:08 +04:30
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
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