Commits · 099f812f3a175babc167955ebc7b513b8bbfa0fc · Utilities / KDebugSettings

25 Dec, 2017 1 commit
- Remove extra new line · 099f812f
  Laurent Montel authored Dec 25, 2017
  
  099f812f
24 Dec, 2017 2 commits
- improve text · ce5cd797
  Laurent Montel authored Dec 24, 2017
  
  ce5cd797
- Use richtext here · 31299424
  Laurent Montel authored Dec 24, 2017
  
  31299424
23 Dec, 2017 1 commit
- Add warning when we can open file · a2643834
  Laurent Montel authored Dec 23, 2017
  
  a2643834
22 Dec, 2017 8 commits
- Add debug method. Fix autotest · 47acb537
  Laurent Montel authored Dec 22, 2017
  
  47acb537
- Start to create autotest · 7ec9f02c
  Laurent Montel authored Dec 22, 2017
  
  7ec9f02c
- Use 5.38 here · 34eee4ff
  Laurent Montel authored Dec 22, 2017
  
  34eee4ff
- Merge remote-tracking branch 'origin/Applications/17.12' · 65a4a5b6
  Laurent Montel authored Dec 22, 2017
  
  65a4a5b6
- Fix save custom rules when value is false · e07c5b40
  Laurent Montel authored Dec 22, 2017
  
  e07c5b40
- Extract code for saving rules, so I can autotest it · 84f7830f
  Laurent Montel authored Dec 22, 2017
  
  84f7830f
- Add search line edit · a892a27e
  Laurent Montel authored Dec 22, 2017
  
  a892a27e
- Const'ify · 537946ce
  Laurent Montel authored Dec 22, 2017
  
  537946ce
18 Dec, 2017 4 commits
- Allow to delete several custom rules · 48936e24
  Laurent Montel authored Dec 18, 2017
  
  48936e24
- Fix enable/disable · c2b8774a
  Laurent Montel authored Dec 18, 2017
  
  c2b8774a
- Rename method as rules · eaed1295
  Laurent Montel authored Dec 18, 2017
  
  eaed1295
- Add parent · a1e19b26
  Laurent Montel authored Dec 18, 2017
  
  a1e19b26
13 Dec, 2017 2 commits

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

Script Kiddy authored Dec 13, 2017

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"

cf1e8186

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

Script Kiddy authored Dec 13, 2017

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"

35b3e1dd

04 Dec, 2017 3 commits
- GIT_SILENT Upgrade KDE Applications version to 17.12.0. · 0c9199a9
  Christoph Feck authored Dec 05, 2017
  
  0c9199a9
- SVN_SILENT made messages (.desktop file) - always resolve ours · cd571cdf
  Script Kiddy authored Dec 04, 2017
```
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"
```
  cd571cdf
- SVN_SILENT made messages (.desktop file) - always resolve ours · babe9d12
  Script Kiddy authored Dec 04, 2017
```
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"
```
  babe9d12
30 Nov, 2017 1 commit
- GIT_SILENT Upgrade KDE Applications version to 17.11.90. · dde17f31
  Christoph Feck authored Nov 30, 2017
  
  dde17f31
27 Nov, 2017 2 commits

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

Script Kiddy authored Nov 27, 2017

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"

009a6313

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

Script Kiddy authored Nov 27, 2017

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"

8aa8a220

20 Nov, 2017 1 commit

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

Script Kiddy authored Nov 20, 2017

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"

eec9e192

19 Nov, 2017 2 commits
- Merge branch 'Applications/17.12' · deb8f2c6
  David Faure authored Nov 19, 2017
  
  deb8f2c6
- Debug goes above Info. · 9ff8b038
  David Faure authored Nov 19, 2017
```
Info includes Warning and Critical,
Debug includes Info, Warning and Critical.
```
  9ff8b038
15 Nov, 2017 2 commits
- Merge remote-tracking branch 'origin/Applications/17.12' · e312ce08
  Albert Astals Cid authored Nov 15, 2017
  
  e312ce08
- Merge remote-tracking branch 'origin/Applications/17.08' into Applications/17.12 · 467ab7dd
  Albert Astals Cid authored Nov 15, 2017
```
David can you confirm that the missing category commit needs merging
both here and to master?

CCMAIL: faure@kde.org
```
  467ab7dd
13 Nov, 2017 2 commits
- GIT_SILENT Upgrade KDE Applications version to 18.03.70. · fd77280b
  Albert Astals Cid authored Nov 13, 2017
  
  fd77280b
- GIT_SILENT Upgrade KDE Applications version to 17.11.80. · 038db4ff
  Albert Astals Cid authored Nov 13, 2017
  
  038db4ff
05 Nov, 2017 1 commit
- GIT_SILENT Upgrade KDE Applications version to 17.08.3. · 287e8cd5
  Christoph Feck authored Nov 05, 2017
  
  287e8cd5
24 Oct, 2017 1 commit

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

Script Kiddy authored Oct 24, 2017

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"

1b43a91f

11 Oct, 2017 1 commit
- Don't repeat work of KAboutData::setupCommandLine(). · 7b18c79a
  Laurent Montel authored Oct 11, 2017
  
  7b18c79a
08 Oct, 2017 1 commit
- GIT_SILENT Upgrade KDE Applications version to 17.08.2. · ed552fc8
  Christoph Feck authored Oct 08, 2017
  
  ed552fc8
29 Sep, 2017 1 commit
- Add parent · 35cadeb8
  Laurent Montel authored Sep 29, 2017
  
  35cadeb8
23 Sep, 2017 1 commit

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

Script Kiddy authored Sep 23, 2017

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"

90a11d24

21 Sep, 2017 1 commit
- Move as private method · 921f33fd
  Laurent Montel authored Sep 21, 2017
  
  921f33fd
16 Sep, 2017 1 commit

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

Script Kiddy authored Sep 16, 2017

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"

6cc54006

15 Sep, 2017 1 commit
- add missing category · 2610eda6
  David Faure authored Sep 15, 2017
  
  2610eda6