Commit Graph

29 Commits

Author SHA1 Message Date
Philip C Monk
b793d72121 Merge remote-tracking branches 'ray/fixlore', 'my/loremark', 'my/fancy-autoreload' and 'my/fixmerge' 2016-01-13 16:22:51 -05:00
Philip C Monk
d369819b1d default case correctly in |merge
also, get rid of extra ~& in kiln
2016-01-13 15:11:25 -05:00
Philip C Monk
c48f26ce7d autoreload sanely 2016-01-12 16:20:57 -05:00
Raymond Pasco
cde64c834d Merge remote-tracking branch 'philipcmonk/cy-without-hash'
Conflicts:
	urb/urbit.pill

Clay arcana (%cy to faster %cz)
2016-01-11 10:57:30 -05:00
Philip C Monk
9725cf492a forgot a urb/zod/lib/kiln.hoony -> urb/zod/lib/kiln.hoonz 2016-01-09 18:41:05 -05:00
Philip C Monk
0bbae7e679 split %cy hash out into %cz 2016-01-07 18:54:42 -05:00
Philip C Monk
368d07de77 add |track and case option for |merge 2016-01-06 17:16:26 -05:00
Anton Dyudin
6c0d8ec6bf fix #634 gall |mass, kiln |mv 2015-12-07 14:20:11 -08:00
Philip C Monk
6d8cf6dbc9 repetitive reloading 2015-09-25 20:23:06 -04:00
Philip C Monk
417dda3aaf Merge remote-tracking branches 'anton/nobreach' and 'my/clayhammer' into test
Conflicts:
	urb/urbit.pill
2015-09-21 14:58:10 -04:00
Philip C Monk
646fa7cf14 :+merge -> |merge 2015-09-17 19:20:07 -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
Anton Dyudin
610cf1b95f clean up pre-ford-refactor shims 2015-09-16 13:57:24 -07:00
Philip C Monk
3bfe641b1c added |cancel 2015-09-15 20:24:44 -04:00
Philip C Monk
73a5596168 %init doesn't require new desk 2015-09-10 20:25:27 -04:00
Philip C Monk
13a01c3e36 merge from commit rather than desk 2015-09-09 17:08:10 -04:00
Philip C Monk
d0389ec2c1 reworked ++ankh and ++soba 2015-09-05 21:14:00 -04:00
Anton Dyudin
8ee93321de qualified library names in userspace 2015-09-03 17:14:34 -04:00
Anton Dyudin
4d33d5dc6e cosmetic clean up 2015-07-27 15:39:36 -07:00
Anton Dyudin
812beba523 liberalize xml parser re:attributes, fix blog examples 2015-07-22 14:53:54 -07:00
Anton Dyudin
e8ca900ad6 aesthetic improvement 2015-07-13 17:46:37 -07:00
Philip C Monk
12f85a2161 reverted a couple of changes 2015-07-13 17:17:03 -04:00
Anton Dyudin
d03e1df1be changed silk structure 2015-07-10 11:51:47 -07:00
Anton Dyudin
8435b965e3 reorder ++mash interface, fix %clay/kiln usage of such 2015-07-08 16:45:17 -07:00
Anton Dyudin
1c57c4d4f5 updated %ford silk interface as per specification 2015-07-07 10:34:21 -07:00
Anton Dyudin
e7b7a80a7f added |label, don't disconnect from dojo when blocked 2015-06-24 11:55:42 -07:00
Philip C Monk
51d93691d8 put back in autosync succeded message 2015-06-19 18:14:19 -04:00
Philip C Monk
72ef5c2cbd urb/zod/base -> urb/zod 2015-06-19 17:16:48 -04:00