summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Enable Travisfeature/generic-auth-hookSolly Ross2015-05-123-4/+14
* Update Tests and Test PluginsSolly Ross2015-05-125-258/+370
* Process plugin parameters in mainSolly Ross2015-05-121-32/+27
* Fix bug in ReadOnlyTokenFileSolly Ross2015-05-121-0/+4
* Introduce Auth PluginsSolly Ross2015-05-122-0/+66
* Restore functionaltiy to file_only.Solly Ross2015-05-111-1/+5
* Merge pull request #169 from AricStewart/ping-pongSolly2015-04-212-1/+40
|\
| * Add ping heartbeat optionAric Stewart2015-04-142-0/+25
| * Add option to turn on auto-pongAric Stewart2015-04-132-1/+15
|/
* Fix bug in token_plugin/target_cfg supportSolly Ross2015-04-091-3/+6
* Merge pull request #161 from rafaelfolco/bug/150-websocket-bigendianSolly2015-04-071-8/+12
|\
| * BUGFIX: Websocket frame corruption on big-endian #150Rafael Folco2015-04-071-8/+12
* | Merge pull request #162 from kanaka/feature/token-pluginsSolly2015-04-072-42/+138
|\ \ | |/ |/|
| * Introduce Token Pluginsfeature/token-pluginsSolly Ross2015-03-262-42/+138
* | Merge pull request #159 from vaibhavsagar/python3-troveSolly2015-03-171-0/+6
|\ \ | |/ |/|
| * Add Python 3 trove classifiers.Vaibhav Sagar2015-03-171-0/+6
|/
* Merge pull request #155 from kanaka/bug/154-no-implicit-relative-importsSolly2015-02-062-3/+3
|\
| * Don't use implicit relative importsbug/154-no-implicit-relative-importsSolly Ross2015-02-032-3/+3
|/
* Merge pull request #128 from ags131/patch-1Solly2015-01-051-1/+1
|\
| * Fixed Package.jsonags1312014-05-161-1/+1
* | Merge pull request #140 from rpodgorny/python3Joel Martin2014-10-022-4/+4
|\ \
| * | python3 compatibility fixesRadek Podgorny2014-10-022-4/+4
|/ /
* | sync with commit from PR #347 in noVNCsamhed2014-08-191-7/+9
* | Merge pull request #129 from mmb/masterJoel Martin2014-05-201-1/+1
|\ \ | |/ |/|
| * Fix typo in reaping zombies message.Matthew M. Boedicker2014-05-201-1/+1
|/
* remove some trailing whitespacessamhed2014-04-141-13/+13
* Avoid using the %-operator, URL-escaped strings can contain extra %'s which c...samhed2014-03-182-12/+12
* Update to v0.6.0v0.6.0Solly Ross2014-02-183-2/+11
* README: update with general contact info.Joel Martin2014-02-031-0/+22
* Fix default log level in echo and load testsSolly Ross2014-01-302-2/+6
* README: fix wrap mode examples.Joel Martin2014-01-131-5/+6
* Merge pull request #111 from astrand/masterastrand2013-12-194-208/+317
|\
| * Merge remote branch 'upstream/master'Peter Åstrand (astrand)2013-12-190-0/+0
| |\ | |/ |/|
* | Prepare for fixing https://github.com/kanaka/websockify/pull/111Peter Åstrand (astrand)2013-12-191-110/+110
| * Minor whitespace and layout tweaks, to reduce diff againstPeter Åstrand (astrand)2013-12-172-4/+5
| * Merge remote branch 'upstream/master'Peter Åstrand (astrand)2013-12-170-0/+0
| |\ | |/ |/|
* | Cherry-picked 4e3388964af9697496d2c5e000bb8559dfba87ad fromPeter Åstrand (astrand)2013-12-171-217/+217
| * Merge remote branch 'upstream/master', after #110 was merged.Peter Åstrand (astrand)2013-12-165-5/+5
| |\ | |/ |/|
* | Merge pull request #110 from astrand/rename-self-clientastrand2013-12-168-29/+29
|\ \
| * | Rename new_client to new_websocket_client, in order to have a betterPeter Åstrand (astrand)2013-11-288-12/+12
| * | Rename self.client to self.request, in preparation for merging pullPeter Åstrand (astrand)2013-11-284-17/+17
|/ /
| * Follow up on 131f9ea645ac6f00d98743a420d168033f99063a: Proper loggingPeter Åstrand (astrand)2013-11-281-3/+7
| * Merge commit '34a1b68d79a13c03aa63b5c4194796341c9383fe'Peter Åstrand (astrand)2013-11-281-4/+3
| |\ | |/ |/|
* | Clarify ssl module build for old python versions.Joel Martin2013-11-201-4/+3
| * Merge commit 'a04edfe80f54b44df5a3579f71710560c6b7b4fc'Peter Åstrand (astrand)2013-11-284-107/+90
| |\ | |/ |/|
* | Merge pull request #105 from dosaboy/topic/unit-test-cleanupJoel Martin2013-11-204-107/+90
|\ \
| * | Added temp dir for unit test data and cleanupEdward Hope-Morley2013-11-144-107/+90
|/ /
| * Merge commit 'a47be21f9fa69ddf8d888ff9e3c75cdfc9e31c00'Peter Åstrand (astrand)2013-11-284-18/+358
| |\ | |/ |/|
* | Merge pull request #94 from dosaboy/topic/add-unit-testsJoel Martin2013-10-294-18/+358
|\ \
| * | Added unit tests for websocket and websocketproxyEdward Hope-Morley2013-10-294-18/+358
|/ /