Commits · master · Unmaintained / KDE Base Apps

05 Nov, 2016 1 commit

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

Script Kiddy authored Nov 05, 2016

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"

c5bd2d66

04 Nov, 2016 1 commit

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

Script Kiddy authored Nov 04, 2016

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"

899bf017

03 Nov, 2016 2 commits
- Port KFontComboBox · ed6489fd
  Laurent Montel authored Nov 03, 2016
  
  ed6489fd
- Add separator · de08b3d1
  Laurent Montel authored Nov 03, 2016
  
  de08b3d1
02 Nov, 2016 9 commits
- Merge branch 'master' of git://anongit.kde.org/kde-baseapps · 27c3bc25
  Laurent Montel authored Nov 02, 2016
  
  27c3bc25
- Port KListWidget to QListWidget · 9b211fc1
  Laurent Montel authored Nov 02, 2016
  
  9b211fc1
- SVN_SILENT made messages (.desktop file) - always resolve ours · d3187fc3
  Script Kiddy authored Nov 02, 2016
```
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"
```
  d3187fc3
- Port KIntSpinBox · 71f4a208
  Laurent Montel authored Nov 02, 2016
  
  71f4a208
- Port KPushButton · 40a552e6
  Laurent Montel authored Nov 02, 2016
  
  40a552e6
- Port KVBox · 3cf31c62
  Laurent Montel authored Nov 02, 2016
  
  3cf31c62
- Port KVBox.h · 57be469a
  Laurent Montel authored Nov 02, 2016
  
  57be469a
- Fix assign shortcut · 26915576
  Laurent Montel authored Nov 02, 2016
  
  26915576
- kdelibs4support-- · 39e4cc39
  Laurent Montel authored Nov 02, 2016
  
  39e4cc39
01 Nov, 2016 6 commits
- use installed KSslInfoDialog rather than own copy · 12d2a6d6
  David Faure authored Nov 01, 2016
  
  12d2a6d6
- Also rename WebPage to WebEnginePage, to reduce confusion and avoid... · 6e1a4fc7
  David Faure authored Nov 01, 2016
```
Also rename WebPage to WebEnginePage, to reduce confusion and avoid conflicting with KWebkitPart's classes
```
  6e1a4fc7
- SVN_SILENT made messages (.desktop file) - always resolve ours · b19bc2ea
  Script Kiddy authored Nov 01, 2016
```
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"
```
  b19bc2ea
- Rename WebView to WebEngineView so this matches the Qt classname · f9cdc212
  David Faure authored Nov 01, 2016
```
(this way I don't end up in the WebView QML documentation in Qt assistant...)
```
  f9cdc212
- Repair context menu, this event filter was eating the event. · 74d20119
  David Faure authored Nov 01, 2016
```
CCMAIL: bvbfan@abv.bg
```
  74d20119
- Add Q_DECL_OVERRIDE where appropriate (thanks to gcc's -Wsuggest-override) · 713825a2
  David Faure authored Nov 01, 2016
  
  713825a2
31 Oct, 2016 14 commits
- Continue to port to kf5 · 1a9583d9
  Laurent Montel authored Oct 31, 2016
  
  1a9583d9
- Remove KDE/ prefix for include, otherwise it will search in · 560e29d3
  Laurent Montel authored Oct 31, 2016
```
kdelibs4support
```
  560e29d3
- Use the proper variable to install the appdata file · 6a527a04
  Luigi Toscano authored Oct 31, 2016
  
  6a527a04
- SVN_SILENT made messages (.desktop file) - always resolve ours · ef26339a
  Script Kiddy authored Oct 31, 2016
```
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"
```
  ef26339a
- in theory we should test that we got a texteditor part here, but not the most... · e353ea4c
  David Faure authored Oct 31, 2016
```
in theory we should test that we got a texteditor part here, but not the most pressing thing right now
```
  e353ea4c
- Fix wrong enum comparison, code didn't make sense · 1372e8c8
  David Faure authored Oct 31, 2016
  
  1372e8c8
- Fix switching web kpart for a local file (QUrl porting bug) · b4fe890e
  David Faure authored Oct 29, 2016
  
  b4fe890e
- Fix ifdef: WebBrowserTab existed before 5.7, only WebBrowserBackgroundTab didn't. · 2c562afb
  David Faure authored Oct 29, 2016
  
  2c562afb
- Port slotRequestFinished (now slotLoadFinished) a little bit more · 453ced27
  David Faure authored Oct 29, 2016
  
  453ced27
- Add Q_DECL_OVERRIDE · 95cdc5eb
  Laurent Montel authored Oct 31, 2016
  
  95cdc5eb
- Port to new connect api · 5bebf46d
  Laurent Montel authored Oct 31, 2016
  
  5bebf46d
- Port to QPushButton · 40e15811
  Laurent Montel authored Oct 31, 2016
  
  40e15811
- Remove not necessary kglobalsettings.h · faae3092
  Laurent Montel authored Oct 31, 2016
  
  faae3092
- Rename desktop name · 3b04a0a0
  Laurent Montel authored Oct 31, 2016
  
  3b04a0a0
30 Oct, 2016 7 commits
- Merge branch 'master' of git://anongit.kde.org/kde-baseapps · 7b6cd97c
  Laurent Montel authored Oct 30, 2016
  
  7b6cd97c
- Compile · aee5565f
  Laurent Montel authored Oct 30, 2016
  
  aee5565f
- SVN_SILENT made messages (.desktop file) - always resolve ours · bbbfcf10
  Script Kiddy authored Oct 30, 2016
```
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"
```
  bbbfcf10
- Port to QPushButton · b83d32f4
  Laurent Montel authored Oct 30, 2016
  
  b83d32f4
- Use QMenu · de1e46f1
  Laurent Montel authored Oct 30, 2016
  
  de1e46f1
- Use KLocalizedString · b05166f5
  Laurent Montel authored Oct 30, 2016
  
  b05166f5
- Add Q_DECL_OVERRIDE · b8f3cf73
  Laurent Montel authored Oct 30, 2016
  
  b8f3cf73