┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src/settings/kcm
AgeCommit message (Collapse)Author
2015-07-26SVN_SILENT made messages (.desktop file) - always resolve oursl10n 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-24SVN_SILENT made messages (.desktop file) - always resolve oursl10n 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-16SVN_SILENT made messages (.desktop file) - always resolve oursl10n 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-04SVN_SILENT made messages (.desktop file) - always resolve oursl10n 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-31SVN_SILENT made messages (.desktop file) - always resolve oursl10n 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-13SVN_SILENT made messages (.desktop file) - always resolve oursl10n 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-05SVN_SILENT made messages (.desktop file) - always resolve oursl10n 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-04SVN_SILENT made messages (.desktop file) - always resolve oursl10n 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-26SVN_SILENT made messages (.desktop file) - always resolve oursl10n 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-24SVN_SILENT made messages (.desktop file) - always resolve oursl10n 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-04SVN_SILENT made messages (.desktop file) - always resolve oursl10n 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-15SVN_SILENT made messages (.desktop file) - always resolve oursl10n 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-12SVN_SILENT made messages (.desktop file)l10n daemon script
2015-03-11SVN_SILENT made messages (.desktop file)l10n daemon script
2015-03-10SVN_SILENT made messages (.desktop file)l10n daemon script
2015-03-09SVN_SILENT made messages (.desktop file)l10n daemon script
2015-03-08SVN_SILENT made messages (.desktop file)l10n daemon script
2015-03-07SVN_SILENT made messages (.desktop file)l10n daemon script
2015-03-06SVN_SILENT made messages (.desktop file)l10n daemon script
2015-02-24Port away from KLocaleEmmanuel Pescosta
2015-02-19Merge branch 'master' into frameworksEmmanuel Pescosta
2015-02-06kdelibs4support--Montel Laurent
2015-02-05SVN_SILENT made messages (.desktop file)l10n daemon script
2015-02-03Ported 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-25SVN_SILENT made messages (.desktop file)l10n daemon script
2015-01-23SVN_SILENT made messages (.desktop file)l10n daemon script
2014-12-26SVN_SILENT made messages (.desktop file)l10n daemon script
2014-12-25SVN_SILENT made messages (.desktop file)l10n daemon script
2014-12-14port from KTabWidget to QTabWidgetEmmanuel Pescosta
2014-11-03Q_DECL_OVERRIDELukáš Tinkl
2014-10-18Fix includesMontel Laurent
2014-10-18Fix includesMontel Laurent
2014-10-16Merge remote-tracking branch 'origin/master' into frameworksFrank Reininghaus
Conflicts: dolphin/src/main.cpp kdepasswd/kcm/kcm_useraccount.desktop plasma/applets/folderview/folderview.cpp
2014-10-12SVN_SILENT made messages (.desktop file)l10n daemon script
2014-10-07kdelibs4support--Montel Laurent
2014-09-12Ported KIcon to QIconEmmanuel Pescosta
REVIEW: 120159
2014-08-03Merge branch 'master' into frameworksLuca Beltrame
Conflicts: dolphin/src/panels/places/placesitemmodel.cpp kdepasswd/kcm/CMakeLists.txt [deleted in frameworks] kdepasswd/kcm/main.cpp [deleted in frameworks]
2014-08-03SVN_SILENT made messages (.desktop file)l10n daemon script
2014-07-31s/kcmshell4/kcmshell5Lukáš Tinkl
2014-07-25SVN_SILENT made messages (.desktop file)l10n daemon script
2014-07-24SVN_SILENT made messages (.desktop file)l10n daemon script
2014-07-16Merge branch 'master' into frameworksLuca Beltrame
Conflicts: kdepasswd/kcm/kcm_useraccount.desktop [deleted in frameworks branch] plasma/applets/folderview/plasma-applet-folderview.desktop [deleted in frameworks branch]
2014-07-16SVN_SILENT made messages (.desktop file)l10n daemon script
2014-06-12Merge remote-tracking branch 'origin/master' into frameworksFrank Reininghaus
Conflicts: dolphin/src/dolphincontextmenu.cpp dolphin/src/panels/folders/treeviewcontextmenu.cpp
2014-06-09SVN_SILENT made messages (.desktop file)l10n daemon script
2014-05-13Merge remote-tracking branch 'origin/master' into frameworksFrank 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-05dolphin: convert statusbar, settings and search to qt5 signals/slot syntaxAlex Richardson
2014-05-05Allow compiling Dolphin with KF5Alex 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-27SVN_SILENT made messages (.desktop file)l10n daemon script
2014-01-22SVN_SILENT made messages (.desktop file)l10n daemon script