Mirroristas/gun
2
0
Fork 0
mirror of https://github.com/amark/gun.git synced 2025-06-04 21:26:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,063 Commits 18 Branches 34 Tags 36 MiB
Commit Graph

1063 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Nadal
aaf34a3dfe Merge branch '0.5' of https://github.com/amark/gun into 0.5 2016-09-27 12:25:30 -07:00
Mark Nadal
21257424a5 localStorage should recover from a get response 2016-09-27 12:23:59 -07:00
Mark Nadal
c6140712c9 hopefully this resolved conflicts 2016-09-27 11:46:20 -07:00
Mark Nadal
275b651107 grr now I have conflicts 2016-09-27 11:44:51 -07:00
Mark Nadal
f748ef0308 add set back in for @stefdv 2016-09-27 11:40:20 -07:00
Mark Nadal
05bb232d4d put now accepts refs again 2016-09-27 11:32:36 -07:00
Mark Nadal
347ac0ff37 Update wsp.js 2016-09-26 22:50:35 -07:00
Mark Nadal
a0a5be519a Update gun.js 2016-09-26 22:43:50 -07:00
Mark Nadal
16b5797731 merged 2016-09-25 18:18:31 -07:00
Mark Nadal
00d8fe331e use intended message ID 2016-09-25 18:12:26 -07:00
Mark Nadal
11a390e7b2 toJSON 2016-09-25 18:10:58 -07:00
Mark Nadal
2ce6c80521 fix crashing bug found by @d3x0r 2016-09-25 18:09:28 -07:00
Mark Nadal
4d13585be8 check against undef not falsy 2016-09-25 15:40:32 -07:00
Mark Nadal
cdbf06e9c4 pretty print data.json for @d3x0r 2016-09-25 13:41:14 -07:00
Mark Nadal
fa3d3eeff4 0.5 BETA TESTING 2016-09-25 13:06:29 -07:00
Mark Nadal
5fbf9a5d4d Merge branch 'master' into develop 2016-09-17 14:51:03 -07:00
Mark Nadal
acc085a8ed currently VERY broken 2016-09-17 14:50:36 -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
d62b3f7ab0 so much working!!! 2016-09-08 18:43:00 -07:00
Mark Nadal
3ec5fe5484 190+ tests passing, now handle map path 2016-09-01 13:33:35 -07: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
dc157d05c1 finally got ack working 2016-08-13 16:18:00 -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
9cb2c9e313 before doing more scary things? 2016-08-05 18:58:30 -07: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
97449e9f28 into the meat of put 2016-08-03 16:58:15 -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
a609584eda 60+ tests passing 2016-07-26 22:46:15 -07:00
Mark Nadal
78460bf5a5 goodness 2016-07-19 01:33:01 -07:00
Mark Nadal
a07e7bebf6 goodness 2016-07-19 01:03:29 -07:00
Mark Nadal
afc1c18304 significant internal refactor 2016-07-14 19:37:19 -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
2b7cc398a2 Event should use event as hook 2016-07-11 16:04:52 -07:00