Commit Graph

1468 Commits

Author SHA1 Message Date
Philip C Monk
cbcb62459a move along, nothing to see here 2015-02-27 01:35:41 -05:00
C. Guy Yarvin
a3a2ec2260 Basic dialog workings. 2015-02-25 08:57:43 -08:00
Anton Dyudin
34431f53e9 BTC base58check @uc odour v1 2015-02-24 18:10:11 -08:00
C. Guy Yarvin
21e3a0aee8 Recover a BUNCH of old stuff from a stash. 2015-02-24 15:31:58 -08:00
C. Guy Yarvin
597cfd11ca Barnaby, almost working. 2015-02-24 14:53:31 -08:00
C. Guy Yarvin
12d11b7781 Merge branch 'master' into dillbo
Conflicts:
	urb/urbit.pill
	urb/zod/arvo/ford.hoon
2015-02-24 11:01:26 -08:00
Galen Wolfe-Pauly
87691797a2 moved into doc desk 2015-02-23 15:28:09 -08:00
Anton Dyudin
479311153d de-DGHETTO 2015-02-20 13:50:30 -08:00
Anton Dyudin
9ff256099c Cached %bake 2015-02-20 13:42:57 -08:00
Anton Dyudin
aa1cfca2dd dbg wip 2015-02-19 21:27:23 -08:00
Anton Dyudin
62dbdc1b49 Merge branch 'master' into eyre-new
Conflicts:
	n/t.c
2015-02-19 19:59:03 -08:00
Anton Dyudin
37cbb041c9 Fixed ford ot anchor at current main revision, not time 2015-02-19 19:55:18 -08:00
C. Guy Yarvin
69f265fcd1 GHETTO timestamp tracing. 2015-02-19 15:22:51 -08:00
C. Guy Yarvin
3235a8e1eb Merge branch 'master' of https://github.com/urbit/urbit 2015-02-19 15:19:25 -08:00
Anton Dyudin
3c96f935f7 Merge branch 'master' into eyre-new
Conflicts:
	urb/urbit.pill
2015-02-19 15:16:52 -08:00
Galen Wolfe-Pauly
7f88f98447 merge master 2015-02-18 18:51:04 -08:00
Philip C Monk
66662f2b41 ford %join 2015-02-18 19:53:28 -05:00
Galen Wolfe-Pauly
31f1c2d4cd talk in 2015-02-18 14:25:58 -08:00
Galen Wolfe-Pauly
25839ecd9f no node_modules 2015-02-18 09:03:18 -08:00
Galen Wolfe-Pauly
d163c41f78 Merge branch 'master' into doc 2015-02-18 09:00:51 -08:00
C. Guy Yarvin
95fbf2915b Before experiment in reversing arvo moves. 2015-02-17 19:30:53 -08:00
Galen Wolfe-Pauly
26a0b6c20b Merge branch 'master' of github.com:urbit/urbit-new 2015-02-17 12:53:13 -08:00
C. Guy Yarvin
4f0a620972 Various fixes and improvements. 2015-02-13 16:37:40 -08:00
C. Guy Yarvin
2c80dd5297 Reverse i search 2015-02-11 18:57:33 -08:00
Henry Ault
fd49091755 licensing and such 2015-02-10 15:13:17 -08:00
Henry Ault
5c525b1f15 Merge branch 'master' of https://github.com/urbit/urbit 2015-02-10 12:20:01 -08:00
Henry Ault
cde77dc068 MIT LICENSE 2015-02-10 12:19:37 -08:00
C. Guy Yarvin
045f862a84 Full test pathway. 2015-02-09 12:40:44 -08:00
C. Guy Yarvin
a3bb81f397 Check in some testing stuff. 2015-02-08 13:22:33 -08:00
C. Guy Yarvin
248d679367 Merge branch 'master' of https://github.com/urbit/urbit 2015-02-06 14:49:22 -08:00
Anton Dyudin
0bbb541e2c Merge branch 'master' into eyre-new
Conflicts:
	urb/zod/main/mar/psal/door.hook
2015-02-05 21:04:40 -08:00
Galen Wolfe-Pauly
3282c574c3 Merge branch 'master' of github.com:urbit/urbit-new 2015-02-04 14:59:40 -08:00
C. Guy Yarvin
73e0dcf33b Merge branch 'master' of https://github.com/urbit/urbit 2015-02-04 10:29:32 -08:00
Philip C Monk
6888ba9f95 performance 2015-02-02 19:50:45 -05:00
C. Guy Yarvin
5d707603c4 Fix out of memory on stack overflow. 2015-02-02 11:03:14 -08:00
Philip C Monk
f7455b7db8 deletion works 2015-01-30 19:40:07 -05:00
Anton Dyudin
1f73bb3fe4 Revert "License file" pending outside/ directory review
This reverts commit 6e28dcd7fa238fb70dda9a3b5598c3ae351152aa.
2015-01-29 18:38:13 -08:00
Anton Dyudin
1194bb48bf License file 2015-01-29 18:35:30 -08:00
Philip C Monk
28841a3e74 waypoint 2015-01-29 20:06:02 -05:00
Philip C Monk
1b5c21f4f4 working in/out 2015-01-29 14:47:51 -05:00
Anton Dyudin
656e7569f1 Merge branch 'test'
Conflicts:
	urb/urbit.pill
2015-01-29 11:17:01 -08:00
Philip C Monk
f86e6c4d35 waypoint 2015-01-28 20:28:10 -05:00
Galen Wolfe-Pauly
7bc732b14d Merge branch 'master' of github.com:urbit/urbit-new 2015-01-28 07:13:42 -08:00
Galen Wolfe-Pauly
7383228274 Merge pull request #249 from ShaneWilton/patch-1
Add cmake to the list of OS X dependencies
2015-01-28 07:06:30 -08:00
Shane Wilton
cc1a5a9cd7 Add cmake to the list of OS X dependencies 2015-01-28 00:24:23 -08:00
Philip C Monk
ab09e78a11 waypoint 2015-01-27 19:57:24 -05:00
Galen Wolfe-Pauly
01b4b95b49 Merge branch 'master' into test 2015-01-27 09:01:25 -08:00
Galen Wolfe-Pauly
0bc50d1302 Merge branch 'test' of github.com:urbit/urbit into test 2015-01-27 09:01:07 -08:00
Philip C Monk
efb39d2b40 Merge remote-tracking branch 'origin/test'
Conflicts:
	urb/urbit.pill
2015-01-27 00:28:33 -05:00
Galen Wolfe-Pauly
446d064b99 Merge branch 'test' of github.com:urbit/urbit-new into test 2015-01-26 17:59:52 -08:00