473 Commits

Author SHA1 Message Date
Mark Nadal
01ab75c4ae Merge branch 'master' into develop 2016-02-04 14:00:49 -08:00
Mark Nadal
a05cf84315 set / table / list / collections ! 2016-02-04 13:59:51 -08:00
Mark Nadal
b7a335dd3b link nodes like a boss! 2016-02-04 11:11:53 -08:00
Mark Nadal
d1828e9871 ignore 1006 2016-02-03 23:47:43 -08:00
Mark Nadal
eb32dc4779 Merge pull request #158 from amark/develop
Develop
2016-02-01 14:52:18 -08:00
Mark Nadal
f1a8801fa5 s3? v0.3.2 2016-02-01 14:34:17 -08:00
Mark Nadal
3eb01bc5b2 match update 2016-02-01 14:34:17 -08:00
Mark Nadal
098b27ed08 Merge pull request #157 from PsychoLlama/master
Fix markdown formatting error, minor wording change.
2016-02-01 12:01:43 -08:00
Jesse Gibson
7fafe55655 Fix markdown formatting error, minor wording change.
There were two backticks without content that confused the parser.
2016-02-01 12:57:31 -07:00
Mark Nadal
16511d2e6b Merge pull request #156 from amark/develop
Merge pull request #154 from amark/master
2016-01-31 10:12:07 -08:00
Mark Nadal
cccba23a73 Merge pull request #154 from amark/master
Master -> Develop
2016-01-30 14:08:03 -08:00
Mark Nadal
7e29b235e2 Merge pull request #155 from amark/develop
Develop
2016-01-29 09:02:10 -08:00
Mark Nadal
a4924d85d0 Update README.md 2016-01-28 14:22:14 -08:00
Mark Nadal
155f096254 comments and semantics 2016-01-28 13:00:38 -08:00
Mark Nadal
7f44bed3d9 quick express fixes v0.3.1 2016-01-28 13:00:38 -08:00
Mark Nadal
fc51d907a5 Update README.md 2016-01-28 12:58:46 -08:00
Mark Nadal
6de0d682b2 Update README.md 2016-01-28 12:58:07 -08:00
Mark Nadal
1c91d7428f Merge pull request #151 from miclill/master
OpenShift IP-Fix for example/http.js
2016-01-27 10:57:45 -08:00
Michael Lill
af298855ec OpenShift IP-Fix for example/http.js 2016-01-27 12:19:26 +01:00
Mark Nadal
03057edb45 Merge pull request #150 from amark/develop
Merge branch 'master' into develop
2016-01-26 20:02:13 -08:00
Mark Nadal
cbcbf3c851 added LondonJS video 2016-01-26 13:52:45 -08:00
Mark Nadal
fdad3a3d63 Merge branch 'master' into develop 2016-01-26 13:24:33 -08:00
Mark Nadal
2cbb047ab2 Update CHANGELOG.md 2016-01-26 13:20:50 -08:00
Mark Nadal
dc938fdeea Rename changelog.md to CHANGELOG.md 2016-01-26 13:19:44 -08:00
Mark Nadal
905eba8440 Merge pull request #149 from amark/develop
0.3.x baby!
2016-01-26 13:17:32 -08:00
Mark Nadal
ba1b6e33ab please merge 2016-01-26 13:06:38 -08:00
Mark Nadal
93bf37b94d Merge branch 'master' into develop
# Conflicts:
#	README.md
#	gun.js
2016-01-26 12:59:10 -08:00
Mark Nadal
ce6ce34dce readme update 2016-01-26 12:41:29 -08:00
Mark Nadal
ee919e7076 revise chat example 2016-01-26 08:11:53 -08:00
Mark Nadal
a85a7a6999 fix key checker 2016-01-25 20:22:32 -08:00
Mark Nadal
3edfbebd39 fixed chat app, fixed end events 2016-01-25 15:04:05 -08:00
Mark Nadal
2e34884384 not shouldn't emit for no reason! 2016-01-24 12:22:48 -08:00
Mark Nadal
b95b25fd94 don't be invalid! 2016-01-24 08:13:21 -08:00
Mark Nadal
85ee6fd07c all core tests passing. 2016-01-23 20:49:37 -08:00
Mark Nadal
6908df0405 chasing performance 2016-01-23 20:49:37 -08:00
Mark Nadal
73aae8edf0 Update wsp.js 2016-01-11 16:13:17 -08:00
Mark Nadal
bf6a47351f Update package.json 2016-01-04 17:12:32 -08:00
Mark Nadal
8f24dc9e2f Update wsp.js 2016-01-04 16:26:55 -08:00
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