Commits · master · PIM / KNotes

24 Jan, 2021 1 commit

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

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

e7fef522

17 Jan, 2021 1 commit
- Use QTEST_GUILESS_MAIN · 5d5643ef
  Laurent Montel authored Jan 17, 2021
  
  5d5643ef
15 Jan, 2021 1 commit
- QString::split(..., Qt::SplitBehavior, ...) is already in Qt 5.14 · b100b296
  Laurent Montel authored Jan 15, 2021
  
  b100b296
14 Jan, 2021 1 commit
- GIT_SILENT: Remove extra ; · 16608065
  Laurent Montel authored Jan 14, 2021
  
  16608065
13 Jan, 2021 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 50068f97
  Script Kiddy authored Jan 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"
```
  50068f97
- GIT_SILENT made messages (after extraction) · 63a5d134
  Script Kiddy authored Jan 13, 2021
  
  63a5d134
12 Jan, 2021 2 commits
- GIT_SILENT: Increase compile without deprecated kf5 method · ebe13c50
  Laurent Montel authored Jan 12, 2021
  
  ebe13c50
- GIT_SILENT: add profile support · 487c52ad
  Laurent Montel authored Jan 12, 2021
  
  487c52ad
10 Jan, 2021 2 commits
- GIT_SILENT: add CMAKE_EXPORT_COMPILE_COMMANDS ON · e2626b08
  Laurent Montel authored Jan 10, 2021
  
  e2626b08
- GIT_SILENT: Time to increase version · 995a58b8
  Laurent Montel authored Jan 10, 2021
  
  995a58b8
08 Jan, 2021 7 commits
- Merge remote-tracking branch 'origin/release/20.12' · f6cf0103
  Laurent Montel authored Jan 08, 2021
  
  f6cf0103
- Clean up CMakeLists.txt (remove duplicate entries) · 641a3dcb
  Laurent Montel authored Jan 08, 2021
```
(cherry picked from commit bf89efae)
```
  641a3dcb
- Clean up CMakeLists.txt (remove duplicate entries) · bf89efae
  Laurent Montel authored Jan 08, 2021
  
  bf89efae
- Merge remote-tracking branch 'origin/release/20.12' · 77819379
  Laurent Montel authored Jan 08, 2021
  
  77819379
- Fix Bug 431126 - KNotes cannot be configured using the GUI · 7be8013b
  Laurent Montel authored Jan 08, 2021
```
BUG: 431126
(cherry picked from commit e9f67828)
```
  7be8013b
- Fix Bug 431126 - KNotes cannot be configured using the GUI · e9f67828
  Laurent Montel authored Jan 08, 2021
```
BUG: 431126
```
  e9f67828
- Add missing override · 7d31abff
  Laurent Montel authored Jan 08, 2021
  
  7d31abff
05 Jan, 2021 1 commit
- Remove not implemented method or unused signal · f7021747
  Laurent Montel authored Jan 05, 2021
  
  f7021747
04 Jan, 2021 1 commit
- GIT_SILENT: use new cmake-3.19.0 feature. cmake --preset=dev or other it will... · 341038ab
  Laurent Montel authored Jan 04, 2021
```
GIT_SILENT: use new cmake-3.19.0 feature. cmake --preset=dev or other it will provide correct cmake settings
```
  341038ab
02 Jan, 2021 2 commits
- GIT_SILENT Update Appstream for new release · eabb9614
  Christoph Feck authored Jan 02, 2021
  
  eabb9614
- GIT_SILENT Update Appstream for new release · 9ed866a0
  Christoph Feck authored Jan 02, 2021
```
(cherry picked from commit eabb9614)
```
  9ed866a0
01 Jan, 2021 1 commit
- GIT_SILENT: happy new year · 03ce20c7
  Laurent Montel authored Jan 01, 2021
  
  03ce20c7
30 Dec, 2020 3 commits
- GIT_SILENT: use FATAL_ERROR · d2aed421
  Laurent Montel authored Dec 30, 2020
  
  d2aed421
- SVN_SILENT made messages (.desktop file) - always resolve ours · 7c10314a
  Script Kiddy authored Dec 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"
```
  7c10314a
- SVN_SILENT made messages (.desktop file) - always resolve ours · c36f0a3d
  Script Kiddy authored Dec 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"
```
  c36f0a3d
27 Dec, 2020 2 commits
- Revert "It compiles fine without deprecated methods" Compile fine here · 20945bed
  Laurent Montel authored Dec 27, 2020
```
but not in CI wierd

This reverts commit 11bb1e0f.
```
  20945bed
- It compiles fine without deprecated methods · 11bb1e0f
  Laurent Montel authored Dec 27, 2020
  
  11bb1e0f
26 Dec, 2020 2 commits
- Fix typo · 394cfdec
  Luca Beltrame authored Dec 26, 2020
```
GIT_SILENT
```
  394cfdec
- Fix build with the newer signals to be introduced in KF 5.78 · ba6cd09f
  Luca Beltrame authored Dec 26, 2020
  
  ba6cd09f
21 Dec, 2020 1 commit
- Fix compile with cmake unity support · 6278fa72
  Laurent Montel authored Dec 21, 2020
  
  6278fa72
19 Dec, 2020 1 commit
- GIT_SILENT: time to increase qt version as kf5-5.77 will depend against it. · a5363487
  Laurent Montel authored Dec 19, 2020
  
  a5363487
18 Dec, 2020 1 commit
- GIT_SILENT: prepare 5.16.1 · d124586d
  Laurent Montel authored Dec 18, 2020
  
  d124586d
15 Dec, 2020 2 commits
- GIT_SILENT: Fix typo · 09c0991a
  Laurent Montel authored Dec 15, 2020
  
  09c0991a
- Allow to use UNITY build see... · dc7e80d1
  Laurent Montel authored Dec 15, 2020
```
Allow to use UNITY build see https://cmake.org/cmake/help/latest/prop_tgt/UNITY_BUILD.html (Reduce compile time. Need cmake 3.16.0)
```
  dc7e80d1
13 Dec, 2020 2 commits
- GIT_SILENT: increase version about compile without deprecated method · 6b9bd3c7
  Laurent Montel authored Dec 13, 2020
  
  6b9bd3c7
- GIT_SILENT: Time to create version. · 5b70c6c5
  Laurent Montel authored Dec 13, 2020
  
  5b70c6c5
12 Dec, 2020 4 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 819963b4
  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"
```
  819963b4
- GIT_SILENT made messages (after extraction) · 38da7333
  Script Kiddy authored Dec 12, 2020
  
  38da7333
- 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