Commit Graph

3759 Commits

Author SHA1 Message Date
Philip C Monk
06bda9cd8c fixed lose-changes-when-unrelated-conflict bug 2015-09-18 20:15:36 -04:00
Philip C Monk
0bfa034edb added clay architecture doc 2015-09-18 16:45:09 -04:00
Philip C Monk
646fa7cf14 :+merge -> |merge 2015-09-17 19:20:07 -04:00
Philip C Monk
5de171f23d RIP %indirect 2015-09-16 19:45:54 -04:00
Philip C Monk
a84fb403f6 turn off autoload with |autoload 2015-09-16 19:40:53 -04:00
Philip C Monk
aaa9022a48 autoreload and autoreset 2015-09-16 18:39:11 -04:00
Philip C Monk
3bfe641b1c added |cancel 2015-09-15 20:24:44 -04:00
Philip C Monk
852bd5a202 Merge branch 'master' into clayhammer 2015-09-15 19:16:09 -04:00
Philip C Monk
a4634d96f1 Merge remote-tracking branch 'anton/nobreach' into pending 2015-09-11 20:39:24 -04:00
Anton Dyudin
e22d13c6a6 curl generator example 2015-09-11 17:36:52 -07:00
Philip C Monk
77eb638240 merge clay card-sending pathways 2015-09-11 20:27:32 -04:00
Anton Dyudin
1755179ce3 rename generators to %say, %ask, %get 2015-09-11 17:24:51 -07:00
Anton Dyudin
81eeb6714e fix url grab 2015-09-11 17:07:50 -07:00
Anton Dyudin
ecfefc1a9a more conservative dy-no-prompt 2015-09-11 15:52:37 -07:00
Anton Dyudin
56bbfa7eea support %pig scrapers 2015-09-11 15:46:16 -07:00
Anton Dyudin
d291d0b59e separate mark %as and gate-application %do 2015-09-11 15:00:20 -07:00
Anton Dyudin
0964b3fd6d cat/dog to gen collapse 2015-09-11 15:00:11 -07:00
Philip C Monk
c970aeeec2 Merge branch 'hotfix-doc-runes' of https://github.com/juped/urbit into pending 2015-09-11 17:09:46 -04:00
Raymond Pasco
e58446f0bd Update rune doc ford page to use lib namespace 2015-09-11 16:59:49 -04:00
Anton Dyudin
05e37b73b6 extensible urb.onupdate 2015-09-11 12:20:19 -07:00
Anton Dyudin
86a423b4d4 better mark type handling 2015-09-11 10:54:28 -07:00
Philip C Monk
73a5596168 %init doesn't require new desk 2015-09-10 20:25:27 -04:00
Anton Dyudin
3251e471b4 POST/PUT dojo sink 2015-09-10 16:05:43 -07:00
Philip C Monk
6c6f336a38 Merge branch 'clayhammer' 2015-09-10 18:39:00 -04:00
Philip C Monk
f75b8a1370 change some our's to her's 2015-09-10 18:37:19 -04:00
Philip C Monk
16cb3f3961 pull marks from correct ships 2015-09-10 17:49:22 -04:00
Philip C Monk
e6c6940ced Merge remote-tracking branch 'origin/pending' 2015-09-10 14:35:43 -04:00
Anton Dyudin
a5f5e08d70 dojo prep hotfix 2015-09-10 11:20:56 -07:00
Philip C Monk
6b9f0dca74 Merge remote-tracking branch 'origin/pending' 2015-09-10 14:00:14 -04:00
Anton Dyudin
260574678e Merge branch 'pending' of https://github.com/urbit/urbit into pending 2015-09-10 10:28:03 -07:00
Anton Dyudin
ec152b63a2 talk fix 2015-09-10 10:27:52 -07:00
Raymond Pasco
ee9d1d44cd Merge remote-tracking branch 'yebyen/master' into pending 2015-09-10 07:10:12 -04:00
Anton Dyudin
33cf1b1dc7 Merge branch 'nobreach' into pending 2015-09-09 18:15:04 -07:00
Anton Dyudin
fecb09a056 directory handling 2015-09-09 18:12:43 -07:00
Anton Dyudin
fe394ed19b Merge branch 'nobreach' into pending 2015-09-09 16:54:34 -07:00
Anton Dyudin
8a75474268 Merge branch 'pending' into nobreach 2015-09-09 16:53:46 -07:00
Anton Dyudin
31a8dcaedb better variable handling 2015-09-09 16:53:06 -07:00
Philip C Monk
3eda55bee3 Merge branch 'pending' 2015-09-09 19:17:40 -04:00
Philip C Monk
5a71800fb8 Merge branch 'clayhammer' into pending
Conflicts:
	urb/urbit.pill
	urb/zod/ape/dojo.hoon
	urb/zod/arvo/zuse.hoon
	urb/zod/lib/drum.hoon
	urb/zod/lib/helm.hoon
	urb/zod/lib/kiln.hoon

Also bumped protocol to 4
2015-09-09 19:15:26 -04:00
Anton Dyudin
8becbe80a4 variables, filters, prettier parsers 2015-09-09 15:57:25 -07:00
Philip C Monk
abdee41b41 Merge branch 'master' into pending 2015-09-09 17:32:49 -04:00
Philip C Monk
10d91a0c4d Merge remote-tracking branch 'origin/test' into pending 2015-09-09 17:32:02 -04:00
Anton Dyudin
0061772392 Merge branch 'nobreach' into pending 2015-09-09 14:20:39 -07:00
Philip C Monk
13a01c3e36 merge from commit rather than desk 2015-09-09 17:08:10 -04:00
Anton Dyudin
bf5332ae96 show GET headers 2015-09-09 13:59:28 -07:00
Anton Dyudin
3c2d4e67c8 abstract defer-to-++he pattern 2015-09-08 17:14:21 -07:00
Anton Dyudin
4c4886f149 GET urls +http://example.com 2015-09-08 16:58:48 -07:00
Anton Dyudin
c68611b45f infer .^ twig mark 2015-09-08 14:05:40 -07:00
Anton Dyudin
92e0ffb3d6 fixed dojo for updated ford interface 2015-09-08 13:39:53 -07:00
Anton Dyudin
cdc47047d7 Merge branch 'pending' into test 2015-09-08 13:28:15 -07:00