Ark/krfb
1
0
Fork 0
mirror of https://github.com/KDE/krfb synced 2026-07-01 07:41:17 -07:00
Code Issues Packages Projects Releases Wiki Activity
1,014 Commits 66 Branches 397 Tags
Applications/16.12
Commit Graph

1014 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
l10n daemon script
64f1efc249 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"
v16.12.3 		2017-02-23 08:15:35 +01:00
l10n daemon script
5a25eb938e 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"
v16.12.2 		2017-02-02 07:41:07 +01:00
Harald Sitter
da4de72d55 set a comment 
appstream uses Comment for a summary when no appdata is present. without
a comment/summary no appdata will be available at all rendering the app
unavailable in software stores

recycle genericname to avoid excess l10n work
 2017-02-01 19:12:59 +01:00
l10n daemon script
b3e1624469 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"
 2017-01-28 08:14:37 +01:00
Heiko Becker
b4713d4755 Silence CMake policy CMP0063 warning 
...by adding the NO_POLICY_SCOPE flag as recommended by ECM's
documentation.
 2017-01-11 20:18:38 +01:00
l10n daemon script
903692c299 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"
v16.12.1 v16.12.0 v16.11.90 		2016-12-02 05:49:11 +01:00
l10n daemon script
cbc43a390f 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"
 2016-11-22 06:10:53 +01:00
l10n daemon script
631d3c85ac 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"
v16.11.80 		2016-11-15 10:19:57 +00:00
l10n daemon script
ae15751847 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"
 2016-10-24 09:34:05 +00:00
Tomaz Canabrava
f1a3e2b31c Needed to simplify the creation of reviews via the rbt tool. 
Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
 2016-10-10 16:25:17 +02:00
l10n daemon script
b95a5b285d 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"
 2016-09-14 09:19:50 +00:00
l10n daemon script
0ee5738bf5 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"
 2016-09-09 09:26:52 +00:00
Tomaz Canabrava
5195783757 Fix build by undefining the max macro 
The max macro was being defined in the c++ namespace,
conflicting with the max C++ function call, breaking the
build.

Signed-off-by: Tomaz Canabrava <tomaz.canabrava@gmail.com>
 2016-08-19 12:43:24 -03:00
Yuri Chornoivan
1b6702167d Fix minor glitches 2016-07-29 19:45:30 +03:00
Burkhard Lück
8b7fcb023d Update KRFB docbook to 16.08 
Update to reflect changes in
https://git.reviewboard.kde.org/r/115499
Krfb modified to move away from invite-model, and modeled as a service that can be started/stopped.

remove unused entities, pngs + appendix
new screenshots
remove krfb/ui/invitewidget.ui - unused
REVIEW:128528
 2016-07-29 06:59:12 +02:00
l10n daemon script
65595722bd 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"
v16.08.1 v16.08.0 v16.07.90 v16.07.80 v16.03.80 		2016-01-23 10:35:57 +00:00
l10n daemon script
916ffb525a 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"
 2016-01-07 10:10:04 +00:00
Albert Astals Cid
ee5cb9eaf5 Merge remote-tracking branch 'origin/Applications/15.12' 2016-01-07 00:33:40 +01:00
Albert Astals Cid
ecb9fb8ee0 Make translations work 
Call KLocalizedString::setApplicationDomain
v15.12.1 		2016-01-07 00:31:40 +01:00
Albert Astals Cid
2c317584b9 Remove useless I18N_NOOP 2016-01-07 00:30:12 +01:00
l10n daemon script
c98d1d7676 SVN_SILENT made messages (.desktop file) 2015-12-30 12:15:07 +00:00
l10n daemon script
def5195e63 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"
 2015-12-30 09:33:48 +00:00
l10n daemon script
510e5f8d52 SVN_SILENT made messages (.desktop file) 2015-12-29 13:51:44 +00:00
l10n daemon script
964386e2a6 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"
 2015-12-29 11:26:11 +00:00
l10n daemon script
0d500c00ba SVN_SILENT made messages (.desktop file) 2015-12-17 12:27:46 +00:00
l10n daemon script
07439f6408 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"
 2015-12-17 09:32:43 +00:00
l10n daemon script
aa0e358136 SVN_SILENT made messages (.desktop file) 2015-12-13 11:50:46 +00:00
l10n daemon script
7c175bbc6e SVN_SILENT made messages (.desktop file) v15.12.0 2015-12-09 12:00:52 +00:00
l10n daemon script
405bec30f6 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"
 2015-12-09 09:08:00 +00:00
l10n daemon script
464cbd8573 SVN_SILENT made messages (.desktop file) v15.11.90 2015-11-26 18:11:03 +00:00
l10n daemon script
c1904c41c7 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"
 2015-11-26 15:56:42 +00:00
Jeremy Whiting
17752eba7c Merge branch 'Applications/15.12' 2015-11-23 12:22:39 -07:00
Jeremy Whiting
f4b4fe0f34 Fix launching the application from KDE menu and krunner 
Patch from Antonio Rojas <arojas@archlinux.org>
REVIEW:126142
BUG:355776
 2015-11-23 12:20:59 -07:00
l10n daemon script
ac6f4ca3ed 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"
 2015-11-17 13:00:54 +00:00
l10n daemon script
d2d49abf23 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"
v15.11.80 		2015-11-11 10:33:20 +00:00
l10n daemon script
396e277113 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"
 2015-11-07 21:16:29 +00:00
l10n daemon script
ab7ed1c006 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"
 2015-11-04 17:14:10 +00:00
l10n daemon script
1c9db8798e 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"
 2015-11-03 15:56:52 +00:00
l10n daemon script
a2b1c5e0b5 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"
 2015-11-02 11:08:45 +00:00
l10n daemon script
f95fafe5a7 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"
 2015-11-01 10:43:24 +00:00
l10n daemon script
3a9f58f12e 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"
 2015-10-25 10:39:56 +00:00
l10n daemon script
74b4d19a35 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"
 2015-10-18 11:02:35 +00:00
l10n daemon script
c0f1b1ebb4 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"
 2015-10-17 12:43:21 +00:00
l10n daemon script
d306c6c73d 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"
 2015-10-16 10:30:41 +00:00
Rohan Garg
8d1abb3a8f Fix build 2015-10-15 15:51:31 +02:00
Rohan Garg
f15490d58a Merge branch 'master' into frameworks 2015-10-15 15:38:37 +02:00
Rohan Garg
c83182f8d3 Allow krfb to store the fact that it was enabled the last time it was started 2015-10-15 15:36:38 +02:00
Rohan Garg
e0dc5b3a51 Allow krfb to start minimized, this is useful when autostarting krfb. 2015-10-15 15:36:19 +02:00
Rohan Garg
5948ee69c2 Allow for krfb to be started without a wallet. 
krfb will store obscured passwords in a regular text
files in this mode.
 2015-10-15 15:35:21 +02:00
Albert Astals Cid
e443b13227 virtual -> override 
And a class that is really a struct
 2015-10-10 13:27:49 +02:00