| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2015-07-26 | SVN_SILENT made messages (.desktop file) - always resolve ours | l10n daemon script | |
| 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" | |||
| 2015-06-24 | SVN_SILENT made messages (.desktop file) - always resolve ours | l10n daemon script | |
| 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" | |||
| 2015-06-16 | SVN_SILENT made messages (.desktop file) - always resolve ours | l10n daemon script | |
| 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" | |||
| 2015-06-04 | SVN_SILENT made messages (.desktop file) - always resolve ours | l10n daemon script | |
| 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" | |||
| 2015-05-31 | SVN_SILENT made messages (.desktop file) - always resolve ours | l10n daemon script | |
| 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" | |||
| 2015-05-13 | SVN_SILENT made messages (.desktop file) - always resolve ours | l10n daemon script | |
| 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" | |||
| 2015-05-05 | SVN_SILENT made messages (.desktop file) - always resolve ours | l10n daemon script | |
| 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" | |||
| 2015-05-04 | SVN_SILENT made messages (.desktop file) - always resolve ours | l10n daemon script | |
| 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" | |||
| 2015-04-26 | SVN_SILENT made messages (.desktop file) - always resolve ours | l10n daemon script | |
| 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" | |||
| 2015-04-24 | SVN_SILENT made messages (.desktop file) - always resolve ours | l10n daemon script | |
| 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" | |||
| 2015-04-04 | SVN_SILENT made messages (.desktop file) - always resolve ours | l10n daemon script | |
| 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" | |||
| 2015-03-15 | SVN_SILENT made messages (.desktop file) - always resolve ours | l10n daemon script | |
| 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" | |||
| 2015-03-12 | SVN_SILENT made messages (.desktop file) | l10n daemon script | |
| 2015-03-11 | SVN_SILENT made messages (.desktop file) | l10n daemon script | |
| 2015-03-10 | SVN_SILENT made messages (.desktop file) | l10n daemon script | |
| 2015-03-09 | SVN_SILENT made messages (.desktop file) | l10n daemon script | |
| 2015-03-08 | SVN_SILENT made messages (.desktop file) | l10n daemon script | |
| 2015-03-07 | SVN_SILENT made messages (.desktop file) | l10n daemon script | |
| 2015-03-06 | SVN_SILENT made messages (.desktop file) | l10n daemon script | |
| 2015-02-24 | Port away from KLocale | Emmanuel Pescosta | |
| 2015-02-19 | Merge branch 'master' into frameworks | Emmanuel Pescosta | |
| 2015-02-06 | kdelibs4support-- | Montel Laurent | |
| 2015-02-05 | SVN_SILENT made messages (.desktop file) | l10n daemon script | |
| 2015-02-03 | Ported Dolphin from KDialog to QDialog and save/restoreDialogSize to ↵ | Emmanuel Pescosta | |
| KWindowConfig::save/restoreWindowSize with the help of the porting scripts. REVIEW: 122305 | |||
| 2015-01-25 | SVN_SILENT made messages (.desktop file) | l10n daemon script | |
| 2015-01-23 | SVN_SILENT made messages (.desktop file) | l10n daemon script | |
| 2014-12-26 | SVN_SILENT made messages (.desktop file) | l10n daemon script | |
| 2014-12-25 | SVN_SILENT made messages (.desktop file) | l10n daemon script | |
| 2014-12-14 | port from KTabWidget to QTabWidget | Emmanuel Pescosta | |
| 2014-11-03 | Q_DECL_OVERRIDE | Lukáš Tinkl | |
| 2014-10-18 | Fix includes | Montel Laurent | |
| 2014-10-18 | Fix includes | Montel Laurent | |
| 2014-10-16 | Merge remote-tracking branch 'origin/master' into frameworks | Frank Reininghaus | |
| Conflicts: dolphin/src/main.cpp kdepasswd/kcm/kcm_useraccount.desktop plasma/applets/folderview/folderview.cpp | |||
| 2014-10-12 | SVN_SILENT made messages (.desktop file) | l10n daemon script | |
| 2014-10-07 | kdelibs4support-- | Montel Laurent | |
| 2014-09-12 | Ported KIcon to QIcon | Emmanuel Pescosta | |
| REVIEW: 120159 | |||
| 2014-08-03 | Merge branch 'master' into frameworks | Luca Beltrame | |
| Conflicts: dolphin/src/panels/places/placesitemmodel.cpp kdepasswd/kcm/CMakeLists.txt [deleted in frameworks] kdepasswd/kcm/main.cpp [deleted in frameworks] | |||
| 2014-08-03 | SVN_SILENT made messages (.desktop file) | l10n daemon script | |
| 2014-07-31 | s/kcmshell4/kcmshell5 | Lukáš Tinkl | |
| 2014-07-25 | SVN_SILENT made messages (.desktop file) | l10n daemon script | |
| 2014-07-24 | SVN_SILENT made messages (.desktop file) | l10n daemon script | |
| 2014-07-16 | Merge branch 'master' into frameworks | Luca Beltrame | |
| Conflicts: kdepasswd/kcm/kcm_useraccount.desktop [deleted in frameworks branch] plasma/applets/folderview/plasma-applet-folderview.desktop [deleted in frameworks branch] | |||
| 2014-07-16 | SVN_SILENT made messages (.desktop file) | l10n daemon script | |
| 2014-06-12 | Merge remote-tracking branch 'origin/master' into frameworks | Frank Reininghaus | |
| Conflicts: dolphin/src/dolphincontextmenu.cpp dolphin/src/panels/folders/treeviewcontextmenu.cpp | |||
| 2014-06-09 | SVN_SILENT made messages (.desktop file) | l10n daemon script | |
| 2014-05-13 | Merge remote-tracking branch 'origin/master' into frameworks | Frank Reininghaus | |
| Since the master branch had never been merged into frameworks since the creation of the frameworks branch, I had to fix a couple of merge conflicts and make another change in order to make it build - I hope I did not get anything wrong. We should probably merge master into frameworks on a regular basis from now on. CCMAIL:[email protected] Conflicts: dolphin/src/dolphinmainwindow.cpp dolphin/src/search/dolphinfacetswidget.cpp dolphin/src/statusbar/dolphinstatusbar.cpp dolphin/src/views/dolphinview.cpp | |||
| 2014-05-05 | dolphin: convert statusbar, settings and search to qt5 signals/slot syntax | Alex Richardson | |
| 2014-05-05 | Allow compiling Dolphin with KF5 | Alex Richardson | |
| This does not work properly yet, there are probably quite a few bad signal/ slot connections due to KUrl -> QUrl. However dolphin starts without crashing. Accessibility is not ported since that changed quite a lot from Qt4 -> Qt5 and I have no idea how it is supposed to be used. This is the first commit for review 117395 | |||
| 2014-02-27 | SVN_SILENT made messages (.desktop file) | l10n daemon script | |
| 2014-01-22 | SVN_SILENT made messages (.desktop file) | l10n daemon script | |
