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
Mark Nadal
882e4b740a
fix for @stefdv
2016-05-13 18:42:17 -07:00
Mark Nadal
9be1a61f54
unwebpack
2016-05-13 18:37:36 -07:00
Mark Nadal
5ceed870e2
move to index
2016-05-04 14:39:51 -07:00
Mark Nadal
dfbfa2eaca
maybe use web pack?
2016-05-03 18:01:10 -07:00
Jesse Gibson
e614e2f5aa
Allow chained superclassing
...
When calling `gun.chain()`, gun invokes the constructor. If you create a
new class that inherits from gun, it will only work as far as there
aren't any `.chain` calls. This changes it from invoking the gun
constructor to instead invoke your current class context.
2016-04-05 18:25:30 -06:00
Mark Nadal
da70535eb9
PANIC IS COMING! :D
2016-04-01 19:16:03 -07:00
Jesse Gibson
bc688a4e7f
Merge branch 'master' of https://github.com/amark/gun
2016-04-01 16:36:35 -06:00
Mark Nadal
ae6409e7d9
Update README.md
2016-03-30 23:43:11 -07:00
Mark Nadal
2d579a110b
Merge pull request #181 from allenhartwig/ES6
...
Binding module scope for ES6/Babel compatibility
2016-03-30 15:54:06 -06:00
Allen Hartwig
f67b9a2f45
Binding module scope for ES6/Babel compatibility
2016-03-30 12:48:26 -07:00
Mark Nadal
92c591971a
Merge pull request #179 from PsychoLlama/master
...
Logo change: png to svg
2016-03-21 22:24:35 +01:00
Jesse Gibson
f7c2edc3e3
Fix logo alt text
...
"gun" instead of "gun logo". Hopefully that fools people on slow connections.
2016-03-13 23:42:31 -06:00
Jesse Gibson
f713661ed5
Link to svg logo instead of png
...
I was linking the svg file wrong! Turns out, you can include them... This commit includes the svg file, and dynamically scales it to 40% of the screen width. It should be everything the last commit was, but now with sharper logo definition.
2016-03-13 23:39:42 -06:00
MetaSean
83c6f6fd58
Merge pull request #178 from PsychoLlama/master
...
Readme goodness
2016-03-13 22:46:56 -06:00
