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
492 Commits 18 Branches 34 Tags 36 MiB
Commit Graph

492 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Nadal
e2921af58f Merge branch 'master' into develop 2016-02-15 14:23:51 -08:00
Mark Nadal
f0a7cf1ee9 version bump 2016-02-15 14:23:15 -08:00
Mark Nadal
66d768f03d Merge pull request #170 from amark/develop 
Develop
 2016-02-15 14:22:26 -08:00
Mark Nadal
9d00f3886b s3 typo fix 2016-02-15 13:58:30 -08:00
Mark Nadal
eb43c09388 s3 typo fix 2016-02-15 13:14:05 -08:00
Mark Nadal
b8614a4959 Update README.md 2016-02-11 18:11:30 -08:00
Mark Nadal
0699fb8137 Merge pull request #168 from amark/develop 
Develop
 2016-02-11 10:24:59 -08:00
Mark Nadal
4babcfd2ba version bump 2016-02-11 10:05:39 -08:00
Mark Nadal
ad4da00b20 server push! 2016-02-11 08:49:10 -08:00
Mark Nadal
7e8b98bae9 Merge branch 'master' into develop 2016-02-11 08:12:31 -08:00
Mark Nadal
3bcfccc1a9 Merge pull request #164 from amark/develop 
Develop
v0.3.4 		2016-02-08 02:35:31 -08:00
Mark Nadal
c8e531cf10 0.3.4 goodies 2016-02-07 20:32:45 -08:00
Mark Nadal
a334699a46 Update README.md 2016-02-06 15:35:29 -08:00
Mark Nadal
bca96e8827 Merge pull request #163 from sbeleidy/gun-playground 
Add link to gun playground in README
 2016-02-06 15:30:21 -08:00
Saad El Beleidy
e6be99dde1 Add link to gun playground in README 2016-02-07 01:28:27 +02:00
Mark Nadal
fc45328a01 Merge branch 'master' into develop 2016-02-04 16:32:19 -08:00
Mark Nadal
83d6eadebb Merge pull request #161 from amark/develop 
Develop
v0.3.3 		2016-02-04 16:31:38 -08:00
Mark Nadal
6e21d03c5a Merge pull request #159 from jokesterfr/master 
Clarify imports at the beginning of the file
 2016-02-04 14:08:03 -08:00
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
Jokester
e018cbcbc2 Clarify imports at the beginning of the file 
Adressing a good practice: https://github.com/alanjames1987/Node.js-
Best-Practices#never-require-modules-inside-of-functions
 2016-02-03 12:55:09 +01: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