| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2017-02-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" | |||
| 2016-12-20 | 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" | |||
| 2016-08-19 | 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" | |||
| 2016-06-10 | 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" | |||
| 2016-05-29 | 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" | |||
| 2016-05-16 | Don't use old (not existing) names in the documentation. | Andre Woebbeking | |
| 2016-04-22 | Fix exports and linkage, remove sources from tests which are already being ↵ | Andrius da Costa Ribas | |
| linked. REVIEW: 127709 | |||
| 2016-03-16 | [CLAZY] Fixed all level 1 and level 2 warnings with small exceptions | Artur Puzio | |
| REVIEW: 126771 | |||
| 2016-01-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" | |||
| 2016-01-14 | Merge branch 'Applications/15.12' | Frank Reininghaus | |
| 2016-01-10 | SVN_SILENT made messages (.desktop file) | l10n daemon script | |
| 2015-12-30 | SVN_SILENT made messages (.desktop file) | l10n daemon script | |
| 2015-12-30 | 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-12-07 | 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-11-30 | 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-11-16 | SVN_SILENT made messages (.desktop file) | l10n daemon script | |
| 2015-11-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-10-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-09-08 | 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-09-01 | Pedantic-- | Montel Laurent | |
| 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-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-25 | readded missing isVersioned check in VersionControlObserver::actions() | Emmanuel Pescosta | |
| 2015-02-25 | Move the KVersionControlPlugin2 interface from konqlib to Dolphin and remove ↵ | Emmanuel Pescosta | |
| the deprecated KVersionControlPlugin interface from konqlib REVIEW: 122687 | |||
| 2015-02-24 | Replace kDebug/kWarning by categorized logging (org.kde.dolphin) | Emmanuel Pescosta | |
| 2014-11-20 | Fix Exports. | Andrius da Costa Ribas | |
| REVIEW: 121078 | |||
| 2014-11-03 | Q_DECL_OVERRIDE | Lukáš Tinkl | |
| 2014-10-21 | address 2 more KUrl -> QUrl issues mentioned in rr#120688 | Lukáš Tinkl | |
| 2014-10-21 | port Dolphin from KUrl to QUrl | Lukáš Tinkl | |
| REVIEW: 120688 | |||
| 2014-10-18 | Fix includes | Montel Laurent | |
| 2014-10-18 | Fix includes | Montel Laurent | |
| 2014-10-15 | Replaced the ItemState structure with QPair<KFileItem, ↵ | Emmanuel Pescosta | |
| KVersionControlPlugin2::ItemVersion> | |||
| 2014-06-29 | Remove the automoc noise | Christophe Giboudeaux | |
| 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 | |||
 |
index : dolphin | |
| Patched KDE Dolphin with Pixel Scaling | Conway |
| summaryrefslogtreecommitdiff |