Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix errors cause by previous merge (2361914) | Jim Grandy | 2013-08-08 | 2 | -0/+4 |
| | |||||
* | Hand-apply patches (misc) from Authentic8: b18667d 6d22ada 95d93a3 433b49c ↵ | Jim Grandy | 2013-08-07 | 4 | -41/+291 |
| | | | | b96f85f 8c32c46 f87f6b3 c93cce0 26ce9ce | ||||
* | Hand-apply patch (rail: send ShowState when window order changes) from ↵ | Jim Grandy | 2013-07-26 | 1 | -0/+12 |
| | | | | Authentic8: c36a2d7 | ||||
* | Hand-apply patches (chansrv/rail) from Authentic8: 516fd1d 6a4fb28 c038a99 | Jim Grandy | 2013-07-26 | 3 | -91/+212 |
| | |||||
* | Hand-apply patch (chansrv: handle ReparentNotify) from Authentic8: 68cdc07 | Jim Grandy | 2013-07-26 | 1 | -3/+23 |
| | |||||
* | Fix merge errors introduced in 3ae1b415 and 20ec9ee3 | Jim Grandy | 2013-07-26 | 1 | -1/+3 |
| | |||||
* | Hand-apply patches (rail) from Authentic8 branch: e94d059 c36dc61 | Jim Grandy | 2013-07-26 | 1 | -4/+16 |
| | |||||
* | Hand-apply patches (rail) from Authentic8: b01207f b9807e9 42f0128 0f0750c ↵ | Jim Grandy | 2013-07-26 | 1 | -21/+375 |
| | | | | aef2dce | ||||
* | Hand-apply patches (rail) from Authentic8: bc68076 | Jim Grandy | 2013-07-26 | 1 | -18/+227 |
| | |||||
* | Hand-apply patches (rail improvements) from Authentic8 branch: 6d97878 | Jim Grandy | 2013-07-26 | 1 | -7/+15 |
| | |||||
* | Hand-apply patches (rail improvements) from Authentic8 branch: 6e15b4a ↵ | Jim Grandy | 2013-07-26 | 4 | -101/+469 |
| | | | | 2c99e69 3f30429 aad2aaa 4f8481e 5117ac2 f3dcf1a | ||||
* | Hand-apply patches (rail improvements) from Authentic8 branch: 507694d, ↵ | Jim Grandy | 2013-07-26 | 5 | -14/+204 |
| | | | | 0e21d45, 44447d5, e452e4f, 3d05576, dd69d8f | ||||
* | Merge branch 'master' of github.com:neutrinolabs/xrdp | Jay Sorg | 2013-07-02 | 1 | -1/+1 |
|\ | |||||
| * | chansrv: fix for pulse simple method, to get it work again. | speidy | 2013-06-25 | 1 | -1/+1 |
| | | |||||
* | | chansrv: no logic change, work on warning | Jay Sorg | 2013-07-02 | 10 | -87/+32 |
|/ | |||||
* | chansrv: no logic change, EOL and coding style cleanup | Jay Sorg | 2013-06-23 | 2 | -18/+24 |
| | |||||
* | Fix sound and clipboard crashes | Lukas Vacek | 2013-06-22 | 3 | -0/+26 |
| | | | | | | | | | | | | | - In case clipboard is not initialized, clipboard_data_in returns (fixes a segfault) - If less than 4 bytes are sent to sound_send_wave_data_chunk, it returns (fixes a segfault) - When sending sound initiliazation messages set g_chan in chansrv to 0, so the server waits for client to reply (this makes sound work afte reconnecting) - In process_message_channel_setup, clear any leftover data in chan_items | ||||
* | Merge branch 'master' of github.com:neutrinolabs/xrdp | Laxmikant Rashinkar | 2013-06-08 | 4 | -4/+40 |
|\ | |||||
| * | Merge remote-tracking branch 'xrdp-org/master' | Jay Sorg | 2013-06-06 | 3 | -3/+29 |
| |\ | |||||
| | * | pulse: change some errors to debug | Jay Sorg | 2013-06-06 | 1 | -3/+2 |
| | | | |||||
| | * | more pulse notes | Jay Sorg | 2013-06-06 | 2 | -0/+27 |
| | | | |||||
| * | | Merge remote branch 'xrdp-org/master' | Jay Sorg | 2013-06-03 | 1 | -1/+11 |
| |\ \ | | |/ | |||||
| | * | merge from pmhahn | Jay Sorg | 2013-05-29 | 1 | -1/+11 |
| | |\ | |||||
| | | * | sesman: Fix dist | Philipp Hahn | 2013-01-28 | 1 | -1/+11 |
| | | | | | | | | | | | | | | | | | | | | Add missing header files to EXTRA_DIST. Otherwise "make distcheck" fails. | ||||
* | | | | folder redirection: fixed language issues | Laxmikant Rashinkar | 2013-06-08 | 3 | -163/+98 |
|/ / / | |||||
* | | | folder redirection: made changes to read/write routines to avoid race conditions | Laxmikant Rashinkar | 2013-06-02 | 5 | -10/+70 |
|/ / | |||||
* | | file system redirection: | Laxmikant Rashinkar | 2013-05-21 | 2 | -8/+57 |
| | | | | | | | | o vi now works with freerdp and rdesktop | ||||
* | | file system redirection: | Laxmikant Rashinkar | 2013-05-19 | 2 | -28/+46 |
| | | | | | | | | o vi now works when connected via freerdp but does not fully work with rdesktop | ||||
* | | file system redirection: | Laxmikant Rashinkar | 2013-05-18 | 4 | -52/+135 |
| | | | | | | | | | | | | | | | | o touch <file> was not working - fixed o echo "this is a string" > filename was not working - fixed o echo "this is a string" >> filename was not working - fixed o vi was not working - working now but swap files are not being deleted automatically - work in progress | ||||
* | | Merge branch 'xrdp_smartcard' | Laxmikant Rashinkar | 2013-05-15 | 8 | -357/+1044 |
|\ \ | |||||
| * | | smartcard: developer checkin for smartcard support | Laxmikant Rashinkar | 2013-05-15 | 8 | -357/+1044 |
| | | | |||||
* | | | pulse work and cleanup | Jay Sorg | 2013-05-12 | 4 | -57/+639 |
| | | | |||||
* | | | pulse sink changes | Jay Sorg | 2013-05-11 | 1 | -23/+19 |
| | | | |||||
* | | | pulse sink, use buffer so not sending too small or too big audio packets | Jay Sorg | 2013-05-07 | 1 | -6/+50 |
| | | | |||||
* | | | pulse sink, don't need i18n.h | Jay Sorg | 2013-05-07 | 2 | -2/+3 |
|/ / | |||||
* | | file system redirection: resolved merge conflicts | Laxmikant Rashinkar | 2013-05-05 | 4 | -185/+240 |
|\ \ | |||||
| * | | chanarv: x prefix for stream functions to avoid name collision | Jay Sorg | 2013-05-03 | 2 | -177/+177 |
| | | | |||||
| * | | chansrv: fix for close message | Jay Sorg | 2013-05-01 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' of github.com:FreeRDP/xrdp | Jay Sorg | 2013-04-28 | 4 | -477/+204 |
| |\ \ | |||||
| * | | | work on pulse sink, added close message | Jay Sorg | 2013-04-28 | 2 | -2/+63 |
| | | | | |||||
* | | | | file system redirection: made changes to support rdesktop | Laxmikant Rashinkar | 2013-05-05 | 3 | -49/+101 |
| |/ / |/| | | |||||
* | | | Merge branch 'master' of github.com:FreeRDP/xrdp | Laxmikant Rashinkar | 2013-04-26 | 3 | -13/+58 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'master' of github.com:FreeRDP/xrdp | Jay Sorg | 2013-04-22 | 3 | -59/+675 |
| |\ \ | |||||
| * | | | chansrv: added some pulse sink notes | Jay Sorg | 2013-03-31 | 1 | -1/+17 |
| | | | | |||||
| * | | | chansrv: work on pulse sink | Jay Sorg | 2013-03-31 | 3 | -12/+41 |
| | | | | |||||
* | | | | hooked up clipboard code with FUSE | Laxmikant Rashinkar | 2013-04-26 | 4 | -477/+204 |
| |/ / |/| | | |||||
* | | | swapped cb_lookup and cb_readdir | Laxmikant Rashinkar | 2013-04-20 | 3 | -59/+675 |
|/ / | |||||
* | | chansrv: work on pulse sink | Jay Sorg | 2013-03-31 | 3 | -89/+109 |
| | | |||||
* | | chansrv: work on pulse sink | Jay Sorg | 2013-03-30 | 1 | -18/+70 |
| | | |||||
* | | Merge branch 'master' of github.com:FreeRDP/xrdp | Laxmikant Rashinkar | 2013-03-30 | 6 | -8/+578 |
|\ \ |