Tag: Branch: Tree: fb47508554

wilder

wilder-5.14

wilder-5.17

wilder-5.18

wilder-5.19

wilder-5.22

wilder-5.24

wilder-5.25

wilder-5.26

wilder-5.26-rebase

wilder-broken-krunner

wilder-portage

wilder-portage-prov

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from 'fb47508554'

${ noResults }

Commit Graph

221 Commits (fb47508554ed9149bfc0964261a121aa1344ab14)

Author	SHA1	Message	Date
l10n daemon script	faad339db5	SVN_SILENT made messages (.desktop file) - always resolve ours ... 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"	5 years ago
l10n daemon script	96355cd03a	SVN_SILENT made messages (.desktop file) - always resolve ours ... 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"	5 years ago
Alexander Lohnau	3d03606302	Use kcoreaddons_add_plugin to allow loading plugins from build dir ... Task: https://phabricator.kde.org/T14528	5 years ago
Nicolas Fella	178a4f8756	Use version-less qt DBus macros ... They work with both Qt5 and Qt6	5 years ago
Alexander Lohnau	46c784099d	Embed JSON metadata in KIOSlaves ... Task: https://phabricator.kde.org/T14518	5 years ago
Alexander Lohnau	e900f43b62	Remove old .protocol files	5 years ago
Alexander Lohnau	42efaf445f	Convert protocol files to JSON ... This was done using the protocoltojson utility from KIO. Task: https://phabricator.kde.org/T14518	5 years ago
David Edmundson	4d83c159da	Make KIOslave test more robust ... KCoreDirLister is backed by a 200ms timer which means it can have stale results.	5 years ago
l10n daemon script	9f02b43f3f	SVN_SILENT made messages (.desktop file) - always resolve ours ... 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"	5 years ago
l10n daemon script	7fb5605b5d	SVN_SILENT made messages (.desktop file) - always resolve ours ... 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"	5 years ago
Nicolas Fella	44a55fdecd	Add some missing linkages ... Currently things work due to transitiveness, but we better not rely on that	5 years ago
Nicolas Fella	1a07220843	Use versionless Qt cmake target ... This makes it easier to build against both Qt5 and Qt6	5 years ago
Alexander Lohnau	823d2106ec	Run clang-format ... If you want git blame to ignore formatting revisions run: git config blame.ignoreRevsFile .git-blame-ignore-revs	5 years ago
Nicolas Fella	e6b9b04005	Remove unused includes	5 years ago
Nicolas Fella	7f5d8768c1	Expand enums to multiple lines ... Most of our enum declaratons are on multiple lines, but not all of them. Expand the remaining ones to be consistent	5 years ago
Ahmad Samir	68306ef15a	kio_desktop: Fix creating a new folder while at "desktop:" ... If you navigate to "desktop:" (without a / at the end) then create a new folder, you'll end up with "/home/user/DesktopNew Folder", that's because the path part of the url is empty. Change the code to always add / to the beginning of the path when needed. Drive-by change: silence a compiler warning about an unused parameter.	6 years ago
Ahmad Samir	84400c0788	kio_desktop: fix unit test ... Use QTRY_VERIFY instead of QTest::qWait(), the hardcoded delay doesn't seem to work anymore.	6 years ago
l10n daemon script	811d85cbd7	SVN_SILENT made messages (.desktop file) - always resolve ours ... 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"	6 years ago
l10n daemon script	59615cffaa	SVN_SILENT made messages (.desktop file) - always resolve ours ... 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"	6 years ago
l10n daemon script	2aecf659a6	SVN_SILENT made messages (.desktop file) - always resolve ours ... 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"	6 years ago
l10n daemon script	551f41f03f	SVN_SILENT made messages (.desktop file) - always resolve ours ... 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"	6 years ago
l10n daemon script	5f13bcabf9	SVN_SILENT made messages (.desktop file) - always resolve ours ... 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"	6 years ago
l10n daemon script	98397d7fd1	SVN_SILENT made messages (.desktop file) - always resolve ours ... 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"	6 years ago
l10n daemon script	8fda734647	SVN_SILENT made messages (.desktop file) - always resolve ours ... 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"	6 years ago
l10n daemon script	fe7320494b	SVN_SILENT made messages (.desktop file) - always resolve ours ... 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"	6 years ago
l10n daemon script	fd832ae350	SVN_SILENT made messages (.desktop file) - always resolve ours ... 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"	6 years ago
l10n daemon script	70ad54479f	SVN_SILENT made messages (.desktop file) - always resolve ours ... 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"	6 years ago
l10n daemon script	6236df5138	SVN_SILENT made messages (.desktop file) - always resolve ours ... 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"	6 years ago
l10n daemon script	f04038a367	SVN_SILENT made messages (.desktop file) - always resolve ours ... 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"	6 years ago
l10n daemon script	d0cb0bd49f	SVN_SILENT made messages (.desktop file) - always resolve ours ... 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"	6 years ago
l10n daemon script	b547a75572	SVN_SILENT made messages (.desktop file) - always resolve ours ... 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"	6 years ago
Ahmad Samir	ac70c89661	Remove redundant #include	6 years ago
Ahmad Samir	065ba96801	[kio_desktop] Implement SlaveBase::GetFileSystemFreeSpace ... This enables reporting the actual free space info for desktop:/ in e.g. the Dolphin status bar. BUG: 417851 FIXED-IN: 5.19.80	6 years ago
l10n daemon script	2caf4d0b95	SVN_SILENT made messages (.desktop file) - always resolve ours ... 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"	6 years ago
l10n daemon script	804782df2a	SVN_SILENT made messages (.desktop file) - always resolve ours ... 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"	6 years ago
l10n daemon script	d6821b3d2e	SVN_SILENT made messages (.desktop file) - always resolve ours ... 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"	6 years ago
David Edmundson	715be958ea	[kioslave/desktop] Attempt at making test more robust ... Summary: We have an unstable test. KCoreDirLister has a timer involved set to 200ms QTRY_VERIFY will fire when we have one change from the spy, but maybe not everything if we explicitly wait and process maybe it will improve things? It's a bit of a random shot-in the dark. Test Plan: Passes locally..but it always passed locally before Reviewers: #plasma, kmaterka Reviewed By: kmaterka Subscribers: kmaterka, plasma-devel Tags: #plasma Differential Revision: https://phabricator.kde.org/D28183	6 years ago
l10n daemon script	b52e271f39	SVN_SILENT made messages (.desktop file) - always resolve ours ... 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"	6 years ago
l10n daemon script	fd0acef6c2	SVN_SILENT made messages (.desktop file) - always resolve ours ... 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"	6 years ago
l10n daemon script	b83af07d0c	SVN_SILENT made messages (.desktop file) - always resolve ours ... 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"	6 years ago
l10n daemon script	db54291a8f	SVN_SILENT made messages (.desktop file) - always resolve ours ... 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"	6 years ago
David Faure	4d216b0a01	Add unittest for KIO fix for undoing trashing files from the desktop ... See KIO commit 994d9030d2e3f60 in KF 5.62 CCBUG: 391606	7 years ago
l10n daemon script	909f9145e7	SVN_SILENT made messages (.desktop file) - always resolve ours ... 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"	7 years ago
Shubham Jangra	a719f0a7f4	Fix typo	7 years ago
l10n daemon script	625883dec8	SVN_SILENT made messages (.desktop file) - always resolve ours ... 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"	7 years ago
l10n daemon script	de4197e6ee	SVN_SILENT made messages (.desktop file) - always resolve ours ... 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"	7 years ago
Laurent Montel	791fb706ed	GIT_SILENT: ignore some files	7 years ago
l10n daemon script	b46752be5b	SVN_SILENT made messages (.desktop file) - always resolve ours ... 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"	7 years ago
l10n daemon script	7fe7856b63	SVN_SILENT made messages (.desktop file) - always resolve ours ... 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"	7 years ago
l10n daemon script	592df93013	SVN_SILENT made messages (.desktop file) - always resolve ours ... 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"	7 years ago