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

569 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Nadal
9d231755ce Merge branch 'master' into develop 2016-08-03 17:02:58 -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
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
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
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
6986de3aa1 Merge branch 'master' into develop 2016-07-05 10:40:38 -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
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
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
Mark Nadal
9863840284 Merge pull request #196 from amark/develop 
Develop
 2016-06-22 18:04:53 -06:00
Mark Nadal
a83ff0c114 fix driver to actually connect to other servers 2016-06-22 16:56:34 -07:00
Mark Nadal
a713bb0ae7 minimum temporary auth for server, clients still independent from auth though 2016-06-22 15:05:58 -07:00
Mark Nadal
6781c1df28 Merge branch 'master' into develop 2016-06-22 14:25:48 -07:00
Mark Nadal
16fb144adc Update README.md 2016-06-01 15:01:48 -07:00
Mark Nadal
9c83766c43 Merge pull request #193 from amark/develop 
Develop
 2016-05-25 15:25:50 -06:00
Mark Nadal
656019e674 use hidden back, turn off null listeners 2016-05-25 14:10:29 -07:00
Mark Nadal
8555f8a518 Merge branch 'master' into develop 2016-05-23 14:27:18 -07:00
Mark Nadal
7ca5867f6f Merge pull request #192 from amark/develop 
Develop
 2016-05-23 15:20:30 -06:00
Mark Nadal
040161c1ab fix @stefdv 's deep path put bug 2016-05-23 14:12:42 -07:00
Mark Nadal
e506904050 Merge remote-tracking branch 'origin/develop' into develop 2016-05-23 14:06:22 -07:00
Mark Nadal
56048097e5 fix @stefdv 's deep path put bug 2016-05-23 14:05:39 -07:00
Mark Nadal
4355eb1342 Merge branch 'master' into develop 2016-05-23 12:19:24 -07:00
Mark Nadal
f6f595bda7 Merge pull request #183 from PsychoLlama/master 
Allow chained custom prototypes
 2016-05-21 19:09:59 -06:00
Jesse Gibson
eaac6b1805 Merge branch 'master' of https://github.com/amark/gun 2016-05-21 18:31:14 -06:00
Mark Nadal
25e7579d13 Merge pull request #191 from PsychoLlama/develop 
Make `data.json` human-readable
 2016-05-21 18:23:14 -06:00
Jesse Gibson
c35ae5e669 Make data.json human-readable 
Since the file.js module is only for development or getting started, we
shouldn't have to minify the data before persisting it. In fact, it may
hurt things, since it obfuscates our data structure and makes it harder
to understand what's going on under the hood.
In this commit, I swapped `Gun.text.ify` with JSON's `stringify` and
gave it a 2-space formatting option to make the data more readable.
 2016-05-21 17:04:00 -06:00
Mark Nadal
b02a1f74f5 Merge branch 'master' into develop 2016-05-13 19:58:21 -07:00
Mark Nadal
cc4aa19364 Merge pull request #190 from amark/develop 
Develop
 2016-05-13 20:25:28 -06:00
Mark Nadal
93906ac22d stupid git 2016-05-13 19:17:05 -07:00
Mark Nadal
0e1e12884b Merge branch 'master' into develop 2016-05-13 19:16:19 -07:00
Mark Nadal
042b387fa0 Merge pull request #189 from amark/develop 
Develop
 2016-05-13 20:15:43 -06:00
Mark Nadal
b1e86a3ae0 TODO: update to new panic! 2016-05-13 19:03:39 -07:00
Mark Nadal
5fcb314dfe PANIC IS COMING! :D 2016-05-13 19:00:58 -07:00
Mark Nadal
77f9827359 Merge branch 'master' into develop 2016-05-13 19:00:31 -07:00
Mark Nadal
d92f885dee Merge pull request #188 from amark/develop 
Develop
 2016-05-13 20:00:02 -06:00
Mark Nadal
27716d7a0d fix for @stefdv 2016-05-13 18:53:03 -07:00