Commit Graph

19 Commits

Author SHA1 Message Date
Henry Ault
b5d7375817 Merge branch 'do' into test 2015-05-21 17:24:09 -07:00
Henry Ault
e6d8ec36d0 do->cloud rename 2015-05-21 17:22:56 -07:00
Anton Dyudin
7e4cf03c93 codemirror tree v1 2015-05-20 15:13:27 -07:00
Henry Ault
2a583c0ee9 Merge branch 'do' of https://github.com/urbit/urbit into do
Conflicts:
	urb/zod/base/ape/bit/core.hook
2015-05-20 13:50:42 -07:00
Henry Ault
4ce18a92d2 beginning of GCE auth 2015-05-20 13:49:19 -07:00
Anton Dyudin
ab078ee41a Merge branch 'test' into do
Conflicts:
	urb/urbit.pill
	urb/zod/base/arvo/  --  took --theirs
	urb/zod/base/fap/talk/core.hook
2015-05-20 11:45:37 -07:00
Anton Dyudin
0cafcc4612 standalone hook coloring 2015-05-19 20:29:04 -07:00
Philip C Monk
759106d25a more cleanup 2015-05-18 17:32:14 -04:00
Anton Dyudin
77796a4fa6 Merge branch 'test' into do
Conflicts:
	urb/urbit.pill
	urb/zod/base/arvo/dill.hoon
	urb/zod/base/arvo/gall.hoon
2015-05-13 12:21:53 -07:00
Henry Ault
689b5df159 about to port 2015-05-12 15:58:27 -07:00
Anton Dyudin
fdbf46ce16 added json octo interfaces 2015-05-12 12:57:58 -07:00
C. Guy Yarvin
cf6cd46177 Various fixes and improvements. 2015-05-08 18:08:18 -07:00
Galen Wolfe-Pauly
369dd1878a tree for editing 2015-05-08 16:47:46 -07:00
Henry Ault
fdf8a0639a send bitcoin and view address where you received 2015-05-07 11:26:10 -07:00
Henry Ault
b543549d28 moved main to base 2015-05-06 14:08:27 -07:00
Anton Dyudin
c62717ed8c fix %app thoughts 2015-05-04 13:43:20 -07:00
Anton Dyudin
a8de86094f !: |% → :: |% isn't a valid syntax transform 2015-05-04 11:40:51 -07:00
Philip C Monk
334840e068 performance improvements 2015-05-01 21:26:59 -04:00
Philip C Monk
f03263852c main->base, arvo events depth-first 2015-04-29 18:48:45 -04:00