Commits · master · Plasma Mobile / Kalk

16 May, 2022 1 commit
- GIT_SILENT Sync po/docbooks with svn · 021a2f77
  Script Kiddy authored May 16, 2022
  
  021a2f77
09 May, 2022 1 commit
- GIT_SILENT Sync po/docbooks with svn · 6fb5fc9d
  Script Kiddy authored May 09, 2022
  
  6fb5fc9d
27 Apr, 2022 1 commit
- GIT_SILENT Sync po/docbooks with svn · 2532152c
  Script Kiddy authored Apr 27, 2022
  
  2532152c
25 Apr, 2022 1 commit
- fix ',' input bug · 7c7627cc
  Han Young authored Apr 25, 2022
```
fix: #26
```
  7c7627cc
23 Apr, 2022 2 commits
- GIT_SILENT: add changelog entries for 22.04 · b82c8ee9
  Bhushan Shah authored Apr 23, 2022
  
  b82c8ee9
- GIT_SILENT: bump version to 22.04 · 528b8daf
  Bhushan Shah authored Apr 23, 2022
  
  528b8daf
22 Apr, 2022 1 commit
- GIT_SILENT Sync po/docbooks with svn · aa02c344
  Script Kiddy authored Apr 22, 2022
  
  aa02c344
20 Apr, 2022 1 commit
- GIT_SILENT made messages (after extraction) · 90724b0b
  Script Kiddy authored Apr 20, 2022
  
  90724b0b
19 Apr, 2022 2 commits
- GIT_SILENT Sync po/docbooks with svn · 4d8e1ae8
  Script Kiddy authored Apr 19, 2022
  
  4d8e1ae8
- GIT_SILENT made messages (after extraction) · cc3640a3
  Script Kiddy authored Apr 19, 2022
  
  cc3640a3
17 Apr, 2022 1 commit
- GIT_SILENT Sync po/docbooks with svn · b39a23ef
  Script Kiddy authored Apr 17, 2022
  
  b39a23ef
16 Apr, 2022 1 commit

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

Script Kiddy authored Apr 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"

cbb3113f

07 Apr, 2022 1 commit
- Add ki18n_install · 0fc8d088
  Tobias Fella authored Apr 07, 2022
  
  0fc8d088
30 Mar, 2022 3 commits
- add clang format · ab8e8a9f
  Han Young authored Mar 30, 2022
  
  ab8e8a9f
- check size before pop · cf79eec8
  Han Young authored Mar 30, 2022
  
  cf79eec8
- disallow double `-` or `+` · f205dedf
  Han Young authored Mar 30, 2022
  
  f205dedf
29 Mar, 2022 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 704b7d67
  Script Kiddy authored Mar 29, 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"
```
  704b7d67
- GIT_SILENT made messages (after extraction) · ea1dfef3
  Script Kiddy authored Mar 29, 2022
  
  ea1dfef3
27 Mar, 2022 1 commit

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

Script Kiddy authored Mar 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"

4a08991e

26 Mar, 2022 1 commit
- appdata: Remove duplicated metadata_license · d7f762a6
  Timothée Ravier authored Mar 26, 2022
  
  d7f762a6
08 Mar, 2022 1 commit

Don't use contextProperty to make KAboutData available on QML · 89afe566

Felipe Kinoshita authored Mar 08, 2022

Context properties always takes in a QVariant, which means that
whenever you access the property it is re-evaluated because in
between each access the property may be changed as
setContextProperty() can be used at any moment in time.

89afe566

07 Mar, 2022 1 commit

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

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"

ee1d51db

05 Mar, 2022 2 commits
- Add qtquickcompiler to speed up launch time · f14f1630
  Devin Lin authored Mar 05, 2022
  
  f14f1630
- SVN_SILENT made messages (.desktop file) - always resolve ours · 1689e6fc
  Script Kiddy authored Mar 05, 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"
```
  1689e6fc
02 Mar, 2022 1 commit
- Ensure there is fallback to kde theme if none is set · b5694d93
  Devin Lin authored Mar 02, 2022
  
  b5694d93
27 Feb, 2022 1 commit
- GIT_SILENT made messages (after extraction) · b332d5b3
  Script Kiddy authored Feb 27, 2022
  
  b332d5b3
21 Feb, 2022 1 commit

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

Script Kiddy authored Feb 21, 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"

6bed4294

20 Feb, 2022 1 commit

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

Script Kiddy authored Feb 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"

955d1403

16 Feb, 2022 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 9875334c
  Script Kiddy authored Feb 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"
```
  9875334c
- GIT_SILENT made messages (after extraction) · 086ba31d
  Script Kiddy authored Feb 16, 2022
  
  086ba31d
15 Feb, 2022 1 commit

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

Script Kiddy authored Feb 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"

c6980436

11 Feb, 2022 1 commit

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

Script Kiddy authored Feb 11, 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"

2c0cd79a

08 Feb, 2022 2 commits
- GIT_SILENT: fixup typo 22.02 · a2bf87c4
  Bhushan Shah authored Feb 08, 2022
  
  a2bf87c4
- GIT_SILENT: Update version and appstream data for 22.02 · a6ce7f46
  Bhushan Shah authored Feb 08, 2022
  
  a6ce7f46
03 Feb, 2022 1 commit

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

Script Kiddy authored Feb 03, 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"

2ad2340a

29 Jan, 2022 1 commit

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

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

fa02582b

27 Jan, 2022 1 commit

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

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

338519be

25 Jan, 2022 1 commit

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

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

4b1636cd

24 Jan, 2022 1 commit

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

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

877f014b

22 Jan, 2022 1 commit
- Update org.kde.kalk.desktop · e459d536
  Devin Lin authored Jan 22, 2022
  
  e459d536