Commits · master · PIM / KDE PIM Add-ons

24 Jan, 2022 4 commits
- Use upper case includes · 23c08bb2
  Laurent Montel authored Jan 24, 2022
  
  23c08bb2
- Fix includes · aa89d063
  Laurent Montel authored Jan 24, 2022
  
  aa89d063
- Fix install headers · 02be9526
  Laurent Montel authored Jan 24, 2022
  
  02be9526
- Prepare save/load info · 6e768942
  Laurent Montel authored Jan 24, 2022
  
  6e768942
23 Jan, 2022 2 commits
- GIT_SILENT: compile without deprecated methods · d9a568e7
  Laurent Montel authored Jan 23, 2022
  
  d9a568e7
- Fix includes · 56db22f7
  Laurent Montel authored Jan 23, 2022
  
  56db22f7
21 Jan, 2022 2 commits
- Fix edit rule support · 8e4335c0
  Laurent Montel authored Jan 21, 2022
  
  8e4335c0
- Continue to implement configure settings · 41e9886e
  Laurent Montel authored Jan 21, 2022
  
  41e9886e
20 Jan, 2022 3 commits
- Improve autotest · 3c9a06c3
  Laurent Montel authored Jan 20, 2022
  
  3c9a06c3
- Improve create rule dialog · fac9b818
  Laurent Montel authored Jan 20, 2022
  
  fac9b818
- install plugins in kf<version> · 03af80b3
  Laurent Montel authored Jan 20, 2022
  
  03af80b3
19 Jan, 2022 3 commits
- improve++ · 3a66bf1b
  Laurent Montel authored Jan 19, 2022
  
  3a66bf1b
- add/get info · 465cc8f7
  Laurent Montel authored Jan 19, 2022
  
  465cc8f7
- Add edit dialog · ac51d3e0
  Laurent Montel authored Jan 19, 2022
  
  ac51d3e0
18 Jan, 2022 6 commits
- Continue to implement config dialog · d72ceb31
  Laurent Montel authored Jan 18, 2022
  
  d72ceb31
- Continue to implement openurlwith configure dialog · 4013e343
  Laurent Montel authored Jan 18, 2022
  
  4013e343
- Fix build with GCC 12 (more standard attributes in middle of decl-specifiers) · ee41cef0
  Fabian Vogt authored Jan 18, 2022
```
"virtual Q_REQUIRED_RESULT foo bar()" -> "Q_REQUIRED_RESULT virtual foo bar()"
```
  ee41cef0
- Merge remote-tracking branch 'origin/release/21.12' · 8c6b124e
  Laurent Montel authored Jan 18, 2022
  
  8c6b124e
- Fix build with GCC 12 (standard attributes in middle of decl-specifiers) · e99d09fe
  Laurent Montel authored Jan 18, 2022
  
  e99d09fe
- SVN_SILENT made messages (.desktop file) - always resolve ours · e61cc55b
  Script Kiddy authored Jan 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"
```
  e61cc55b
17 Jan, 2022 4 commits
- fix cppcheck warning · 78204d74
  Laurent Montel authored Jan 17, 2022
  
  78204d74
- Add more autotest · 22145816
  Laurent Montel authored Jan 17, 2022
  
  22145816
- Prepare autotest · bb14ea2e
  Laurent Montel authored Jan 17, 2022
  
  bb14ea2e
- SVN_SILENT made messages (.desktop file) - always resolve ours · 8b5d6d54
  Script Kiddy authored Jan 17, 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"
```
  8b5d6d54
16 Jan, 2022 2 commits
- USe directly isOnline method · f52a224c
  Laurent Montel authored Jan 16, 2022
  
  f52a224c
- SVN_SILENT made messages (.desktop file) - always resolve ours · c93b0546
  Script Kiddy authored Jan 16, 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"
```
  c93b0546
15 Jan, 2022 1 commit

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

Script Kiddy authored Jan 15, 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"

b601c35b

14 Jan, 2022 3 commits
- Continue to implement create dialog · 587ff95d
  Laurent Montel authored Jan 14, 2022
  
  587ff95d
- Add layout · 792ab142
  Laurent Montel authored Jan 14, 2022
  
  792ab142
- SVN_SILENT made messages (.desktop file) - always resolve ours · dab9ff99
  Script Kiddy authored Jan 14, 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"
```
  dab9ff99
13 Jan, 2022 4 commits
- Start to implement create open with url info · 16f90fdc
  Laurent Montel authored Jan 13, 2022
  
  16f90fdc
- Add autotests · b1990237
  Laurent Montel authored Jan 13, 2022
  
  b1990237
- SVN_SILENT made messages (.desktop file) - always resolve ours · 21be248b
  Script Kiddy authored Jan 13, 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"
```
  21be248b
- SVN_SILENT made messages (.desktop file) - always resolve ours · 1a73af4a
  Script Kiddy authored Jan 13, 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"
```
  1a73af4a
12 Jan, 2022 4 commits
- Add autotest · 3f80d356
  Laurent Montel authored Jan 12, 2022
  
  3f80d356
- Continue to implement dialog · dca6caa2
  Laurent Montel authored Jan 12, 2022
  
  dca6caa2
- Add export symbol · 2489f798
  Laurent Montel authored Jan 12, 2022
  
  2489f798
- SVN_SILENT made messages (.desktop file) - always resolve ours · 530aad8b
  Script Kiddy authored Jan 12, 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"
```
  530aad8b
11 Jan, 2022 2 commits
- GIT_SILENT: we depend against kf5.90 · 8800af48
  Laurent Montel authored Jan 11, 2022
  
  8800af48
- Add more dialog · 6a45fdc8
  Laurent Montel authored Jan 11, 2022
  
  6a45fdc8