urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-14 11:08:45 +03:00
Code Issues Packages Projects Releases Wiki Activity
2,290 Commits 768 Branches 10 Tags 215 MiB
31d3788115
Commit Graph

919 Commits

Author SHA1 Message Date
Philip C Monk
31d3788115 Merge remote-tracking branch 'origin/master' into typedclay 
Conflicts:
	urb/urbit.pill
	urb/zod/arvo/eyre.hoon
	urb/zod/arvo/hoon.hoon
	urb/zod/arvo/zuse.hoon
	urb/zod/main/app/poke/core.hook
	urb/zod/main/app/reboot/core.hook
	urb/zod/main/app/shell/core.hook
	urb/zod/main/app/tree/core.hook
 2015-03-05 18:27:07 -05:00
Philip C Monk
8777772efa basic userspace merge tool 2015-03-02 20:28:32 -05:00
Philip C Monk
0e024a009f move along, nothing to see here 2015-02-27 01:35:41 -05:00
Galen Wolfe-Pauly
c1fcc47513 talk in 2015-02-18 14:25:58 -08:00
Galen Wolfe-Pauly
261fcc9029 better snips 2015-02-17 12:53:06 -08:00
Anton Dyudin
f487f457ab sen disable 2015-02-06 12:56:21 -08:00
Anton Dyudin
4236ddf20d ++print refactoring 2015-02-06 12:46:30 -08:00
Anton Dyudin
55e6a1492e Backlog de-flop 2 2015-02-06 12:40:54 -08:00
Anton Dyudin
fd47960fc2 ++send cleaning 2015-02-06 12:32:18 -08:00
Anton Dyudin
a34f82f829 Fixed state erasure 2015-02-06 12:24:30 -08:00
Galen Wolfe-Pauly
886a91c15f need the psal garb 2015-02-04 17:23:47 -08:00
Galen Wolfe-Pauly
2bec93ba70 Merge branch 'master' of github.com:urbit/urbit-new 2015-02-04 14:59:40 -08:00
Galen Wolfe-Pauly
dde694b535 snips 2015-02-04 14:59:15 -08:00
Galen Wolfe-Pauly
b796b9d8e0 class -> className 2015-02-03 13:01:24 -08:00
Galen Wolfe-Pauly
1fee5836ee react mar 2015-01-30 18:02:40 -08:00
Anton Dyudin
8bbe811ad1 Curl utility 2015-01-29 18:36:00 -08:00
Galen Wolfe-Pauly
97e1eacfc0 Merge branch 'test' of github.com:urbit/urbit-new into test 2015-01-29 17:50:44 -08:00
Galen Wolfe-Pauly
26d26af927 react door 2015-01-29 17:50:35 -08:00
Anton Dyudin
db05158f71 Merge branch 'test' 
Conflicts:
	urb/urbit.pill
 2015-01-29 11:17:01 -08:00
Galen Wolfe-Pauly
51708dd145 begin de flopped 2015-01-28 07:13:30 -08:00
Anton Dyudin
b663c8974b Added :time 2015-01-27 22:27:35 -08:00
Galen Wolfe-Pauly
ea2ca20e25 Merge branch 'master' into test 2015-01-27 09:01:25 -08:00
Anton Dyudin
189c20d7db Twitter subscribing, surface tested via web UI 2015-01-27 00:19:18 -08:00
Anton Dyudin
e375adabb8 Merge branch 'test' of https://github.com/urbit/urbit into test 2015-01-26 22:21:30 -08:00
Anton Dyudin
8a8ff60aaa Tweet confirmations 2015-01-26 22:20:39 -08:00
Philip C Monk
2f9510f764 Merge remote-tracking branch 'origin/test' 
Conflicts:
	urb/urbit.pill
 2015-01-27 00:28:33 -05:00
Galen Wolfe-Pauly
1aada7b7c5 tweeted 2015-01-26 21:16:26 -08:00
Anton Dyudin
230eca3cc2 Merge branch 'test' of https://github.com/urbit/urbit into test 
Conflicts:
	urb/zod/main/app/rodeo/core.hook
 2015-01-26 20:41:06 -08:00
Philip C Monk
a73da6dbff bump protocol to 1 2015-01-26 23:38:19 -05:00
Anton Dyudin
5de6646f9f Cleaned ~& to ~| 2015-01-26 20:35:03 -08:00
Anton Dyudin
f00f2a744e Posting tweets 2015-01-26 20:30:22 -08:00
C. Guy Yarvin
a441475a9a Syntax change. 2015-01-26 20:12:06 -08:00
Anton Dyudin
83007d6c30 Added discrimination per commanding twitter user 2015-01-26 19:43:38 -08:00
Anton Dyudin
3431844d94 Factored out structures 2015-01-26 19:11:08 -08:00
C. Guy Yarvin
a1fd3597e6 Turn off gall queue management, temporarily. 2015-01-26 18:54:14 -08:00
Galen Wolfe-Pauly
ec76d6a3cb Merge branch 'test' of github.com:urbit/urbit-new into test 2015-01-26 17:59:52 -08:00
Galen Wolfe-Pauly
10f447ef13 various talking and improvements 2015-01-26 17:59:39 -08:00
C. Guy Yarvin
b4d51eebe4 Improved friend handling. 2015-01-26 17:55:01 -08:00
Anton Dyudin
ed616d5055 Merge branch 'test' of https://github.com/urbit/urbit into test 2015-01-26 16:36:19 -08:00
Anton Dyudin
04594ceda9 Chatook 2015-01-26 16:36:09 -08:00
C. Guy Yarvin
e4cfbaba47 Broke some stuff. 2015-01-26 16:27:59 -08:00
C. Guy Yarvin
8c0e89949b Stage down to 163. 2015-01-26 16:25:27 -08:00
Galen Wolfe-Pauly
2ba05992ae talk 2015-01-26 14:47:18 -08:00
C. Guy Yarvin
1ebd16fd2a Various fixes and improvements. 2015-01-26 14:41:24 -08:00
C. Guy Yarvin
0e6434f3ee Merge branch 'test' of https://github.com/urbit/urbit into test 2015-01-26 14:31:06 -08:00
C. Guy Yarvin
353ff78e34 Various fixes. 2015-01-26 14:31:00 -08:00
Anton Dyudin
c1c4b3b75a Merge branch 'test' of https://github.com/urbit/urbit into test 
Conflicts:
	urb/urbit.pill
 2015-01-26 14:12:50 -08:00
Anton Dyudin
52c26318fe ^X fix, flit cleaning 2015-01-26 13:53:35 -08:00
C. Guy Yarvin
36bfe2ab63 Fix general unsubscribe. 2015-01-26 12:54:45 -08:00
C. Guy Yarvin
335cb42764 Fix bad merge. 2015-01-26 09:44:09 -08:00