Commits · master · PIM / KNotes

02 Aug, 2020 1 commit
- GIT_SILENT: Compile fine against 5.72 · d9c6a913
  Laurent Montel authored Aug 02, 2020
  
  d9c6a913
01 Aug, 2020 2 commits
- Merge remote-tracking branch 'origin/release/20.08' · 8aa56ee6
  Luigi Toscano authored Aug 01, 2020
  
  8aa56ee6
- appdata: more general doc URL · 7c7b8358
  Luigi Toscano authored Aug 01, 2020
```
Use the reference URL for the documentation.
```
  7c7b8358
30 Jul, 2020 4 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 942fc479
  Script Kiddy authored Jul 30, 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"
```
  942fc479
- GIT_SILENT made messages (after extraction) · 3dcc4b0d
  Script Kiddy authored Jul 30, 2020
  
  3dcc4b0d
- SVN_SILENT made messages (.desktop file) - always resolve ours · 474bf926
  Script Kiddy authored Jul 30, 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"
```
  474bf926
- GIT_SILENT made messages (after extraction) · 0ed091bc
  Script Kiddy authored Jul 30, 2020
  
  0ed091bc
27 Jul, 2020 2 commits
- Define AKONADI_SEARCH_VERSION · 5a573f82
  Laurent Montel authored Jul 27, 2020
  
  5a573f82
- GIT_SILENT: time to increase version · d227bea2
  Laurent Montel authored Jul 27, 2020
  
  d227bea2
23 Jul, 2020 4 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 4d600547
  Script Kiddy authored Jul 23, 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"
```
  4d600547
- GIT_SILENT made messages (after extraction) · ca625696
  Script Kiddy authored Jul 23, 2020
  
  ca625696
- SVN_SILENT made messages (.desktop file) - always resolve ours · 5b36f1c0
  Script Kiddy authored Jul 23, 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"
```
  5b36f1c0
- GIT_SILENT made messages (after extraction) · 6954ddf0
  Script Kiddy authored Jul 23, 2020
  
  6954ddf0
22 Jul, 2020 1 commit
- GIT_SILENT: prepare 5.15rc · fa17dcaf
  Laurent Montel authored Jul 22, 2020
  
  fa17dcaf
20 Jul, 2020 1 commit
- GIT_SILENT: prepare 5.15.0 RC · b6aba629
  Laurent Montel authored Jul 20, 2020
  
  b6aba629
13 Jul, 2020 3 commits
- Merge remote-tracking branch 'origin/release/20.08' · fdcedcc0
  Laurent Montel authored Jul 13, 2020
  
  fdcedcc0
- Not necessary to remove margin here · e8d8b45e
  Laurent Montel authored Jul 13, 2020
  
  e8d8b45e
- GIT_SILENT: increase dependancy · 337c5a34
  Laurent Montel authored Jul 13, 2020
  
  337c5a34
12 Jul, 2020 1 commit
- GIT_SILENT: branch is opened · a4d03945
  Laurent Montel authored Jul 12, 2020
  
  a4d03945
10 Jul, 2020 2 commits
- GIT_SILENT: Prepare 5.15 beta1 · 601ce0d7
  Laurent Montel authored Jul 10, 2020
  
  601ce0d7
- Fix layout · 896b207b
  Laurent Montel authored Jul 10, 2020
  
  896b207b
09 Jul, 2020 1 commit
- GIT_SILENT: now that kparts was fixed we can increase KF_DISABLE_DEPRECATED_BEFORE_AND_AT · a8f776d2
  Laurent Montel authored Jul 09, 2020
  
  a8f776d2
08 Jul, 2020 2 commits
- Revert "GIT_SILENT: It compiles fine against kf5.72 without deprecated methods" · d9b39ee6
  Laurent Montel authored Jul 08, 2020
```
kparts is broken I provided a patch for it not accepted yet
This reverts commit 58e789c9.
```
  d9b39ee6
- GIT_SILENT: It compiles fine against kf5.72 without deprecated methods · 58e789c9
  Laurent Montel authored Jul 08, 2020
  
  58e789c9
07 Jul, 2020 1 commit
- GIT_SILENT: prepare 5.15 beta1 · e1c683cb
  Laurent Montel authored Jul 07, 2020
  
  e1c683cb
06 Jul, 2020 2 commits
- Merge remote-tracking branch 'origin/release/20.04' · b722d3ed
  Laurent Montel authored Jul 06, 2020
  
  b722d3ed
- Remove duplicate margin · cd6decc5
  Laurent Montel authored Jul 06, 2020
  
  cd6decc5
03 Jul, 2020 2 commits
- GIT_SILENT Update Appstream for new release · 69983abe
  Christoph Feck authored Jul 03, 2020
```
(cherry picked from commit ebfa05f5)
```
  69983abe
- GIT_SILENT Update Appstream for new release · ebfa05f5
  Christoph Feck authored Jul 03, 2020
  
  ebfa05f5
19 Jun, 2020 1 commit
- GIT_SILENT: use CMAKE_CXX_STANDARD_REQUIRED · 8929c9c6
  Laurent Montel authored Jun 19, 2020
  
  8929c9c6
18 Jun, 2020 4 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 59d2c490
  Script Kiddy authored Jun 18, 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"
```
  59d2c490
- GIT_SILENT made messages (after extraction) · 1d6b3cc4
  Script Kiddy authored Jun 18, 2020
  
  1d6b3cc4
- SVN_SILENT made messages (.desktop file) - always resolve ours · af320348
  Script Kiddy authored Jun 18, 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"
```
  af320348
- GIT_SILENT made messages (after extraction) · d40f0da1
  Script Kiddy authored Jun 18, 2020
  
  d40f0da1
17 Jun, 2020 5 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 8b48d29e
  Script Kiddy authored Jun 17, 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"
```
  8b48d29e
- GIT_SILENT made messages (after extraction) · c6295535
  Script Kiddy authored Jun 17, 2020
  
  c6295535
- SVN_SILENT made messages (.desktop file) - always resolve ours · ba89e438
  Script Kiddy authored Jun 17, 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"
```
  ba89e438
- GIT_SILENT made messages (after extraction) · db3f279c
  Script Kiddy authored Jun 17, 2020
  
  db3f279c
- GIT_SILENT: remove git check · c09ca2e7
  Laurent Montel authored Jun 17, 2020
  
  c09ca2e7
16 Jun, 2020 1 commit
- Remove not necessary Libkdepim · 8a38329f
  Laurent Montel authored Jun 16, 2020
  
  8a38329f