Commit Graph

6909 Commits

Author SHA1 Message Date
Marc-André Moreau
78e00db45d Merge branch 'egfx' of github.com:awakecoding/FreeRDP into egfx
Conflicts:
	libfreerdp/codec/test/TestFreeRDPCodecClear.c
2014-07-01 09:11:50 -04:00
Marc-André Moreau
de7d452d37 libfreerdp-codec: fix ClearCodec unit tests 2014-07-01 09:10:32 -04:00
Marc-André Moreau
ff816feb72 Merge branch 'master' of github.com:FreeRDP/FreeRDP into egfx 2014-07-01 09:01:52 -04:00
Marc-André Moreau
6876be653a Merge branch 'master' of github.com:awakecoding/FreeRDP into egfx 2014-07-01 09:01:35 -04:00
Marc-André Moreau
b86c3b038b Merge pull request #1934 from awakecoding/lync
Initial Remote Assistance Support
2014-06-30 18:10:31 -04:00
Marc-André Moreau
5c6ffad65a Merge pull request #1931 from bjcollins/master
Fix glib cmake script and only call OnOpen callback if set
2014-06-30 17:34:03 -04:00
Marc-André Moreau
856880b1a5 Merge pull request #1928 from hardening/wts_fix
Fix conflicting define
2014-06-30 17:25:17 -04:00
Marc-André Moreau
f943d7fc1b Merge branch 'master' of github.com:awakecoding/FreeRDP into lync 2014-06-30 17:22:50 -04:00
Marc-André Moreau
e42465372a xfreerdp: initial remote assistance controls (ctrl+alt+c to request/release control) 2014-06-30 17:17:06 -04:00
Mike McDonald
20d7184777 Merge branch 'egfx' of https://github.com/awakecoding/FreeRDP into egfx 2014-06-30 16:43:15 -04:00
Mike McDonald
fee350d542 Merge branch 'awakecoding' of https://github.com/vworkspace/FreeRDP into awakecoding 2014-06-30 16:42:04 -04:00
Mike McDonald
81c08a4475 Merge branch 'master' of https://github.com/awakecoding/FreeRDP into awakecoding 2014-06-30 16:38:58 -04:00
Marc-André Moreau
5606c64f61 channels/remdesk: initial working Remote Assistance 2014-06-30 13:26:11 -04:00
Marc-André Moreau
b60eff8e42 channels/remdesk: start sending authentication data 2014-06-30 12:51:27 -04:00
Emmanuel Ledoux
9fc225ac5d Merge branch 'ports'
Conflicts:
	channels/serial/client/serial_tty.c
