Mirroristas/gun
2
0
Fork 0
mirror of https://github.com/amark/gun.git synced 2025-08-03 17:23:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,630 Commits 18 Branches 34 Tags 36 MiB
Commit Graph

1630 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Nadal
0fa4d369fd Merge branch '0.5' of https://github.com/amark/gun into 0.5 2016-10-04 19:13:11 -07:00
Mark Nadal
f122fe2dfb pull latest 2016-10-04 19:13:04 -07:00
Mark Nadal
f0a06de464 fix var node for @d3x0r 2016-10-04 19:10:01 -07:00
Mark Nadal
dfcd2f7ab4 Merge branch '0.5' of https://github.com/amark/gun into 0.5 2016-10-02 09:59:47 -07:00
Mark Nadal
bf1b965b1f crazy maps work! 2016-10-02 09:59:40 -07:00
Mark Nadal
873afd8325 fix @d3x0r 's double close 2016-10-02 09:58:13 -07:00
Mark Nadal
407fcf7dbd merged again 2016-10-01 15:42:13 -07:00
Mark Nadal
4d34c69e2f tap? 2016-10-01 15:37:56 -07:00
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
7320c18248 Merge pull request #222 from d3x0r/patch-1 
Check request for 'upgrade' being set
 2016-09-30 19:21:05 -06:00
Mark Nadal
066340ba71 being lazy, using the easy approach for @devel-pa 2016-09-30 18:07:42 -07:00
d3x0r
a472f33e66 Check request for 'upgrade' being set 
along with the path check, should check that the request is an upgrade before assuming to do anything with it really.
 2016-09-30 16:54:06 -07:00
Mark Nadal
b2f78bc128 Merge pull request #220 from datuxer/0.5 
Unbuilding structure.
 2016-09-30 16:26:08 -06:00
devel-pa
9098380a90 Put out of the way require polyfill. 2016-09-30 21:24:01 +02:00
devel-pa
b8025b207f Unbuilding structure. 2016-09-30 21:19:18 +02:00
Mark Nadal
436376358b wsp should use 'in' if not found. 2016-09-27 14:51:31 -07:00
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