1
0
mirror of https://github.com/KDE/latte-dock.git synced 2024-12-24 17:33:50 +03:00
Commit Graph

59 Commits

Author SHA1 Message Date
l10n daemon script
df10c92d48 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"
2021-02-04 06:59:16 +01:00
l10n daemon script
1dfabeac2a 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"
2021-01-27 08:55:30 +01:00
l10n daemon script
ddcc2bbe6b 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"
2020-11-26 06:42:23 +01:00
l10n daemon script
16ccd123dd 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"
2020-06-25 05:50:13 +02:00
l10n daemon script
d953d7bf98 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"
2020-06-18 05:45:10 +02:00
l10n daemon script
c5072f98de 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"
2020-06-17 14:12:38 +02:00
l10n daemon script
51a302de63 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"
2020-05-09 06:29:25 +02:00
l10n daemon script
d0bf13aa72 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"
2020-04-20 05:38:30 +02:00
l10n daemon script
6dac4e4065 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"
2020-03-26 06:12:03 +01:00
l10n daemon script
3593ed48c6 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"
2020-01-19 05:31:57 +01:00
l10n daemon script
a3e747188f 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"
2019-11-04 05:13:17 +01:00
Michail Vourlakos
702b53493b Merge branch 'v0.9' into fix 2019-11-03 09:58:32 +02:00
l10n daemon script
12ec3bf36c 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"
2019-10-02 09:06:26 +02:00
l10n daemon script
7554e8c409 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"
2019-10-02 05:24:26 +02:00
l10n daemon script
32078ac05a 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"
2019-09-24 05:08:03 +02:00
l10n daemon script
71f9e6b85a 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"
2019-09-15 08:34:59 +02:00
l10n daemon script
1c4f5906fd 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"
2019-09-01 04:54:07 +02:00
Michail Vourlakos
3faf5f6114 Merge branch 'v0.9' into merger 2019-08-31 09:59:26 +03:00
l10n daemon script
20a4610a85 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"
2019-08-31 08:45:35 +02:00
l10n daemon script
1bec03ec8a 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"
2019-08-17 08:39:22 +02:00
l10n daemon script
e5a1324862 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"
2019-08-17 05:02:10 +02:00
l10n daemon script
57d52a78bf 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"
2019-08-01 04:49:08 +02:00
l10n daemon script
e438e04511 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"
2019-07-31 08:57:25 +02:00
l10n daemon script
6cd1a9b7ae 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"
2019-07-31 05:07:46 +02:00
l10n daemon script
4c7e800ce7 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"
2019-07-18 08:41:07 +02:00
l10n daemon script
2d8f2981be 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"
2019-07-17 05:26:24 +02:00
l10n daemon script
b5c954bf99 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"
2019-07-06 05:10:44 +02:00
l10n daemon script
971e67f6b3 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"
2019-07-01 04:51:34 +02:00
l10n daemon script
064b1178e6 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"
2019-04-30 05:41:18 +02:00
l10n daemon script
3598639740 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"
2019-04-24 05:51:16 +02:00
l10n daemon script
32904be361 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"
2019-04-20 05:58:30 +02:00
l10n daemon script
09147cdead 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"
2019-04-16 05:55:44 +02:00
l10n daemon script
d9217065fe 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"
2019-04-08 05:46:45 +02:00
l10n daemon script
42b236e8a9 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"
2019-04-06 05:55:45 +02:00
l10n daemon script
5c09168968 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"
2019-04-01 05:41:46 +02:00
l10n daemon script
348b617b49 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"
2019-03-31 06:35:48 +02:00
Michail Vourlakos
de170d42d8 remove unneeded warning 2019-03-29 20:53:16 +02:00
Michail Vourlakos
ba08038bc0 add Latte/Indicator type and improve metadata 2019-03-29 19:12:32 +02:00
Michail Vourlakos
3b8c52cc59 refactor:move lattepackage to simpler directory 2018-12-13 21:01:51 +02:00
Michail Vourlakos
7a3fcc7773 refactor:rename dockpackage to Latte::Package 2018-12-06 13:32:21 +02:00
Michail Vourlakos
2099b8ed36 add headers comments for all c++ files 2018-12-02 02:05:52 +02:00
Michail Vourlakos
3553415c59 load roundness theme info properly 2018-10-27 00:59:36 +03:00
Michail Vourlakos
6efeaa7d51 update code to new astyle conditions 2018-07-03 22:15:45 +03:00
Michail Vourlakos
b0bb99e2a9 compress svg files 2018-03-04 13:05:58 +02:00
Michail Vourlakos
de4cddb5d3 update internal splitter icon to use plasma theme 2018-03-04 12:36:48 +02:00
Michail Vourlakos
7050d7ba1f fix #886 use svg for settings Latte trademark
--remove the Plasma Label that was used to set
the Latte trademark based on Tangerine font that
was distributed from app source code
--remove the Tangarine font from source code
2018-02-27 23:58:47 +02:00
Michail Vourlakos
d3756e0ce1 add containmentactions 2018-02-03 20:56:30 +02:00
Michail Vourlakos
71281174be create a separate Types Window 2018-01-19 19:37:41 +02:00
Michail Vourlakos
bc91aefd89 add more MultipleLayouts code
--move code from dockCorona to layoutManager
--add more code related to MultipleLayouts
2018-01-14 23:58:48 +02:00
Michail Vourlakos
83cd059309 remove no needed fake separator desktop file 2017-11-18 14:34:34 +02:00