1
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-11 09:32:12 +01:00
Commit Graph

5822 Commits

Author SHA1 Message Date
l10n daemon script
a8a9a5d7e5 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"
2022-06-16 01:51:51 +00:00
l10n daemon script
684d4cd1d2 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"
2022-06-13 02:25:21 +00:00
l10n daemon script
a976f194e3 GIT_SILENT made messages (after extraction) 2022-06-13 01:00:20 +00:00
l10n daemon script
de0229a3de 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"
2022-06-07 02:11:41 +00:00
Heiko Becker
39ed7cc61f GIT_SILENT Update Appstream for new release
(cherry picked from commit 90e579d882)
2022-06-04 11:05:39 +02:00
l10n daemon script
988f12ece9 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"
2022-05-28 02:12:38 +00:00
l10n daemon script
ae8955b12d GIT_SILENT made messages (after extraction) 2022-05-28 00:54:23 +00:00
l10n daemon script
fd60ff3e4b 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"
2022-05-15 01:52:42 +00:00
Laurent Montel
18971d364e Use ref here 2022-05-12 08:22:11 +02:00
Heiko Becker
e8369584bb GIT_SILENT Update Appstream for new release
(cherry picked from commit f2147a2bb3)
2022-05-07 12:15:41 +02:00
l10n daemon script
f40b707e58 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"
2022-05-03 01:48:40 +00:00
l10n daemon script
437ba0be77 GIT_SILENT made messages (after extraction) 2022-05-03 00:43:34 +00:00
l10n daemon script
eaeff714d6 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"
2022-04-22 01:44:19 +00:00
l10n daemon script
2becc00be8 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"
2022-04-19 01:44:15 +00:00
l10n daemon script
be9f4a933f 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"
2022-04-17 01:46:49 +00:00
Heiko Becker
b460ab0ae7 GIT_SILENT Update Appstream for new release
(cherry picked from commit 7220a0a544)
2022-04-13 00:09:12 +02:00
9085681bb3
QML: Fix enum documentation doxygen comments 2022-04-08 22:12:21 +02:00
1b0e728e02
QML: Fix documentation links for window/s
Signed-off-by: Juraj Oravec <jurajoravec@mailo.com>
2022-04-06 23:30:40 +02:00
l10n daemon script
c750820f7c 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"
2022-04-04 01:46:02 +00:00
3038d1acd5
Add Doxygen overview of QML API
Signed-off-by: Juraj Oravec <jurajoravec@mailo.com>
2022-04-03 12:04:58 +02:00
5a5f983644 SiteInfo: Don't load previews at multiselect
BUG: 451284

It looks like the signal currentItemChanged is fired before the
selectedItems is updated which makes this protection after the second
change of current selection.

This is at minimum good enough when selecting items via arrow keys.

Signed-off-by: Juraj Oravec <jurajoravec@mailo.com>
2022-04-02 15:44:33 +00:00
d0ee2f0f37 SiteInfo: Improve ability to copy data from lists
BUG: 451284

Signed-off-by: Juraj Oravec <jurajoravec@mailo.com>
2022-04-02 15:44:33 +00:00
l10n daemon script
4a549b035f 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"
2022-04-01 01:57:47 +00:00
l10n daemon script
478861094a GIT_SILENT made messages (after extraction) 2022-03-29 00:49:03 +00:00
l10n daemon script
8edcd52593 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"
2022-03-23 02:03:16 +00:00
Antonio Rojas
02feca74ce Enable WebRTC screen capturer in WebEngine
This is disabled by default, and without it screen sharing doesn't work on Wayland
Port of https://invent.kde.org/network/konqueror/-/merge_requests/113

BUG: 450839
2022-03-20 14:08:23 +01:00
l10n daemon script
e9e1d32339 GIT_SILENT made messages (after extraction) 2022-03-20 00:48:28 +00:00
Albert Astals Cid
7fc9473052 Merge remote-tracking branch 'origin/release/22.04' 2022-03-13 01:34:10 +01:00
Albert Astals Cid
c8e55d18d1 CI: Add FreeBSD 2022-03-13 01:29:14 +01:00
Albert Astals Cid
7bd1bf3acb Merge remote-tracking branch 'origin/release/22.04' 2022-03-13 01:28:45 +01:00
Albert Astals Cid
1d72d30084 CI: Add Linux CI 2022-03-13 01:20:40 +01:00
Albert Astals Cid
22e65c3b8c Remove arcconfig file
We're not using phabricator anymore
2022-03-13 01:17:26 +01:00
Snehit Sah
4c8f6e0570
Remove screenshot dimensions from appdata
Refer https://github.com/flathub/org.kde.falkon/pull/3#issuecomment-1064018275

Signed-off-by: Snehit Sah <snehitsah@protonmail.com>
2022-03-12 20:36:40 +05:30
Albert Astals Cid
4a497c15d8 GIT_SILENT Upgrade release service version to 22.07.70. 2022-03-12 13:29:23 +01:00
Albert Astals Cid
fc95ac108f GIT_SILENT Upgrade release service version to 22.03.80. 2022-03-12 12:50:54 +01:00
l10n daemon script
17f27d6186 GIT_SILENT made messages (after extraction) 2022-03-11 00:45:07 +00:00
l10n daemon script
3ef3fd6ad0 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"
2022-03-05 01:43:20 +00:00
l10n daemon script
703c30c7fd GIT_SILENT made messages (after extraction) 2022-03-05 00:43:38 +00:00
l10n daemon script
da11721956 GIT_SILENT made messages (after extraction) 2022-02-27 00:46:22 +00:00
Jonathan Esk-Riddell
e232844f4b use version number of kde gear 2022-02-14 12:29:56 +00:00
Jonathan Esk-Riddell
14171e2995 use version number of kde gear 2022-02-14 12:29:31 +00:00
Allan Sandfeld Jensen
00f5d78aef Fix clearing generichide rules 2022-02-01 12:04:02 +01:00
Allan Sandfeld Jensen
1413aba338 Clean nullptr usage 2022-02-01 12:03:39 +01:00
Allan Sandfeld Jensen
b0b89339f3 Implement generichide and enable elemhide 2022-01-31 16:56:51 +00:00
Allan Sandfeld Jensen
8080d3b70b Parse but ignore unsupported adblock patterns 2022-01-31 16:56:51 +00:00
Allan Sandfeld Jensen
e6450ba8f9 Fix exception type matching
Fixes matching of type if more than one exception type is listed.
2022-01-31 16:56:51 +00:00
Jonathan Esk-Riddell
832b40027c new release 3.2.0 2022-01-31 13:55:47 +00:00
Jonathan Riddell
ca76e3fe47 Merge branch 'Falkon/3.2' 2022-01-31 12:15:13 +00:00
Jonathan Riddell
7381c02279 release 2022-01-31 12:15:09 +00:00
Snehit Sah
00d1c25ea8
Add release and content rating appdata tags
Signed-off-by: Snehit Sah <snehitsah@protonmail.com>
2022-01-19 16:29:23 +05:30