Commit Graph

1157 Commits

Author SHA1 Message Date
Galen Wolfe-Pauly
584fdf569a talk polish 2015-04-28 12:00:46 -07:00
Anton Dyudin
4c59877cdf slightly fixed stack traces 2015-04-27 17:46:55 -07:00
Philip C Monk
ea2c2e2a8d local merge checkout optimization 2015-04-27 17:29:56 -04:00
Philip C Monk
de8ff5c595 fixd deeper hash bug 2015-04-24 19:35:24 -04:00
Philip C Monk
0fc29d1a38 fixed hash bug 2015-04-24 17:07:34 -04:00
Philip C Monk
df357653e9 send merge messages to talk 2015-04-24 16:03:23 -04:00
Philip C Monk
ca788cac3c Merge remote-tracking branch 'origin/test' into typedclay
Conflicts:
	urb/urbit.pill
	urb/zod/main/app/helm/core.hook
	urb/zod/main/arvo/ford.hoon
2015-04-23 20:46:25 -04:00
Philip C Monk
75e4b36d36 port merge tools to dojo model 2015-04-23 20:34:36 -04:00
Galen Wolfe-Pauly
f78916e2ad Merge branch 'test' of github.com:urbit/urbit into test 2015-04-22 17:43:58 -07:00
Galen Wolfe-Pauly
a8dd15c34d a cleaner library 2015-04-22 17:43:52 -07:00
Philip C Monk
dd0716eb72 Merge branch 'master' into typedclay
Conflicts:
	n/t.c
	urb/urbit.pill
	urb/zod/main/app/reload/core.hook
	urb/zod/main/app/shell/core.hook
	urb/zod/main/app/solid/core.hook
	urb/zod/main/arvo/dill.hoon
	urb/zod/main/arvo/eyre.hoon
	urb/zod/main/arvo/ford.hoon
	urb/zod/main/arvo/gall.hoon
	urb/zod/main/arvo/hoon.hoon
	urb/zod/main/mar/json/door.hook
	urb/zod/main/mar/md/door.hook
	urb/zod/main/mar/txt/door.hook
	v/raft.c
	v/unix.c
2015-04-22 20:18:19 -04:00
Anton Dyudin
1287173dc7 more ctrl keys 2015-04-22 15:35:35 -07:00
Anton Dyudin
4ffadbf7ee factored out websole coffee 2015-04-22 15:35:12 -07:00
Philip C Monk
ba69927f53 new hash algorithm works 2015-04-21 16:23:50 -04:00
Anton Dyudin
f5a0fa4f56 Added alt-arrow navigation 2015-04-20 17:55:00 -07:00
Anton Dyudin
e15a06ae4b communicate history changes to server 2015-04-20 16:46:08 -07:00
Philip C Monk
4934595617 waypoint 2015-04-20 19:36:19 -04:00
Anton Dyudin
5ebe273494 added sole history 2015-04-20 14:46:40 -07:00
Philip C Monk
872bb5b1c1 cal in mate/meld 2015-04-20 16:42:18 -04:00
Philip C Monk
8de064cf1f new %meet compiles 2015-04-18 03:31:58 -04:00
Philip C Monk
af8617dc9a removed printfs 2015-04-17 19:21:54 -04:00
Philip C Monk
7ae4742d10 boots again 2015-04-16 20:22:39 -04:00
Anton Dyudin
dab189541a fixed reload order 2015-04-16 16:41:00 -07:00
Anton Dyudin
f917d859af urb.wall disableable by setting urb.wal===false 2015-04-16 15:45:18 -07:00
Anton Dyudin
fff344f9ff reconnect to console 2015-04-16 12:40:53 -07:00
Anton Dyudin
71489b6b62 later prep 2015-04-14 19:12:08 -07:00
Anton Dyudin
31c2cb220b OT tweaking 2015-04-14 19:01:26 -07:00
Philip C Monk
8560bae3b8 waypoint 2015-04-14 20:48:37 -04:00
Anton Dyudin
93c2956fc7 cursor tweak 2015-04-14 13:57:12 -07:00
Anton Dyudin
6d76b13162 pub/sole/fab up 2015-04-14 13:38:37 -07:00
Philip C Monk
2e462a3c0d waypoint 2015-04-13 20:29:54 -04:00
Anton Dyudin
da107ab17c share.coffee lib/sole implementation 2015-04-13 17:20:54 -07:00
Philip C Monk
b62bacbf1d annotated merges seem to be working 2015-04-13 17:29:39 -04:00
Galen Wolfe-Pauly
519c1627f8 date instead of time 2015-04-10 16:05:18 -07:00
Galen Wolfe-Pauly
2d6666e5e8 Merge branch 'master' of github.com:urbit/urbit 2015-04-10 15:45:29 -07:00
Galen Wolfe-Pauly
cb15c3ce11 use .json in unsub 2015-04-10 15:45:17 -07:00
Anton Dyudin
fde1401bca Loosen dill-belt type XX temporary 2015-04-10 15:13:20 -07:00
Galen Wolfe-Pauly
afdbac72b7 oh yeah uncomment that 2015-04-10 14:47:53 -07:00
Galen Wolfe-Pauly
6d6ea4fc27 url speech type and required urb.js changes 2015-04-10 14:43:44 -07:00
Galen Wolfe-Pauly
01a8563bc4 Merge branch 'test' of github.com:urbit/urbit into test 2015-04-10 10:55:24 -07:00
Galen Wolfe-Pauly
fb5f1e57ea num util 2015-04-10 10:55:07 -07:00
Anton Dyudin
4b35965138 converters up 2015-04-09 23:57:04 -07:00
Anton Dyudin
83ed68829b Revert "Pass dependencies as mark /$"
This reverts commit b7d00f943270eeb9f33df07fa4149fbc0c86887a.

Conflicts:
	urb/zod/arvo/eyre.hoon
	urb/zod/arvo/ford.hoon
	urb/zod/main/mar/urb/door.hook
2015-04-09 13:42:11 -07:00
Galen Wolfe-Pauly
8093339c4f Merge branch 'test' of github.com:urbit/urbit into test 2015-04-09 10:13:44 -07:00
Galen Wolfe-Pauly
86d4a85b74 Merge branch 'master' of github.com:urbit/urbit-new 2015-04-09 10:07:25 -07:00
Galen Wolfe-Pauly
4e2d3901bc error pages 2015-04-09 10:06:13 -07:00
Galen Wolfe-Pauly
a11a019533 error pages 2015-04-09 10:05:03 -07:00
Anton Dyudin
1d9490c322 Merge remote-tracking branch 'origin/test' into dillbo
Conflicts:
	urb/urbit.pill
2015-04-08 18:42:06 -07:00
Anton Dyudin
886bbe9aca Matrix frontend v1 2015-04-08 18:37:43 -07:00
Philip C Monk
9e10039dfc bug fixing 2015-04-08 20:51:34 -04:00