2014-06-30 17:22:15 +02:00
Marc-André Moreau
7a50525880 libfreerdp-common: move assistance code 2014-06-30 09:40:24 -04:00
Marc-André Moreau
dadba85f99 client/common: fix remote assistance expert blob 2014-06-30 09:21:45 -04:00
Marc-André Moreau
b83685cdef client/common: start parsing Remote Assistance Connection String 2 2014-06-29 20:38:33 -04:00
Marc-André Moreau
01a013f826 client/common: fix Remote Assistance memory leaks 2014-06-29 19:57:46 -04:00
Marc-André Moreau
90ea609576 client/common: improve remote assistance blob encryption 2014-06-29 18:48:37 -04:00
Marc-André Moreau
fc315365f6 client/common: add .msrcIncident type 1 file test 2014-06-29 12:36:28 -04:00
Marc-André Moreau
06c7f83bc2 channels/remdesk: start parsing messages 2014-06-28 20:22:36 -04:00
Marc-André Moreau
af1be38775 client/common: parse and use remote assistance file 2014-06-28 18:33:46 -04:00
Marc-André Moreau
f7f07c56ba channels/remdesk: stub virtual channel 2014-06-28 17:24:44 -04:00
Marc-André Moreau
1d8221d95b client/common: parse RCTICKET Connection String 1 2014-06-28 17:03:16 -04:00
Marc-André Moreau
f6b6c1188b client/common: start parsing of .msrcIncident Remote Assistance file 2014-06-28 16:04:49 -04:00
bjcollins
d2d04f764d Find glibconfig.h cmake should use pkgconfig information instead of a hard coded path to /usr/lib.
the OnOpen callback should be called when set to avoid a segfault.
2014-06-27 14:46:27 -05:00
Bernhard Miklautz
9e1793c8ff Merge pull request #1927 from akallabeth/android-de-translation
German translation for aFreeRDP
2014-06-27 12:35:26 +02:00
Marc-André Moreau
49cd7806d9 libfreerdp-codec: improve ClearCodec decompressor 2014-06-26 17:08:51 -04:00
Armin Novak
ebecb326bb Added german translated assets. 2014-06-26 15:05:49 +02:00
Armin Novak
9a274db12f Modified asset loading, now checking if translated version exists before loading default. 2014-06-26 15:05:17 +02:00
Marc-André Moreau
dd36617093 libfreerdp-codec: improve clear_decompress function parameters 2014-06-25 18:39:28 -04:00
Marc-André Moreau
c20c3abdf1 xfreerdp: fix egfx SurfaceToSurface off-by-one 2014-06-25 18:00:48 -04:00
Marc-André Moreau
f1a866340e server/Sample: stub server-side encomsp channel 2014-06-25 15:21:02 -04:00
Hardening
f07ab94703 Fix conflicting define
WTSVirtualEventHandle and WTSVirtualChannelReady are already defined in wtsapi.h
and with different values.
2014-06-25 17:35:20 +02:00
Emmanuel Ledoux
d93c6b1362 serial: don't use wlog API yet
winpr-comm: cleared some #warnings due to wrong printf formats
2014-06-25 17:02:10 +02:00
Armin Novak
a0ec9d29be Modified translation, better wording in context. 2014-06-25 11:29:08 +02:00
Mike McDonald
38c39e172e Merge branch 'master' of https://github.com/awakecoding/FreeRDP into awakecoding 2014-06-24 13:49:00 -04:00
Armin Novak
a80199cecb Added german translation. 2014-06-24 19:40:31 +02:00
Bernhard Miklautz
3983c648b4 Merge pull request #1925 from mfleisz/andr_theme_fix
Changed android default theme to AppCompat.Light.DarkActionBar.
2014-06-24 12:55:55 +02:00
Martin Fleisz
f8148e712b Changed android default theme to AppCompat.Light.DarkActionBar.
Removed inverted text color from exit dialog.
2014-06-24 03:03:28 -07:00
Marc-André Moreau
014d8972e3 channels/encomsp: initial client-side implementation 2014-06-23 18:17:26 -04:00
Marc-André Moreau
64b8ded9f2 encomsp: stub client/server virtual channel 2014-06-23 16:18:03 -04:00
Marc-André Moreau
d0a0f61236 Merge pull request #1923 from awakecoding/egfx
MS-RDPEGFX Initial Implementation (WIP)
2014-06-23 12:26:40 -04:00
Marc-André Moreau
95a0d96b58 xfreerdp: fix build warnings 2014-06-23 12:08:34 -04:00
Marc-André Moreau
c156006195 Merge branch 'master' of github.com:awakecoding/FreeRDP into egfx 2014-06-23 11:55:27 -04:00
Marc-André Moreau
9c03f8b6bf Merge branch 'master' of github.com:FreeRDP/FreeRDP 2014-06-23 11:54:58 -04:00
Martin Fleisz
407dffd957 Merge pull request #1922 from akallabeth/android-ui-fix-clean
Android ui menu fix
2014-06-23 16:43:34 +02:00
Armin Novak
8fce7e4cea Capitalized disconnect string. 2014-06-23 16:24:39 +02:00
Armin Novak
e26c3f6bfc Removed menu option quit. 2014-06-23 16:20:28 +02:00