2285 Commits

Author SHA1 Message Date
Mark Nadal
32ffe612f7 Merge pull request #143 from PsychoLlama/develop
Remove unused "formidable" dependency in wsp.js
2016-01-04 12:41:58 -07:00
Mark Nadal
59f20c2cbd couple fixes 2015-12-30 14:51:15 -08:00
Jesse Gibson
0c58245a2a Remove unused "formidable" dependency in wsp.js
Formidable is only used in http.js, and although it is required by wsp.js, it's never used.
2015-12-30 13:32:00 -07:00
Mark Nadal
be90a6cde8 Merge pull request #142 from PenguinMan98/PenguinMan98-allow_prefix_override
allow_prefix_override
2015-12-29 00:57:29 -08:00
PenguinMan98
3240ab8826 allow_prefix_override
This change should (untested) let the user pass in a prefix option to put, get, and key, operations that will override the prefix set in the instance without clobbering it.
2015-12-29 01:07:32 -07:00
Mark Nadal
1786d37718 Merge pull request #140 from ayurmedia/master
Update README.md
2015-12-28 23:46:28 -08:00
ayurmedia
cd827ef5d3 Update README.md
add ayurmedia as contributor
2015-12-29 08:41:42 +01:00
Mark Nadal
22f98065db make sure localStorage returns nodes not graphs 2015-12-28 15:02:56 -08:00
Mark Nadal
2e876b92fc make sure localStorage isn't disabled 2015-12-28 14:49:24 -08:00
Mark Nadal
8c0dae0176 server updated 2015-12-26 21:14:14 -08:00
Mark Nadal
ab138b5350 BREAKING 0.3 ONLY CORE MEMORY WORKS!
# Conflicts:
#	lib/file.js
v0.3.0
2015-12-23 18:12:01 -08:00
Mark Nadal
6d15aa1e61 API 0.3 BREAKING CHANGES, TESTS PASSING 2015-12-22 01:56:41 -08:00
MetaSean
2ed41745d1 removed web directory to reduce confusion with current web repo https://github.com/gundb/gundb.github.io 2015-12-18 14:58:41 -07:00
Jesse Gibson
af30651ddd Merge pull request #135 from djmrr/mike_readme_fix
updated the tutorial link on the readme page #UTAHJS commit
2015-12-16 18:10:58 -07:00
Mike Russell
9fd71adcd7 updated the tutorial link on the readme page #UTAHJS commit 2015-12-15 19:09:44 -07:00
Mark Nadal
94cde72dfa Merge pull request #134 from PsychoLlama/master
Add basic compatibility with browserify and webpack
2015-11-24 01:46:59 -08:00
Jesse Gibson
a70c9775b8 Merge branch 'master' of https://github.com/amark/gun 2015-11-23 16:07:39 -07:00
Jesse Gibson
7564d95321 Fix duplication of code, only test for node environment once 2015-11-23 15:59:46 -07:00
Mark Nadal
d235990ab7 Merge pull request #129 from thoka/master
do queueing right
2015-11-23 14:56:03 -08:00
Jesse Gibson
f6f7310a50 Add basic compatibility with browserify and webpack
On the compile step, both window and module are defined. Gun prevents module exports by detecting the environment and tacking Gun onto the window object. This addition will check to see if it's a dual environment (like browserify or electron) and export to both window and module, preventing errors in your build step.
2015-11-23 15:32:48 -07:00
Thomas Kalka
61ded1b337 ws 2015-11-19 10:03:05 +01:00
Thomas Kalka
690eb4c81a do queueing right 2015-11-19 09:54:09 +01:00
Mark Nadal
2540f32774 Merge pull request #126 from thoka/master
fix concurrent writes and remember known nodes
2015-11-18 18:53:40 -07:00
Thomas Kalka
0489b3d634 fix concurrent writes and remember known nodes 2015-11-18 03:00:47 +01:00
Mark Nadal
553aa25e71 Update README.md 2015-11-17 10:30:29 -08:00
Mark Nadal
48f971555a Merge pull request #119 from PsychoLlama/master
Allow .val to accept string arguments for logging
2015-11-17 11:18:52 -07:00
Mark Nadal
d2ee2e94b5 Update gun.js 2015-11-17 10:16:30 -08:00
Mark Nadal
9f3d4080a5 Update README.md 2015-11-17 10:05:30 -08:00
Mark Nadal
fe6b82d60b comment 2015-11-11 12:02:31 -08:00
Mark Nadal
b36d6f5247 move put's back.emit to the bottom for improved perf. 2015-11-09 19:07:08 -08:00
Jesse Gibson
ba6e99f301 Take string arguments into .val(), prepending your arguments to the console output. Good for debugging. Closes #118 2015-11-03 15:00:02 -07:00
Mark Nadal
524b41ed4c fixes #116, closes #116 2015-11-02 18:16:33 -08:00
Mark Nadal
c3961688bf Merge pull request #117 from amark/develop
fix Jesse's synchronous Trace bug
2015-11-02 17:48:02 -07:00
Mark Nadal
272935630b fix Jesse's synchronous Trace bug v0.2.5 2015-11-02 16:41:01 -08:00
Mark Nadal
76ec917cf9 Merge pull request #112 from amark/develop
Develop
2015-10-23 10:08:29 -06:00
Mark Nadal
7dee2d8b92 fix num checks & upgrade Jesse's path checks 2015-10-23 09:03:32 -07:00
Mark Nadal
8ab99c0efc Merge remote-tracking branch 'refs/remotes/origin/master' into develop 2015-10-23 08:51:05 -07:00
Mark Nadal
e4d0e6c0c4 Revert "fix num validation & upgrade jesse's path check"
This reverts commit ba5dc00b6afea3d86a3b7809d9201d69d1d5f2e3.
2015-10-23 08:50:47 -07:00
Mark Nadal
ba5dc00b6a fix num validation & upgrade jesse's path check 2015-10-23 08:43:58 -07:00
Mark Nadal
13b8ff9ada val end fix & comments v0.2.4 2015-10-23 07:08:11 -07:00
MetaSean
45fcada245 Merge pull request #110 from PsychoLlama/master
Check Gun.path for null value before calling a method on it, fix #108
2015-10-21 12:57:55 -06:00
Jesse Gibson
d7605f2a76 Check Gun.path for null value before calling a method on it, fix #108 2015-10-21 12:35:08 -06:00
Mark Nadal
fc27af870d Merge pull request #107 from amark/develop
fix live replication bug depending on ordering
v0.2.3
2015-10-16 17:15:58 -06:00
Mark Nadal
a36dd37fef fix live replication browser ordering bug 2015-10-16 16:10:52 -07:00
Mark Nadal
4b41d04ada fix live replication bug depending on ordering 2015-10-16 16:01:23 -07:00
Mark Nadal
7a313ac816 Merge pull request #105 from amark/develop
path bug fixes & NTS
2015-10-15 17:48:17 -06:00
Mark Nadal
ebe3f77693 path bug fixes & NTS 2015-10-15 16:45:58 -07:00
Mark Nadal
2c80ae81e9 path bug fixes & NTS 2015-10-15 16:34:30 -07:00
Mark Nadal
0239023e92 Merge remote-tracking branch 'refs/remotes/gun/master' into develop 2015-10-15 16:33:18 -07:00
Mark Nadal
e6b0659a65 fix path val calling undefined 2015-10-14 18:18:27 -07:00