Tag: Branch: Tree: c2bd76acc9

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 'c2bd76acc9'

${ noResults }

Commit Graph

163 Commits (c2bd76acc9c8d64a3c0201a4eba88bc1cbc44d2f)

Author	SHA1	Message	Date
l10n daemon script	2141988c3b	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"	4 years ago
l10n daemon script	6721c2ec92	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"	4 years ago
Cyril Rossi	e66349f795	Plasmashell : add dialog to manage containments when in edit mode ... An UI to manage Screen assignment of Containments, the main use case is to recover lost or inactive panels from a display that you can no longer access. qml part: https://invent.kde.org/plasma/plasma-desktop/-/merge_requests/618 related to https://phabricator.kde.org/T14346 CCBUG: 447044 Access the dialog from Toolbar in Edit Mode (Manage containments)   To show the dialog, simply enter in `edit mode`, then you can : * See known displays and their panels and desktops, the dialog automatically update when adding/moving/removing a panel. * Delete a panel or a desktop * Recover a panel by moving it to an active display (click on move icon, then select the proper action in drop menu) * Recover a desktop by moving it to an active display, in fact, this will swap it with th targeted desktop * Modifications are automatically applied What I've tested: * Adding a panel, adding some applet on it. Then disabling its display, open the dialog and move it to an active display, restarting session, the panel is here with its applet. * On another display, add applets (sticky note) on the desktop. Disable this display, open the dialog and move it to an active display, restart session, both desktop were swapped and you see the background (if different) and sticky note available.	4 years ago
l10n daemon script	482dc8a0e3	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"	4 years ago
l10n daemon script	0d0b713076	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"	4 years ago
l10n daemon script	96915c3248	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"	4 years ago
l10n daemon script	5259ac39ab	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"	4 years ago
l10n daemon script	594b933a1e	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"	4 years ago
l10n daemon script	5a792e989f	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"	4 years ago
Alexander Lohnau	ff19a1c343	Remove unneeded ServiceType definitions in json metadata ... We already do the filtering based on the plugin namespace and no longer through the SevriceTyoes.	4 years ago
l10n daemon script	7ebe49f96f	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"	4 years ago
Aleix Pol	5291c77465	SystemDialog: Move the different implementations into a LnF file ... This way a LookAndFeel package can override the dialog and trim it to its needs.	4 years ago
l10n daemon script	41e9c0e65f	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"	4 years ago
l10n daemon script	b64be79def	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"	4 years ago
l10n daemon script	07e7431c2a	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"	4 years ago
l10n daemon script	c7689f5349	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"	4 years ago
l10n daemon script	36cadc2c69	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"	4 years ago
Alexander Lohnau	e1856783c3	Remove now unneeded desktop files ... Also the install code for some plugins that are already ported to json metadata	4 years ago
Alexander Lohnau	6d3b831cdb	Remove now unneeded desktop to json conversion code	4 years ago
Alexander Lohnau	5e8b5a41d1	Convert desktop files to JSON ... Task: https://phabricator.kde.org/T14564	4 years ago
l10n daemon script	f258b6217a	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"	4 years ago
l10n daemon script	b9a1e98742	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	21c98b356f	GIT_SILENT Make sure to use QString default value when reading KPluginMetaData value	5 years ago
Alexander Lohnau	c11051955d	Convert license headers to SPDX	5 years ago
Alexander Lohnau	8de79169f8	Consistently name kpackage structures ... This will allow kpackage to load the structures by their path. Task: https://phabricator.kde.org/T14757 Conceptually the same direction as https://phabricator.kde.org/T14499.	5 years ago
Alexander Lohnau	50c2fc495c	Define new KPackageStructure property in kpackage structures ... Task: https://phabricator.kde.org/T14563	5 years ago
Adrien Faveraux	42515d22cb	Move include guard to Pragma Once	5 years ago
l10n daemon script	b79988ff0e	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	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	b640fbdc3e	kpackage structures: Use K_PLUGIN_CLASS_WITH_JSON directly ... Task: https://phabricator.kde.org/T14542	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
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
l10n daemon script	915c13185d	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	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
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	80bc5112fd	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
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