Commits · master · System / KCron

20 Jun, 2022 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 3b764672

Script Kiddy authored Jun 20, 2022

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"

3b764672

09 Jun, 2022 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 73f6e5be

Script Kiddy authored Jun 09, 2022

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"

73f6e5be

07 Jun, 2022 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · b0257d80

Script Kiddy authored Jun 07, 2022

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"

b0257d80

02 Jun, 2022 1 commit
- Check is not necessary as we depend against new kf5 · 2ba816a0
  Laurent Montel authored Jun 02, 2022
  
  2ba816a0
15 May, 2022 1 commit
- We depend against qt5.15/kf5.92 · 46f18a26
  Laurent Montel authored May 15, 2022
  
  46f18a26
02 May, 2022 1 commit
- GIT_SILENT: Add test CI support · 0e3d8156
  Laurent Montel authored May 02, 2022
  
  0e3d8156
19 Apr, 2022 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 3ecc959a

Script Kiddy authored Apr 19, 2022

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"

3ecc959a

01 Apr, 2022 1 commit
- Use directly ECMDeprecationSettings · a2fead8a
  Laurent Montel authored Apr 01, 2022
  
  a2fead8a
20 Mar, 2022 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · ec9a7490
  Script Kiddy authored Mar 20, 2022
```
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"
```
  ec9a7490
- GIT_SILENT made messages (after extraction) · 5b4aa933
  Script Kiddy authored Mar 20, 2022
  
  5b4aa933
07 Mar, 2022 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 86f659d7

Script Kiddy authored Mar 07, 2022

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"

86f659d7

27 Feb, 2022 2 commits
- Write into crontab instead of replacing the file · e6f5e2d2
  Albert Astals Cid authored Feb 23, 2022
```
Keeps permissions, owners, etc.
```
  e6f5e2d2
- SVN_SILENT made messages (.desktop file) - always resolve ours · 3d66778a
  Script Kiddy authored Feb 27, 2022
```
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"
```
  3d66778a
26 Feb, 2022 1 commit
- Use new kauth includes · d6ed46f0
  Laurent Montel authored Feb 26, 2022
  
  d6ed46f0
23 Feb, 2022 1 commit
- This doesn't need Auth, AuthCore is enough · ec3346a5
  Albert Astals Cid authored Feb 24, 2022
  
  ec3346a5
18 Feb, 2022 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · a3b532aa

Script Kiddy authored Feb 18, 2022

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"

a3b532aa

15 Feb, 2022 2 commits
- Merge remote-tracking branch 'origin/release/21.12' · 976447e5
  Albert Astals Cid authored Feb 15, 2022
  
  976447e5
- Improve temporary file handling · ef4266e3
  Albert Astals Cid authored Feb 15, 2022
  
  ef4266e3
02 Feb, 2022 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 3cac2076

Script Kiddy authored Feb 02, 2022

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"

3cac2076

01 Feb, 2022 1 commit
- Merge remote-tracking branch 'origin/release/21.12' · 5ef55431
  Albert Astals Cid authored Feb 01, 2022
  
  5ef55431
31 Jan, 2022 1 commit
- KCronHelper: Return error when things don't work out · 2c04c9f6
  Albert Astals Cid authored Jan 31, 2022
  
  2c04c9f6
21 Jan, 2022 1 commit
- It compiles fine against qt6 · 1b2056b8
  Laurent Montel authored Jan 21, 2022
  
  1b2056b8
22 Dec, 2021 1 commit
- Make doctool as optional · c49b1dc9
  Laurent Montel authored Dec 22, 2021
  
  c49b1dc9
15 Dec, 2021 1 commit
- GIT_SILENT: it compiles fine without deprecated methods · 4c7fa3a5
  Laurent Montel authored Dec 15, 2021
  
  4c7fa3a5
06 Dec, 2021 2 commits

SVN_SILENT made messages (.desktop file) - always resolve ours · b3cffeef

Script Kiddy authored Dec 06, 2021

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"

b3cffeef

SVN_SILENT made messages (.desktop file) - always resolve ours · 7d33ce97

Script Kiddy authored Dec 06, 2021

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"

7d33ce97

30 Nov, 2021 2 commits

SVN_SILENT made messages (.desktop file) - always resolve ours · 57114daf

Script Kiddy authored Nov 30, 2021

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"

57114daf

SVN_SILENT made messages (.desktop file) - always resolve ours · 295ba730

Script Kiddy authored Nov 30, 2021

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"

295ba730

26 Nov, 2021 2 commits

SVN_SILENT made messages (.desktop file) - always resolve ours · 0ba8b873

Script Kiddy authored Nov 26, 2021

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"

0ba8b873

SVN_SILENT made messages (.desktop file) - always resolve ours · 81c0afcc

Script Kiddy authored Nov 26, 2021

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"

81c0afcc

24 Nov, 2021 1 commit
- GIT_SILENT: it compiles fine without deprecated methods · 0de4b9fd
  Laurent Montel authored Nov 24, 2021
  
  0de4b9fd
15 Nov, 2021 2 commits

SVN_SILENT made messages (.desktop file) - always resolve ours · 787774b1

Script Kiddy authored Nov 15, 2021

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"

787774b1

SVN_SILENT made messages (.desktop file) - always resolve ours · 4453e394

Script Kiddy authored Nov 15, 2021

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"

4453e394

13 Nov, 2021 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 9b10842d

Script Kiddy authored Nov 13, 2021

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"

9b10842d

12 Nov, 2021 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · d95b1094

Script Kiddy authored Nov 12, 2021

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"

d95b1094

02 Nov, 2021 1 commit
- Remove includes from .cpp/.h · 9ea3bef3
  Laurent Montel authored Nov 02, 2021
  
  9ea3bef3
01 Nov, 2021 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · e336f6a8

Script Kiddy authored Nov 01, 2021

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"

e336f6a8

31 Oct, 2021 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · b4ae6f4d

Script Kiddy authored Oct 31, 2021

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"

b4ae6f4d

29 Oct, 2021 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · fd3f1a16
  Script Kiddy authored Oct 29, 2021
```
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"
```
  fd3f1a16
- GIT_SILENT made messages (after extraction) · 45c40134
  Script Kiddy authored Oct 29, 2021
  
  45c40134