urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-15 12:43:31 +03:00
Code Issues Packages Projects Releases Wiki Activity
2,300 Commits 768 Branches 10 Tags 215 MiB
5f08f67e54
Commit Graph

2300 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anton Dyudin
db05158f71 Merge branch 'test' 
Conflicts:
	urb/urbit.pill
 2015-01-29 11:17:01 -08:00
Galen Wolfe-Pauly
7374ea3a96 Merge branch 'master' of github.com:urbit/urbit-new 2015-01-28 07:13:42 -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
Anton Dyudin
9cdab44c9b Eyre js auth redirect: req script under /gop, get window.location change 2015-01-27 12:21:43 -08:00
Galen Wolfe-Pauly
ea2ca20e25 Merge branch 'master' into test 2015-01-27 09:01:25 -08:00
Galen Wolfe-Pauly
73bbefdb6f Merge branch 'test' of github.com:urbit/urbit into test 2015-01-27 09:01:07 -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
Anton Dyudin
63329c7b05 Merge branch 'master' into test 
Conflicts:
	urb/urbit.pill
	urb/zod/arvo/eyre.hoon
 2015-01-26 15:55:53 -08:00
Anton Dyudin
15f7641339 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
50f19ec56f eyre double-unsub hackaround 2015-01-26 15:30:50 -08:00
Anton Dyudin
205d1868ec Type printer crash fix 2015-01-26 15:24:31 -08:00
Galen Wolfe-Pauly
2ba05992ae talk 2015-01-26 14:47:18 -08:00
Galen Wolfe-Pauly
b39b85009d Merge branch 'test' of github.com:urbit/urbit-new into test 2015-01-26 14:44:02 -08:00
Galen Wolfe-Pauly
441393137a eyre change 2015-01-26 14:43:47 -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
cc07287e80 Merge branch 'test' of https://github.com/urbit/urbit into test 
Conflicts:
	urb/urbit.pill
 2015-01-26 12:55:52 -08:00
C. Guy Yarvin
36bfe2ab63 Fix general unsubscribe. 2015-01-26 12:54:45 -08:00
Anton Dyudin
db5fd67914 fel:stab, fel:pick 2015-01-26 11:15:35 -08:00
C. Guy Yarvin
335cb42764 Fix bad merge. 2015-01-26 09:44:09 -08:00
Anton Dyudin
c9caa1538e 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
bfe432e189 Merge branch 'test' of https://github.com/urbit/urbit into test 2015-01-25 20:49:39 -08:00
C. Guy Yarvin
1c2eba7d4d Merge branch 'test' of https://github.com/urbit/urbit into test 
Conflicts:
	urb/urbit.pill
 2015-01-25 17:39:37 -08:00
C. Guy Yarvin
920754ad61 Various fixes and improvements. 2015-01-25 17:38:03 -08:00
Anton Dyudin
ae6f7b430c Added since-id 2015-01-24 18:06:10 -08:00
Anton Dyudin
b6336209a9 Cache statuses 2015-01-24 17:48:41 -08:00
Anton Dyudin
30d47b9a6b Commented interfaces, printf removal 2015-01-24 15:06:52 -08:00