Commits · f8cffc873138d5f5321ad24f3298dd3a8da1ed92 · PIM / Akregator

18 Apr, 2017 1 commit
- GIT_SILENT: we depend against qt5.7 now. Clean up · f8cffc87
  Laurent Montel authored Apr 18, 2017
  
  f8cffc87
14 Apr, 2017 6 commits
- Drop unneccessary dep on WindowSystem · 58ae6927
  Heiko Becker authored Apr 14, 2017
```
Reviewers: #kde_pim

Tags: #kde_pim

Differential Revision: https://phabricator.kde.org/D5450
```
  58ae6927
- GIT_SILENT: increase dependancies · 35a25b6c
  Laurent Montel authored Apr 14, 2017
  
  35a25b6c
- Merge remote-tracking branch 'origin/Applications/17.04' · 5b5e03ad
  Laurent Montel authored Apr 14, 2017
  
  5b5e03ad
- Don't complexify code for creating path · b41541e6
  Laurent Montel authored Apr 14, 2017
  
  b41541e6
- Merge remote-tracking branch 'origin/Applications/17.04' · 1a57289f
  Laurent Montel authored Apr 14, 2017
  
  1a57289f
- Fix Bug 378757 - Archive: Archive folder not created if missing, articles not saved · 63d7f88b
  Laurent Montel authored Apr 14, 2017
```
FIXED-IN: 5.5.1
BUG: 378757

Thanks for info in bug reports
```
  63d7f88b
13 Apr, 2017 5 commits
- Activate by default QT_NO_NARROWING_CONVERSIONS_IN_CONNECT · c93466ec
  Laurent Montel authored Apr 13, 2017
  
  c93466ec
- SVN_SILENT made messages (.desktop file) - always resolve ours · 7b516ce4
  Script Kiddy authored Apr 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"
```
  7b516ce4
- GIT_SILENT made messages (after extraction) · 2d33e043
  Script Kiddy authored Apr 13, 2017
  
  2d33e043
- SVN_SILENT made messages (.desktop file) - always resolve ours · 9cb4d158
  Script Kiddy authored Apr 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"
```
  9cb4d158
- GIT_SILENT made messages (after extraction) · 2937ff3a
  Script Kiddy authored Apr 13, 2017
  
  2937ff3a
12 Apr, 2017 3 commits
- Use nullptr · a9a3e06c
  Laurent Montel authored Apr 12, 2017
  
  a9a3e06c
- Don't use deprecated kpartgui · 30acbf31
  Laurent Montel authored Apr 12, 2017
  
  30acbf31
- GIT_SILENT: Prepare 5.5 · a3caf193
  Laurent Montel authored Apr 12, 2017
  
  a3caf193
09 Apr, 2017 3 commits
- Merge remote-tracking branch 'origin/Applications/17.04' · 63dad088
  Laurent Montel authored Apr 09, 2017
  
  63dad088
- Use nullptr · c31665c0
  Laurent Montel authored Apr 09, 2017
  
  c31665c0
- Use QFileInfo::exists() · 6dc4c17e
  Laurent Montel authored Apr 09, 2017
  
  6dc4c17e
08 Apr, 2017 1 commit
- GIT_SILENT: Prepare 5.5 · ab9cdc30
  Laurent Montel authored Apr 08, 2017
  
  ab9cdc30
31 Mar, 2017 2 commits
- Merge remote-tracking branch 'origin/Applications/17.04' · 7a2f1f0d
  Laurent Montel authored Mar 31, 2017
  
  7a2f1f0d
- Astyle kdelibs · 114f7b50
  Laurent Montel authored Mar 31, 2017
  
  114f7b50
26 Mar, 2017 3 commits
- GIT_SILENT: Prepare 5.5RC1 · 5adcb0a5
  Laurent Montel authored Mar 26, 2017
  
  5adcb0a5
- GIT_SILENT made messages (after extraction) · 8e1c7043
  Script Kiddy authored Mar 26, 2017
  
  8e1c7043
- GIT_SILENT made messages (after extraction) · effc94f0
  Script Kiddy authored Mar 26, 2017
  
  effc94f0
25 Mar, 2017 1 commit
- GIT_SILENT: Prepare 5.5RC1 · 1a46d877
  Laurent Montel authored Mar 25, 2017
  
  1a46d877
23 Mar, 2017 5 commits
- Use i18n · 7dcdd16c
  Laurent Montel authored Mar 23, 2017
  
  7dcdd16c
- Use i18n · c962d8e9
  Laurent Montel authored Mar 23, 2017
  
  c962d8e9
- SVN_SILENT made messages (.desktop file) - always resolve ours · f656f2e9
  Script Kiddy authored Mar 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"
```
  f656f2e9
- GIT_SILENT made messages (after extraction) · 2def0f3b
  Script Kiddy authored Mar 23, 2017
  
  2def0f3b
- SVN_SILENT made messages (.desktop file) - always resolve ours · 1436db3b
  Script Kiddy authored Mar 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"
```
  1436db3b
21 Mar, 2017 2 commits
- Merge remote-tracking branch 'origin/Applications/17.04' · 0a495033
  Laurent Montel authored Mar 21, 2017
  
  0a495033
- Add info about qt version · 9fa1097a
  Laurent Montel authored Mar 21, 2017
  
  9fa1097a
20 Mar, 2017 4 commits
- Merge remote-tracking branch 'origin/Applications/17.04' · 511d553c
  Laurent Montel authored Mar 20, 2017
  
  511d553c
- USe nullptr · f9bc8ff0
  Laurent Montel authored Mar 20, 2017
  
  f9bc8ff0
- GIT_SILENT: prepare next version · b5d1e131
  Laurent Montel authored Mar 20, 2017
  
  b5d1e131
- GIT_SILENT made messages (after extraction) · 2f6276d6
  Script Kiddy authored Mar 20, 2017
  
  2f6276d6
17 Mar, 2017 1 commit
- GIT_SILENT: Prepare 5.5 beta1 · 7ff4ff2e
  Laurent Montel authored Mar 17, 2017
  
  7ff4ff2e
16 Mar, 2017 1 commit
- Use qCWarning · ece32312
  Laurent Montel authored Mar 16, 2017
  
  ece32312
15 Mar, 2017 1 commit
- Use nullptr · 26995e33
  Laurent Montel authored Mar 15, 2017
  
  26995e33
14 Mar, 2017 1 commit
- GIT_SILENT: Prepare 5.5 beta1 · f87c96aa
  Laurent Montel authored Mar 14, 2017
  
  f87c96aa