Mirroristas/gun
2
0
Fork 0
mirror of https://github.com/amark/gun.git synced 2025-03-30 15:08:33 +00:00
Code Issues Packages Projects Releases Wiki Activity
587 Commits 18 Branches 34 Tags 36 MiB
Commit Graph

587 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Nadal
7464ec9e97 Update README.md 2016-09-30 20:45:03 -07:00
Mark Nadal
e3379fd05a Update README.md 2016-09-30 20:44:27 -07:00
Mark Nadal
4bd25b039c Merge pull request #217 from amark/develop 
Develop
 2016-09-17 15:48:54 -06:00
Mark Nadal
fdf08154ba Merge pull request #215 from Stefdv/patch-1 
ws error on send
 2016-09-17 15:36:38 -06:00
Stefdv
3258354af6 bumped version for ws.send error 2016-09-17 23:28:40 +02:00
Stefdv
1760900d73 ws error on send 
node might throw an error on sending through a websocket that is not open. Adding an empty calback seems o fix this
 2016-09-17 23:13:30 +02:00
Stefdv
562e1dba96 ws error on send 
node might throw an error when sending through a not open websocket. Adding an empty callback fixes this
 2016-09-17 23:08:30 +02:00
Stefdv
aff0720e69 ws error on send 
When sending through a ws socket you might get an error saying that the socket is not open.
by adding an empty callback to `ws.send`  this seems to fixe it
 2016-09-17 22:56:31 +02:00
Mark Nadal
5b201d64f2 Merge pull request #214 from amark/master 
Merge pull request #209 from amark/develop
 2016-09-17 14:44:35 -06:00
Mark Nadal
bd39fa42dd Merge pull request #209 from amark/develop 
Develop
 2016-08-13 17:39:36 -06:00
Mark Nadal
ffa79f2d69 bump jesse's update 2016-08-13 16:20:29 -07:00
Mark Nadal
4c5f5a4f76 Merge remote-tracking branch 'origin/develop' into develop 2016-08-13 16:18:11 -07:00
Mark Nadal
4881b1e4a9 Merge pull request #208 from PsychoLlama/develop 
Make it easier to start the demo apps
 2016-08-13 17:17:49 -06:00
Jesse Gibson
4a0fb994be Merge branch 'develop' of https://github.com/amark/gun into develop 2016-08-08 17:40:36 -06:00
Jesse Gibson
3e7df721cb Change default port to 8080 
Since it's made as an example app, might as well make it easy to get
started. Port 80 throws an error if the server hasn't been started as
sudo, requiring port 8080 to be explicitly passed if you want to run the
demo locally.
 2016-08-08 17:38:13 -06:00
Mark Nadal
21a6a2f035 Merge branch 'master' into develop 2016-08-03 17:20:56 -07:00
Mark Nadal
dead567698 Merge pull request #206 from amark/develop 
Develop
 2016-08-03 18:20:39 -06:00
Mark Nadal
8cea0bc5f8 add node filter for map 2016-08-03 17:11:49 -07:00
Mark Nadal
9d231755ce Merge branch 'master' into develop 2016-08-03 17:02:58 -07:00
Mark Nadal
83b2d84f04 Merge pull request #205 from amark/develop 
Develop
 2016-07-26 23:58:15 -06:00
Mark Nadal
5e30de8acd fix ? env ? 2016-07-26 22:49:54 -07:00
Mark Nadal
e5f3b0c63b Merge branch 'master' into develop 2016-07-11 17:25:40 -07:00
Mark Nadal
9b59582e2e Merge pull request #204 from amark/develop 
Develop
 2016-07-11 17:37:49 -06:00
Mark Nadal
51563e1dd0 Merge branch 'master' into develop 2016-07-11 16:29:37 -07:00
Mark Nadal
7fde5eb836 fix/mask @d3x0r 's #203 2016-07-11 16:08:54 -07:00
Mark Nadal
67760bc9b7 Merge pull request #202 from amark/develop 
Develop
 2016-07-07 14:11:14 -06:00
Mark Nadal
d02ad116a0 Merge branch 'master' into develop 2016-07-07 12:54:28 -07:00
Mark Nadal
590b52d92b fixed server-to-server for @d3x0r 2016-07-07 12:54:19 -07:00
Mark Nadal
948736afb2 Merge pull request #201 from amark/develop 
Develop
 2016-07-07 11:40:05 -06:00
Mark Nadal
8160ae0c4a fix server-to-server for @d3x0r 2016-07-07 09:57:34 -07:00
Mark Nadal
ab60299fe0 fix server-to-server for @d3x0r 2016-07-07 09:56:31 -07:00
Mark Nadal
6986de3aa1 Merge branch 'master' into develop 2016-07-05 10:40:38 -07:00
Mark Nadal
838dbec737 Merge pull request #200 from amark/develop 
Develop
 2016-07-05 11:39:42 -06:00
Mark Nadal
146f821e56 Merge peer options 2016-07-05 10:30:48 -07:00
Mark Nadal
3882fe3da8 Merge branch 'master' into develop 2016-07-05 10:30:31 -07:00
Mark Nadal
b6974af5ce Merge pull request #198 from amark/develop 
because @PsychoLlama was right and I should have fixed the problem back then.
 2016-06-25 15:56:40 -06:00
Mark Nadal
d8433121d2 Merge branch 'master' into develop 2016-06-25 14:36:44 -07:00
Mark Nadal
d20575b7a7 forgot to version bump Jesse being right 2016-06-25 14:35:59 -07:00
Mark Nadal
f442c9a929 Jesse warned me about time and I should have listened! 2016-06-25 14:31:10 -07:00
Mark Nadal
af02a42e7a Update README.md 2016-06-22 17:20:36 -07:00
Mark Nadal
b1d7e461bd Merge branch 'master' into develop 2016-06-22 17:05:35 -07:00
Mark Nadal
9863840284 Merge pull request #196 from amark/develop 
Develop
 2016-06-22 18:04:53 -06:00
Mark Nadal
a83ff0c114 fix driver to actually connect to other servers 2016-06-22 16:56:34 -07:00
Mark Nadal
a713bb0ae7 minimum temporary auth for server, clients still independent from auth though 2016-06-22 15:05:58 -07:00
Mark Nadal
6781c1df28 Merge branch 'master' into develop 2016-06-22 14:25:48 -07:00
Mark Nadal
16fb144adc Update README.md 2016-06-01 15:01:48 -07:00
Mark Nadal
9c83766c43 Merge pull request #193 from amark/develop 
Develop
 2016-05-25 15:25:50 -06:00
Mark Nadal
656019e674 use hidden back, turn off null listeners 2016-05-25 14:10:29 -07:00
Mark Nadal
8555f8a518 Merge branch 'master' into develop 2016-05-23 14:27:18 -07:00
Mark Nadal
7ca5867f6f Merge pull request #192 from amark/develop 
Develop
 2016-05-23 15:20:30 -06:00