Commit Graph

1983 Commits

Author SHA1 Message Date
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
Anton Dyudin
ae301b32b9 Merge branch 'test' of https://github.com/urbit/urbit into test 2015-01-26 16:36:19 -08:00
C. Guy Yarvin
b568763116 Stage down to 163. 2015-01-26 16:25:27 -08:00
Anton Dyudin
af3e9e9818 Merge branch 'master' into test
Conflicts:
	urb/urbit.pill
	urb/zod/arvo/eyre.hoon
2015-01-26 15:55:53 -08:00
Anton Dyudin
28d1fc478c Revert "Breach compatibility rc2", "Revert "Tile %smsm, replaced instance in ames with ++hard call""
This reverts commit 66e94bd04b9333fd7cdafaacc1714d69b3cab059.
This reverts commit d3ac409e27bafe7fc2074be71eaf86a6d97f887c.
2015-01-26 15:44:58 -08:00
Anton Dyudin
d49569ac21 Merge branch 'exec' into test
Conflicts:
	urb/zod/main/app/shell/core.hook
	urb/zod/main/app/terminal/core.hook
2015-01-25 21:29:21 -08:00
Anton Dyudin
ad63f76568 Merge branch 'test' of https://github.com/urbit/urbit into test 2015-01-25 20:49:39 -08:00
C. Guy Yarvin
4e72941101 Merge branch 'test' of https://github.com/urbit/urbit into test
Conflicts:
	urb/urbit.pill
2015-01-25 17:39:37 -08:00
Philip C Monk
a1ef36e02d start in/out split 2015-01-23 19:13:29 -05:00
Philip C Monk
5e74c7286b Merge remote-tracking branch 'origin/master' into typedclay
Conflicts:
	urb/urbit.pill
2015-01-23 14:39:41 -05:00
Anton Dyudin
d444e244af Merge branch 'test' of https://github.com/urbit/urbit into test
Conflicts:
	urb/urbit.pill
2015-01-22 14:16:19 -08:00
C. Guy Yarvin
2b06b7f497 Merge branch 'test' of https://github.com/urbit/urbit into test
Conflicts:
	urb/urbit.pill
2015-01-22 14:01:39 -08:00
Anton Dyudin
f081dd273f Twitter daemon v1: auth, tweeting 2015-01-21 19:31:40 -08:00
Philip C Monk
75c6647475 boots again 2015-01-21 20:47:49 -05:00
Anton Dyudin
c622ac2513 Revert "Tile %smsm, replaced instance in ames with ++hard call"
Kept the %ames part.
This reverts commit 3dcf69e125a12518e6d0d30a50e3ef79d8819048.

Conflicts:
	urb/urbit.pill
	urb/zod/arvo/hoon.hoon
	urb/zod/main/app/bang/core.hook
	urb/zod/main/app/cat/core.hook
2015-01-17 13:57:55 -08:00
Philip C Monk
0f2db4bd57 Merge branch 'master' into typedclay
Conflicts:
	urb/urbit.pill
	urb/zod/arvo/ford.hoon
	urb/zod/main/app/cat/core.hook
	urb/zod/main/app/ls/core.hook
	urb/zod/main/app/reload/core.hook
	urb/zod/main/app/shell/core.hook
	urb/zod/main/app/solid/core.hook
2015-01-15 16:21:11 -05:00
Philip C Monk
938e01bc00 waypoint 2015-01-15 15:57:13 -05:00
Anton Dyudin
e45aa0ff83 Merge branch 'master' into exec 2015-01-15 12:05:36 -08:00
C. Guy Yarvin
fb2afb4417 Merge branch 'radio'
Conflicts:
	urb/urbit.pill
	urb/zod/arvo/hoon.hoon
	urb/zod/main/app/talk/core.hook
2015-01-15 12:02:28 -08:00
C. Guy Yarvin
8a4ab744eb Memory and other optimizations. 2015-01-15 11:10:29 -08:00
Anton Dyudin
58680f441d Merge branch 'auth', by extension pony2 and all associated refactoring.
Conflicts:
	urb/urbit.pill
	urb/zod/arvo/hoon.hoon
2015-01-14 19:47:05 -08:00
Philip C Monk
ba4f951dfd boots to terminal, then hangs 2015-01-14 19:01:59 -05:00
Anton Dyudin
413a1be805 Further ~? tweaking 2015-01-14 15:18:03 -08:00
Anton Dyudin
8f3ca6d4e3 sgbr was broken due to nonconforming jet 2015-01-13 22:22:39 -08:00
Philip C Monk
94138294d0 boots now (sort of) 2015-01-13 20:58:25 -05:00
Anton Dyudin
d50d625efa Sidestream sgwt 2015-01-13 14:13:08 -08:00
C. Guy Yarvin
b2dc513d6a Add cache to ++song, etc. 2015-01-12 17:49:31 -08:00
cgyarvin
456a743a2c Merge pull request #239 from mrdomino/master
Fix de:aesc jet
2015-01-11 15:36:23 -08:00
Steven Dee
0ed41f88a3 Fix de:aesc jet 2015-01-10 00:21:50 -05:00
Philip C Monk
d0b48313de waypoint 2015-01-09 17:11:43 -05:00
Anton Dyudin
f84ace5c8a Tile %smsm, replaced instance in ames with ++hard call 2015-01-08 16:10:31 -08:00
C. Guy Yarvin
7a61f3aaa8 About to do some performance testing. 2015-01-07 13:26:05 -08:00
C. Guy Yarvin
d603e9f310 Various fixes and improvements. 2015-01-06 17:27:02 -08:00
C. Guy Yarvin
e3ae2b038c Don't assert on crude delivery fail. 2014-12-30 16:58:34 -05:00
Galen Wolfe-Pauly
0d80cccec9 back to :chat for now 2014-12-28 13:08:15 -08:00
vere
d64783232b Merge branch 'master' of https://github.com/urbit/urbit 2014-12-20 02:46:06 +00:00