Commits · dfd19f2c6518d8c07dde26ebc7fc580d9db19b1a · PIM / KDE PIM Add-ons

19 Feb, 2018 1 commit

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

Script Kiddy authored Feb 19, 2018

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"

dfd19f2c

18 Feb, 2018 1 commit

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

Script Kiddy authored Feb 18, 2018

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"

3903be52

17 Feb, 2018 1 commit
- GIT_SILENT: Increase version · df603227
  Laurent Montel authored Feb 17, 2018
  
  df603227
16 Feb, 2018 1 commit
- increase version · 7b16c35a
  Laurent Montel authored Feb 16, 2018
  
  7b16c35a
12 Feb, 2018 1 commit

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

Script Kiddy authored Feb 12, 2018

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"

28979321

11 Feb, 2018 1 commit
- Use override directly · e7a969fc
  Laurent Montel authored Feb 11, 2018
  
  e7a969fc
09 Feb, 2018 1 commit
- USe nullptr · 032c04e8
  Laurent Montel authored Feb 09, 2018
  
  032c04e8
08 Feb, 2018 2 commits
- Fix simplified macro which will add to 5.44. Allow to fix factory name in some plugin · cd4e3272
  Laurent Montel authored Feb 08, 2018
  
  cd4e3272
- SVN_SILENT made messages (.desktop file) - always resolve ours · 9551c416
  Script Kiddy authored Feb 08, 2018
```
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"
```
  9551c416
07 Feb, 2018 1 commit

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

Script Kiddy authored Feb 07, 2018

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"

4d29ea38

06 Feb, 2018 2 commits
- Disable it for the moment · 5224972c
  Laurent Montel authored Feb 06, 2018
  
  5224972c
- SVN_SILENT made messages (.desktop file) - always resolve ours · c610b6da
  Script Kiddy authored Feb 06, 2018
```
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"
```
  c610b6da
05 Feb, 2018 6 commits
- Fix use menu · 2e2f486f
  Laurent Montel authored Feb 05, 2018
  
  2e2f486f
- Implement method · 1083bc23
  Laurent Montel authored Feb 05, 2018
  
  1083bc23
- Remove comment · ab837aa1
  Laurent Montel authored Feb 05, 2018
  
  ab837aa1
- Use directly TemplateParser/TemplatesInsertCommandAction · 148269b9
  Laurent Montel authored Feb 05, 2018
  
  148269b9
- Add include · 24fb52e1
  Laurent Montel authored Feb 05, 2018
  
  24fb52e1
- Increase version · d58410fb
  Laurent Montel authored Feb 05, 2018
  
  d58410fb
03 Feb, 2018 2 commits
- Use QLatin1String · f6d51476
  Laurent Montel authored Feb 03, 2018
  
  f6d51476
- SVN_SILENT made messages (.desktop file) - always resolve ours · 27cec28f
  Script Kiddy authored Feb 03, 2018
```
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"
```
  27cec28f
02 Feb, 2018 6 commits
- Improve diagnostics when failing to parse JSON data · 930a0147
  Volker Krause authored Feb 02, 2018
  
  930a0147
- Add toolbar action · 05959a2e
  Laurent Montel authored Feb 02, 2018
  
  05959a2e
- Make it compile · 734602d3
  Laurent Montel authored Feb 02, 2018
  
  734602d3
- Add autotest · 6a1a5a47
  Laurent Montel authored Feb 02, 2018
  
  6a1a5a47
- Add interface file · 2aa76d39
  Laurent Montel authored Feb 02, 2018
  
  2aa76d39
- SVN_SILENT made messages (.desktop file) - always resolve ours · 7002cb1f
  Script Kiddy authored Feb 02, 2018
```
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"
```
  7002cb1f
01 Feb, 2018 5 commits
- Show ticket bar codes for flights too, not just train trips · d2ab076f
  Volker Krause authored Feb 01, 2018
  
  d2ab076f
- Support QR code ticket tokens · 6626383a
  Volker Krause authored Feb 01, 2018
  
  6626383a
- Handle Google's format for ticket tokens too, next to the schema.org one · 5e655e43
  Volker Krause authored Feb 01, 2018
  
  5e655e43
- Fix minor typo · 3d0fc18a
  Yuri Chornoivan authored Feb 01, 2018
  
  3d0fc18a
- SVN_SILENT made messages (.desktop file) - always resolve ours · 37b23acf
  Script Kiddy authored Feb 01, 2018
```
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"
```
  37b23acf
31 Jan, 2018 1 commit
- Start to implement "add template command" in composer · 1def5b92
  Laurent Montel authored Jan 31, 2018
  
  1def5b92
30 Jan, 2018 2 commits
- korganizer/plugins/CMakeLists.txt - disable lunarphases for now (too ugly) · 638772af
  Allen Winter authored Jan 30, 2018
  
  638772af
- Feature: A calendar plugin for lunar phases as agenda view decorations. · a678c6ba
  Allen Winter authored Jan 30, 2018
```
not the most beautiful, but functional
```
  a678c6ba
29 Jan, 2018 2 commits
- Use qputenv · 46e00d05
  Laurent Montel authored Jan 29, 2018
  
  46e00d05
- SVN_SILENT made messages (.desktop file) - always resolve ours · a8516a58
  Script Kiddy authored Jan 29, 2018
```
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"
```
  a8516a58
27 Jan, 2018 1 commit

Render ticket barcodes if present · e70e43e8

Volker Krause authored Jan 27, 2018

Requires a bit of refactoring in how we expose data to Grantlee. As that
can't easily do array or map lookups we need to interleave reservation and
state data already on the outside.

e70e43e8

26 Jan, 2018 1 commit
- Use QLatin1String · dbe08903
  Laurent Montel authored Jan 26, 2018
  
  dbe08903
23 Jan, 2018 2 commits
- GIT_SILENT: Time to increase version. Clean up · b2f5a6b0
  Laurent Montel authored Jan 23, 2018
  
  b2f5a6b0
- SVN_SILENT made messages (.desktop file) - always resolve ours · 07eaa3dd
  Script Kiddy authored Jan 23, 2018
```
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"
```
  07eaa3dd