Commit Graph

2097 Commits

Author SHA1 Message Date
vere
a81f60ce7e Merge branch 'master' of https://github.com/urbit/urbit 2014-12-20 02:45:31 +00:00
vere
ec2242839e Merge branch 'master' of https://github.com/urbit/urbit 2014-12-20 02:40:19 +00:00
Anton Dyudin
a01f34f9d4 Pulled old radio from history 2014-12-19 18:31:43 -08:00
C. Guy Yarvin
d8904cc9d9 Merge branch 'master' of https://github.com/urbit/urbit 2014-12-19 11:25:40 -08:00
cgyarvin
29a569fb1a Merge pull request #224 from gkelly/no-error-unused-result
Ignore unused return values for functions that care.
2014-12-19 11:09:27 -08:00
Galen Wolfe-Pauly
613188d44c Merge branch 'master' of github.com:urbit/urbit-new 2014-12-19 11:09:17 -08:00
Galen Wolfe-Pauly
e727ab8d87 unsubscribe correctly 2014-12-19 11:03:01 -08:00
C. Guy Yarvin
a8d024dc3e Merge branch 'master' of https://github.com/urbit/urbit 2014-12-19 11:02:06 -08:00
C. Guy Yarvin
9b61bd7388 Continuity breach to protocol 7. 2014-12-19 11:00:08 -08:00
Galen Wolfe-Pauly
da4c7cf7df longer timer 2014-12-19 10:52:14 -08:00
Philip C Monk
0adc4eb45b bump ping time in :talk 2014-12-18 23:33:17 -05:00
Galen Wolfe-Pauly
3dc6ece88b attr width 2014-12-18 20:03:30 -08:00
Galen Wolfe-Pauly
99e6f0fb0b back off ping 2014-12-18 19:42:34 -08:00
Galen Wolfe-Pauly
c83f823c37 chat should be radio 2014-12-18 19:11:21 -08:00
Philip C Monk
125119ba8d bump protocol to 6 2014-12-18 21:15:39 -05:00
Philip C Monk
229588a785 Merge branch 'radio'
Conflicts:
	Makefile
2014-12-18 21:15:27 -05:00
Philip C Monk
45d47f786b remove printfs 2014-12-18 21:09:37 -05:00
Philip Monk
66730ec2f7 Merge pull request #222 from gkelly/cide-everywhere
Make short-lived apps %cide.
2014-12-18 18:08:07 -08: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
Garret Kelly
10422be164 Make short-lived apps %cide. 2014-12-18 22:58:15 +00: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