Commit 3e246533bd1f9f3a8f5eb6275eb22749f8c37bad
Merge branch 'patch-git'
mix irving committed on 4/30/2017, 11:08:34 AMParent: 4f3f6158b887d26ebcd75874d1ea383b94be77f4
Parent: b7008eab70be37bfc36e1047685962d230c714ab
Files changed
app/html/page/profile.js | changed |
main.js | changed |
package.json | changed |
app/html/page/profile.js | ||
---|---|---|
@@ -13,15 +13,15 @@ | ||
13 | 13 … | 'app.sync.goTo': 'first', |
14 | 14 … | }) |
15 | 15 … | |
16 | 16 … | exports.needs = nest({ |
17 | - 'about.html.edit': 'first', | |
18 | - 'about.obs': { | |
19 | - 'name': 'first' | |
17 … | + 'about': { | |
18 … | + 'html.edit': 'first', | |
19 … | + 'obs.name': 'first' | |
20 | 20 … | }, |
21 … | + 'app.html.scroller': 'first', | |
21 | 22 … | 'contact.html.relationships': 'first', |
22 | 23 … | 'keys.sync.id': 'first', |
23 | - 'app.html.scroller': 'first', | |
24 | 24 … | 'message.html.render': 'first', |
25 | 25 … | 'sbot.pull.userFeed': 'first' |
26 | 26 … | }) |
27 | 27 … |
main.js | ||
---|---|---|
@@ -1,9 +1,9 @@ | ||
1 | 1 … | const combine = require('depject') |
2 | 2 … | const entry = require('depject/entry') |
3 | 3 … | const nest = require('depnest') |
4 | 4 … | |
5 | -// const git = require('patch-git') | |
5 … | +const git = require('patch-git') | |
6 | 6 … | const horcrux = require('ssb-horcrux') |
7 | 7 … | const patchbay = require('./') |
8 | 8 … | const patchcore = require('patchcore') |
9 | 9 … | |
@@ -11,9 +11,9 @@ | ||
11 | 11 … | require('setimmediate') |
12 | 12 … | |
13 | 13 … | // from more specialized to more general |
14 | 14 … | const sockets = combine( |
15 | - // git, | |
15 … | + git, | |
16 | 16 … | horcrux, |
17 | 17 … | patchbay, |
18 | 18 … | patchcore |
19 | 19 … | ) |
package.json | ||
---|---|---|
@@ -48,8 +48,9 @@ | ||
48 | 48 … | "micro-css": "^1.0.0", |
49 | 49 … | "mutant": "^3.16.0", |
50 | 50 … | "mutant-pull-reduce": "^1.0.1", |
51 | 51 … | "open-external": "^0.1.1", |
52 … | + "patch-git": "0.0.2", | |
52 | 53 … | "patchcore": "^0.5.0", |
53 | 54 … | "pull-abortable": "^4.1.1", |
54 | 55 … | "pull-cat": "^1.1.11", |
55 | 56 … | "pull-next": "1.0.0", |
Built with git-ssb-web