Mirroristas/gun
2
0
Fork 0
mirror of https://github.com/amark/gun.git synced 2025-09-13 21:10:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,285 Commits 18 Branches 34 Tags 36 MiB
Commit Graph

2285 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Mark Nadal
67760bc9b7 Merge pull request #202 from amark/develop 
Develop
 2016-07-07 14:11:14 -06:00
Mark Nadal
d02ad116a0 Merge branch 'master' into develop 2016-07-07 12:54:28 -07:00
Mark Nadal
590b52d92b fixed server-to-server for @d3x0r 2016-07-07 12:54:19 -07:00
Mark Nadal
b369d37731 bring opt updates in from master 2016-07-07 11:49:30 -07:00
Mark Nadal
831552637e make Node.ify more flexible 2016-07-07 10:40:56 -07:00
Mark Nadal
948736afb2 Merge pull request #201 from amark/develop 
Develop
 2016-07-07 11:40:05 -06:00
Mark Nadal
8160ae0c4a fix server-to-server for @d3x0r 2016-07-07 09:57:34 -07:00
Mark Nadal
ab60299fe0 fix server-to-server for @d3x0r 2016-07-07 09:56:31 -07:00
Mark Nadal
bfe53d3e48 switch to fix server2server in dev 2016-07-06 20:08:44 -07:00
Mark Nadal
6986de3aa1 Merge branch 'master' into develop 2016-07-05 10:40:38 -07:00
Mark Nadal
1fa982a8bb slowly migrating 2016-07-05 10:40:27 -07:00
Mark Nadal
838dbec737 Merge pull request #200 from amark/develop 
Develop
 2016-07-05 11:39:42 -06:00
Mark Nadal
146f821e56 Merge peer options 2016-07-05 10:30:48 -07:00
Mark Nadal
3882fe3da8 Merge branch 'master' into develop 2016-07-05 10:30:31 -07:00
Mark Nadal
eb823f5261 Doing a big refactor for put 2016-07-05 10:24:15 -07:00
Mark Nadal
5edae656be before messing with things again 2016-06-30 21:02:13 -07:00
Mark Nadal
dc056ae2a6 before changing path into chain 2016-06-30 00:37:40 -07:00
Mark Nadal
2966c3caaf got events right 2016-06-30 00:10:01 -07:00
Mark Nadal
71fc84c5ce scary: try next flow in core? 2016-06-27 18:37:27 -07:00
Mark Nadal
1c807370d3 tricks 2016-06-27 17:22:37 -07:00
Mark Nadal
b6974af5ce Merge pull request #198 from amark/develop 
because @PsychoLlama was right and I should have fixed the problem back then.
 2016-06-25 15:56:40 -06:00
Mark Nadal
d8433121d2 Merge branch 'master' into develop 2016-06-25 14:36:44 -07:00
Mark Nadal
d20575b7a7 forgot to version bump Jesse being right 2016-06-25 14:35:59 -07:00
Mark Nadal
f442c9a929 Jesse warned me about time and I should have listened! 2016-06-25 14:31:10 -07:00
Mark Nadal
a469998afa switch to fix time in dev 2016-06-25 14:21:46 -07:00
Mark Nadal
6e0cf4fdc8 migrate driver changes 2016-06-23 00:56:18 -07:00
Mark Nadal
af02a42e7a Update README.md 2016-06-22 17:20:36 -07:00
Mark Nadal
b1d7e461bd Merge branch 'master' into develop 2016-06-22 17:05:35 -07:00