Commits · 1b8a91ed7b4b6bc20a2da18ce8c13024c5e54b1d · PIM / KNotes

12 Dec, 2020 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 1b8a91ed
  Script Kiddy authored Dec 12, 2020
```
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"
```
  1b8a91ed
- GIT_SILENT made messages (after extraction) · 63bafcdf
  Script Kiddy authored Dec 12, 2020
  
  63bafcdf
08 Dec, 2020 1 commit
- operator+/- is disabled for QFlags in qt6 · fcb6580e
  Laurent Montel authored Dec 08, 2020
  
  fcb6580e
06 Dec, 2020 3 commits
- GIT_SILENT: use qt5.15 iso · 6d418e22
  Laurent Montel authored Dec 06, 2020
  
  6d418e22
- SVN_SILENT made messages (.desktop file) - always resolve ours · 3e0ddcfe
  Script Kiddy authored Dec 06, 2020
```
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"
```
  3e0ddcfe
- GIT_SILENT made messages (after extraction) · 4b7b8fca
  Script Kiddy authored Dec 06, 2020
  
  4b7b8fca
02 Dec, 2020 1 commit
- GIT_SILENT Update Appstream for new release · b6120601
  Christoph Feck authored Dec 02, 2020
```
(cherry picked from commit f1967a5d)
```
  b6120601
30 Nov, 2020 1 commit
- GIT_SILENT: remove unused includes · 3473bb1e
  Laurent Montel authored Nov 30, 2020
  
  3473bb1e
22 Nov, 2020 1 commit
- GIT_SILENT made messages (after extraction) · 7db7e480
  Script Kiddy authored Nov 22, 2020
  
  7db7e480
20 Nov, 2020 2 commits
- GIT_SILENT: time to increase version · d18ae2dd
  Laurent Montel authored Nov 20, 2020
  
  d18ae2dd
- GIT_SILENT: add clang11 · 81cf00e7
  Laurent Montel authored Nov 20, 2020
  
  81cf00e7
16 Nov, 2020 1 commit
- GIT_SILENT: Increase compile without deprecated method · 1c1d2179
  Laurent Montel authored Nov 16, 2020
  
  1c1d2179
15 Nov, 2020 1 commit
- GIT_SILENT: time to increase version · db825985
  Laurent Montel authored Nov 15, 2020
  
  db825985
12 Nov, 2020 2 commits
- Only on X11 for theses methods too · b4d6fb95
  Laurent Montel authored Nov 12, 2020
  
  b4d6fb95
- Don't show "show note in taskbar" on windows as it's not implemented · f3f8c8b4
  Laurent Montel authored Nov 12, 2020
  
  f3f8c8b4
08 Nov, 2020 9 commits
- GIT_SILENT: Branch is open · e52b763e
  Laurent Montel authored Nov 08, 2020
  
  e52b763e
- Merge remote-tracking branch 'origin/release/20.12' · 67216559
  Laurent Montel authored Nov 08, 2020
  
  67216559
- Fix build on windows · e1178c32
  Laurent Montel authored Nov 08, 2020
```
(cherry picked from commit 67f22524)
```
  e1178c32
- It's x11 specific · aec0df85
  Laurent Montel authored Nov 08, 2020
```
(cherry picked from commit 57a76c31)
```
  aec0df85
- It's already in lib · 0e470b8f
  Laurent Montel authored Nov 08, 2020
```
(cherry picked from commit 2a7f3fb7)
```
  0e470b8f
- Fix build on windows · 67f22524
  Laurent Montel authored Nov 08, 2020
  
  67f22524
- It's x11 specific · 57a76c31
  Laurent Montel authored Nov 08, 2020
  
  57a76c31
- It's already in lib · 2a7f3fb7
  Laurent Montel authored Nov 08, 2020
  
  2a7f3fb7
- GIT_SILENT: prepare 20.11.80 · f360fc1f
  Laurent Montel authored Nov 08, 2020
  
  f360fc1f
05 Nov, 2020 1 commit
- GIT_SILENT: prepare 20.11.80 · 886c8a23
  Laurent Montel authored Nov 05, 2020
  
  886c8a23
04 Nov, 2020 1 commit

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

Script Kiddy authored Nov 04, 2020

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"

074f4d18

02 Nov, 2020 1 commit
- Modernize code · 4619d693
  Laurent Montel authored Nov 02, 2020
  
  4619d693
31 Oct, 2020 1 commit
- GIT_SILENT Update Appstream for new release · 6b92034d
  Christoph Feck authored Oct 31, 2020
```
(cherry picked from commit 289ae550)
```
  6b92034d
28 Oct, 2020 1 commit
- GIT_SILENT: coding style · 7a1590ab
  Laurent Montel authored Oct 28, 2020
  
  7a1590ab
22 Oct, 2020 1 commit
- If include is define in .h remove it if it's defined in .cpp too (scripted) · dcd829ec
  Laurent Montel authored Oct 22, 2020
  
  dcd829ec
21 Oct, 2020 1 commit
- GIT_SILENT: time to increase version · 0d2f921a
  Laurent Montel authored Oct 21, 2020
  
  0d2f921a
16 Oct, 2020 1 commit
- Remove not implemented method · e293fc45
  Laurent Montel authored Oct 16, 2020
  
  e293fc45
10 Oct, 2020 3 commits
- GIT_SILENT: Time to increase version · 0f232258
  Laurent Montel authored Oct 10, 2020
  
  0f232258
- SVN_SILENT made messages (.desktop file) - always resolve ours · 611f0863
  Script Kiddy authored Oct 10, 2020
```
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"
```
  611f0863
- GIT_SILENT made messages (after extraction) · 0e0eec0c
  Script Kiddy authored Oct 10, 2020
  
  0e0eec0c
03 Oct, 2020 1 commit
- GIT_SILENT Update Appstream for new release · 6e908cfc
  Christoph Feck authored Oct 03, 2020
```
(cherry picked from commit ab652d04)
```
  6e908cfc
25 Sep, 2020 1 commit
- GIT_SILENT: coding style · f7f1632f
  Laurent Montel authored Sep 25, 2020
  
  f7f1632f
21 Sep, 2020 1 commit
- GIT_SILENT: compile without kf5.75 without deprecated method · 2f339941
  Laurent Montel authored Sep 21, 2020
  
  2f339941
13 Sep, 2020 1 commit
- Time to increase version · 417fc22b
  Laurent Montel authored Sep 13, 2020
  
  417fc22b
12 Sep, 2020 1 commit
- Remove reference to kdepim-apps-libs · f4f6a756
  Daniel Vrátil authored Sep 12, 2020
```
The dependency was never used.
```
  f4f6a756