Philip C Monk
7cf5d49b6b
Merge branch 'newunix'
...
Conflicts:
urb/zod/base/ape/dojo.hoon
urb/zod/base/ape/talk.hoon
2015-06-19 17:03:42 -04:00
Philip C Monk
618974e493
Merge remote-tracking branch 'origin/test' into newunix
...
Conflicts:
urb/urbit.pill
urb/zod/base/ape/hood.hoon
urb/zod/base/arvo/zuse.hoon
v/unix.c
2015-06-19 15:37:20 -04:00
Philip C Monk
f027ab628d
remove printfs
2015-06-19 15:26:11 -04:00
Anton Dyudin
ffe56f6205
fix old versinos of marks being used when translating
2015-06-19 12:03:11 -07:00
Anton Dyudin
258c69eb78
change passcode derivation seed
2015-06-19 12:03:07 -07:00
Anton Dyudin
5a1f300297
bump eyre security
2015-06-19 10:27:03 -07:00
C. Guy Yarvin
62fab9fa94
Report stranger peers.
2015-06-19 10:22:41 -07:00
Anton Dyudin
b2a8251bb3
added # speech
2015-06-18 18:47:41 -07:00
Anton Dyudin
9924013c3e
missed |verb
2015-06-18 15:34:17 -07:00
Philip C Monk
4b1ef23b16
forgot to commit {,un}mount.hoon
2015-06-18 18:06:07 -04:00
Galen Wolfe-Pauly
0d5012608b
Merge branch 'test' of github.com:urbit/urbit into test
2015-06-18 14:42:43 -07:00
Galen Wolfe-Pauly
8367c44918
bad webtalk chars fixed
2015-06-18 14:42:34 -07:00
Anton Dyudin
3e06521c8e
missed a mark door, re-flop eyre stack traces
2015-06-18 14:39:11 -07:00
Philip C Monk
6db7796803
bug fixes
2015-06-18 15:56:11 -04:00
Anton Dyudin
5c3bd9c053
added :talk feedback to twitter app
2015-06-18 11:55:05 -07:00
Anton Dyudin
a190bfbbbd
direct %peer usage
2015-06-18 11:37:49 -07:00
Anton Dyudin
37161d9c3a
Merge branch 'test' of https://github.com/urbit/urbit into test
2015-06-18 11:31:37 -07:00
Anton Dyudin
4a0044ed93
:twif listen on twitter feed
2015-06-18 11:26:45 -07:00
Galen Wolfe-Pauly
ca92015b03
tree body rendering
2015-06-18 09:10:34 -07:00
Galen Wolfe-Pauly
35e91eb322
questionable tree fix
2015-06-17 23:26:09 -07:00
Anton Dyudin
5130bd0715
Merge branch 'test' of https://github.com/urbit/urbit into test
2015-06-17 18:50:51 -07:00
Anton Dyudin
e173fb24e7
Rescued |hi Yfrīt from the sands of time into helm: closes #304
2015-06-17 18:50:16 -07:00
Galen Wolfe-Pauly
789ed2b5e2
Merge branch 'test' of github.com:urbit/urbit into test
2015-06-17 18:30:27 -07:00
Galen Wolfe-Pauly
177d4e530c
fixed arvo spinner
2015-06-17 18:30:19 -07:00
Anton Dyudin
7ef6d78260
recovered twitter dæmon from the sands of time: closes #303
2015-06-17 18:13:31 -07:00
Anton Dyudin
d506d38fd3
forgot to add solid
2015-06-17 18:08:47 -07:00
Philip C Monk
b844d1b892
add :+unmount
2015-06-17 19:44:00 -04:00
Anton Dyudin
82f0eb317f
Merge branch 'test' of https://github.com/urbit/urbit into test
2015-06-17 16:11:40 -07:00
Anton Dyudin
43728c690e
fixed sched mark to make ;ul;
2015-06-17 15:44:55 -07:00
Anton Dyudin
2bb8921fdf
removed extraneous cats and dogs
2015-06-17 15:31:44 -07:00
Raymond Pasco
8d29d40b1a
Cosmetic fixes to ++po
2015-06-17 17:54:02 -04:00
Raymond Pasco
6b9b3bf850
Document ++ob
...
formatting
2015-06-17 14:16:43 -07:00
Raymond Pasco
74ea5dc599
Document ++ob
2015-06-17 17:11:40 -04:00
Anton Dyudin
4e406694e0
update talk help from readme, closing #293
2015-06-17 13:26:53 -07:00
Anton Dyudin
c3c86b2061
Merge branch 'master' into test
...
Conflicts:
urb/zod/base/pub/tree/src/js/main.js
2015-06-17 13:20:11 -07:00
Anton Dyudin
22f5d4bf49
fixed old-revision refresh loop, commented out real-nyet parser
2015-06-17 12:49:03 -07:00
Philip C Monk
98c08a2b39
persist mount points across pier reboots
2015-06-17 15:06:40 -04:00
Anton Dyudin
60f5becaa7
|schedule add to .sched
...
Demo suggestion:
- vim :set autoread, :e pier/home/pub/test.sched (TODO: rename)
- http://zod.local/home/pub/test -- ordered
- add an element in vim -- still ordered
- +cat %/pub/test -- data structure, hash order
- |schedule %/pub/test ~2016.5.5..07.30.00 'new event' -- vim now ordered, reloaded alongside web
- +cat it again for good measure?
2015-06-17 11:09:27 -07:00
Anton Dyudin
8a8055ba3a
demo sched mark
2015-06-16 18:06:58 -07:00
Galen Wolfe-Pauly
409d208cd9
too many basepath
2015-06-16 15:57:29 -07:00
Anton Dyudin
b845051bf6
Merge branch 'master' into test
...
Conflicts:
urb/urbit.pill
urb/zod/base/mar/oct3-move.hoon
urb/zod/base/pub/cloud/fab/hymn.hook
urb/zod/base/pub/cloud/src/main.js
2015-06-16 15:19:51 -07:00
Philip C Monk
bdeb4e4a11
Merge remote-tracking branch 'origin/test' into newunix
...
Conflicts:
urb/urbit.pill
urb/zod/base/arvo/clay.hoon
2015-06-16 17:44:47 -04:00
Anton Dyudin
098bb0fed7
rectify tree and cat usage of %tang
2015-06-16 14:36:04 -07:00
Philip C Monk
b1e59ec8b3
ergo merges
2015-06-16 17:34:21 -04:00
Anton Dyudin
e042154265
put flops on all tang->text boundaries
2015-06-16 14:01:07 -07:00
Anton Dyudin
035d5c1efa
talk ;help v1
2015-06-16 12:34:40 -07:00
Anton Dyudin
6cbb6b060d
Revert "remove docs for demo", "remove odds and ends", "demo network", "DEMO ONLY: root beak as %demo.", "DEMO ONLY: don't show doznec flapping.", "Prinrtf."
...
This reverts commit 8e1e40d75b3ab15c194b6bf9570f3edc46e2de58.
This reverts commit f073c490f9fd7c5abc033af4857df92229877de7.
This reverts commit f187d2d7e01a54823f3e979af9bbd148b398e7e9.
This reverts commit bc272862a73cfce1b118586ca39d3a377d841f1b.
This reverts commit 30a397513f8890a3406dc7ab91c6e067e3bbfbbb.
This reverts commit 4fc6856fb50d88c20a0f533392ca606641c5f38f.
Conflicts:
urb/urbit.pill
urb/zod/base/lib/drum.hoon
2015-06-15 18:10:02 -07:00
Anton Dyudin
49ee373df7
Merge branch 'test' into demo
...
Conflicts:
urb/urbit.pill
urb/zod/base/ape/hood.hoon
urb/zod/base/mar/hoon.hoon
2015-06-15 15:06:59 -07:00
Anton Dyudin
ff94ef162b
Revert "Revert "remove docs for demo", "remove odds and ends", "demo network", "DEMO ONLY: root beak as %demo.""
...
This reverts commit b07f8c81db3f7ab0a10d1b8ddc58de7c593612fc.
Conflicts:
urb/urbit.pill
urb/zod/base/pub/doc/guide/a-ford.md
urb/zod/base/pub/doc/hoon/library/3bg.md
2015-06-15 14:56:52 -07:00
Philip C Monk
894468a70d
fixed more problems
2015-06-12 20:48:16 -04:00