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

5773 Commits

Author SHA1 Message Date
l10n daemon script
43402272aa 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-07-12 02:56:15 +00:00
l10n daemon script
8b8c342a2f 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-07-04 02:50:28 +00:00
l10n daemon script
d0d552d634 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-07-03 03:28:02 +00:00
l10n daemon script
a57094bfc1 GIT_SILENT made messages (after extraction) 2022-07-03 02:29:54 +00:00
Heiko Becker
57d6bd4f2f GIT_SILENT Update Appstream for new release 2022-07-01 21:27:59 +02:00
Heiko Becker
1595d619bf GIT_SILENT Upgrade release service version to 22.04.3. 2022-07-01 20:36:26 +02:00
l10n daemon script
95925d513d 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-07-01 03:02:54 +00:00
l10n daemon script
3171fe323e 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 03:02:12 +00:00
l10n daemon script
0e484be8e8 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 04:13:55 +00:00
l10n daemon script
094325cda4 GIT_SILENT made messages (after extraction) 2022-06-13 03:22:17 +00:00
l10n daemon script
a466b89d88 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 03:48:22 +00:00
Heiko Becker
90e579d882 GIT_SILENT Update Appstream for new release 2022-06-04 11:05:28 +02:00
Heiko Becker
a7c8de1055 GIT_SILENT Upgrade release service version to 22.04.2. 2022-06-03 22:45:20 +02:00
l10n daemon script
cc32e3ac66 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 03:52:40 +00:00
l10n daemon script
8791d0adca GIT_SILENT made messages (after extraction) 2022-05-28 03:04:17 +00:00
l10n daemon script
f0147c285f 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 03:10:18 +00:00
Heiko Becker
f2147a2bb3 GIT_SILENT Update Appstream for new release 2022-05-07 12:15:30 +02:00
Heiko Becker
e69c85646f GIT_SILENT Upgrade release service version to 22.04.1. 2022-05-07 11:19:52 +02:00
l10n daemon script
3b7402b0c1 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 02:52:56 +00:00
l10n daemon script
e9c0a423b6 GIT_SILENT made messages (after extraction) 2022-05-03 02:14:22 +00:00
l10n daemon script
5b03766dc0 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 02:53:54 +00:00
l10n daemon script
c1cd23993c 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-18 02:43:43 +00:00
l10n daemon script
f453cc458a 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 02:59:00 +00:00
Heiko Becker
7220a0a544 GIT_SILENT Update Appstream for new release 2022-04-13 00:09:03 +02:00
Heiko Becker
a0f7cc738a GIT_SILENT Upgrade release service version to 22.04.0. 2022-04-12 23:13:01 +02:00
Heiko Becker
c2bb08c4ec GIT_SILENT Upgrade release service version to 22.03.90. 2022-04-05 21:48:26 +02:00
l10n daemon script
c87514a175 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-03 03:08:07 +00:00
l10n daemon script
4e31e7d3e5 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 03:19:46 +00:00
l10n daemon script
c32c20bea3 GIT_SILENT made messages (after extraction) 2022-03-29 02:53:51 +00:00
l10n daemon script
440f015283 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 03:29:15 +00:00
Antonio Rojas
1ef7a6547a 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
(cherry picked from commit 02feca74ce)
2022-03-21 22:38:30 +01:00
l10n daemon script
bd5a42fba2 GIT_SILENT made messages (after extraction) 2022-03-20 02:44:55 +00:00
Albert Astals Cid
c8e55d18d1 CI: Add FreeBSD 2022-03-13 01:29:14 +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
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