urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-14 20:02:51 +03:00
Code Issues Packages Projects Releases Wiki Activity
2,081 Commits 768 Branches 10 Tags 215 MiB
c385868c3f
Commit Graph

2081 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
C. Guy Yarvin
c385868c3f Merge branch 'radio' of https://github.com/urbit/urbit into radio 
Conflicts:
	urb/zod/main/app/talk/core.hook
 2015-01-01 12:44:51 -08:00
C. Guy Yarvin
6c4ddb45d7 Various fixes and improvements. 2015-01-01 12:43:50 -08:00
Philip C Monk
45d47f786b remove printfs 2014-12-18 21:09:37 -05:00
C. Guy Yarvin
34480db199 Helpful message 2014-12-18 17:45:25 -08:00
Philip C Monk
675a9f34e8 cleanup 2014-12-18 20:33:21 -05:00
Philip C Monk
754d0b73eb import old state from jamfile 2014-12-18 18:28:26 -05:00
Philip C Monk
57d25ecbf6 Merge branch 'radio' of https://github.com/urbit/urbit into radio 2014-12-18 18:02:12 -05:00
Philip C Monk
4dbe7c698b Revert "adapter code" 
This reverts commit 11668f6060d2cf210d95d8d9a1925a0c0b7a928f.
 2014-12-18 17:59:59 -05:00
Philip C Monk
649f5a804d adapter code 2014-12-18 17:59:41 -05:00
C. Guy Yarvin
8de5c34b6a Merge branch 'master' into radio 2014-12-18 11:10:09 -08:00
C. Guy Yarvin
bd9c796397 Merge branch 'master' into radio 
Conflicts:
	urb/urbit.pill
 2014-12-18 11:04:23 -08:00
C. Guy Yarvin
b45c307e86 Remove twitter. 2014-12-18 10:43:07 -08:00
C. Guy Yarvin
62b5dc78e6 Various fixes and improvements. 2014-12-18 10:37:36 -08:00
C. Guy Yarvin
71890f0020 Rodeo is radio. 2014-12-17 18:46:05 -08:00
C. Guy Yarvin
edef98f508 Rename rodeo to radio. 2014-12-17 18:34:40 -08:00
C. Guy Yarvin
96b65e4f91 Merge branch 'radio' of https://github.com/urbit/urbit into radio 
Conflicts:
	urb/zod/main/app/rodeo/core.hook
 2014-12-17 18:30:11 -08:00
C. Guy Yarvin
1a6b6bd3a2 Various fixes and improvements. 2014-12-17 18:29:32 -08:00
Philip C Monk
8bce45ea6b Merge branch 'radio' of https://github.com/urbit/urbit into radio 2014-12-17 19:23:01 -05:00
Philip C Monk
ee81f83526 make disable chat 2014-12-17 19:22:15 -05:00
Philip C Monk
4371a216d1 radio->rodeo state conversion 2014-12-17 19:01:35 -05:00
Galen Wolfe-Pauly
865f760fd5 Merge branch 'radio' of github.com:urbit/urbit-new into radio 
it-new into radio
 2014-12-17 15:48:34 -08:00
Galen Wolfe-Pauly
1325c04d4f hear 2014-12-17 15:48:09 -08:00
C. Guy Yarvin
c182e9d6bc Fix. 2014-12-17 15:44:07 -08:00
C. Guy Yarvin
cf3b639eda Various fixes. 2014-12-17 15:40:43 -08:00
C. Guy Yarvin
abf481c069 Eyre. 2014-12-17 13:49:40 -08:00
Galen Wolfe-Pauly
3f5a20b3cf Merge branch 'radio' of github.com:urbit/urbit-new into radio 2014-12-17 13:40:25 -08:00
Galen Wolfe-Pauly
5e7699e986 pings 2014-12-17 13:40:17 -08:00
C. Guy Yarvin
0e6a3dc1f1 Merge branch 'radio' of https://github.com/urbit/urbit into radio 2014-12-17 13:38:02 -08:00
C. Guy Yarvin
22e5d78c7e Moar printf 2014-12-17 13:37:14 -08:00
Galen Wolfe-Pauly
a186d15aa5 Merge branch 'radio' of github.com:urbit/urbit-new into radio 2014-12-17 12:40:14 -08:00
Philip C Monk
83c8d0c278 Merge branch 'radio' of https://github.com/urbit/urbit into radio 2014-12-17 15:38:38 -05:00
Philip C Monk
3eff4d6c2c spam back terminal input 2014-12-17 15:38:23 -05:00
Galen Wolfe-Pauly
c647846d05 Merge branch 'radio' of github.com:urbit/urbit-new into radio 2014-12-17 12:34:55 -08:00
C. Guy Yarvin
ba09dbf845 Merge branch 'radio' of https://github.com/urbit/urbit into radio 2014-12-17 11:41:01 -08:00
C. Guy Yarvin
a0b511f5e8 Merge branch 'radio' of https://github.com/urbit/urbit into radio 
Conflicts:
	urb/zod/main/app/talk/core.hook
 2014-12-17 11:40:27 -08:00
Philip C Monk
c32ccf9f37 have :ls kill itself after it's finished 2014-12-17 14:00:40 -05:00
Philip C Monk
6f96f05dc8 have :ls kill itself after it's finished 2014-12-17 13:59:33 -05:00
C. Guy Yarvin
2f6449503a Various fixes and improvements. 2014-12-17 10:05:38 -08:00
Philip C Monk
9e55c9d245 Merge branch 'radio' of https://github.com/urbit/urbit into radio 2014-12-16 21:08:10 -05:00
Philip C Monk
ebac53c3a3 stubbed out input-tracking in talk 2014-12-16 21:07:50 -05:00
Anton Dyudin
301e272bba Merge branch 'radio' of https://github.com/urbit/urbit into radio 2014-12-16 17:33:21 -08:00
Anton Dyudin
de2f92ebdb Radio export first draft 2014-12-16 17:33:08 -08:00
Philip C Monk
0d49326235 fix startup errors 2014-12-16 20:31:03 -05:00
Galen Wolfe-Pauly
abe70600df parsing dates and empty path 2014-12-16 17:19:06 -08:00
Anton Dyudin
c1b0449123 unsubscribe thus 2014-12-16 16:42:25 -08:00
C. Guy Yarvin
a807f8e716 Fix find-limb.$. 2014-12-16 16:36:45 -08:00
C. Guy Yarvin
197a79f626 Merge branch 'radio' of https://github.com/urbit/urbit into radio 
Conflicts:
	urb/zod/main/mar/radio-report/door.hook
 2014-12-16 16:12:06 -08:00
C. Guy Yarvin
9addc7d04e Various fixes. 2014-12-16 16:03:49 -08:00
Anton Dyudin
db08537b9d Merge branch 'radio' of https://github.com/urbit/urbit into radio 2014-12-16 16:03:27 -08:00
Anton Dyudin
8b386c5711 radio-report comment 2014-12-16 16:03:08 -08:00