ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-15 10:02:47 +03:00
Code Issues Packages Projects Releases Wiki Activity
3,747 Commits 6 Branches 0 Tags 164 MiB
f60edac580
Commit Graph

3747 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Philip C Monk
f60edac580 Merge branch 'pending' into test 2015-09-11 17:19:16 -04: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
Philip C Monk
f6414086ef Merge branch 'workfix' into test 
Conflicts:
	urb/zod/ape/dojo.hoon
 2015-09-11 15:15:11 -04:00
Philip C Monk
73a5596168 %init doesn't require new desk 2015-09-10 20:25:27 -04: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
Raymond Pasco
0530189fbc Merge branch 'yebyen-patchset' into test 2015-09-10 18:00:37 -04:00
Philip C Monk
16cb3f3961 pull marks from correct ships 2015-09-10 17:49:22 -04:00
Philip C Monk
5531d8597b Merge branch 'master' into test 2015-09-10 14:39:24 -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
382b2ded7d Merge remote-tracking branch 'yebyen/master' into test 2015-09-10 07:10:36 -04: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
Philip C Monk
30e1b9e9a4 fix comment ownership 2015-09-08 19:32:17 -04:00
Anton Dyudin
1b10c2e204 fixed dojo for updated ford interface 2015-09-08 19:32:17 -04:00
Anton Dyudin
c68611b45f infer .^ twig mark 2015-09-08 14:05:40 -07:00
Philip C Monk
13f5969f04 add counter to work subscription 2015-09-08 16:41:08 -04: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
vere
9b6a787a05 Merge branch 'pending' of https://github.com/urbit/urbit into pending 2015-09-08 19:24:45 +00:00
vere
a3a93b6dac fix crash 2015-09-08 19:24:31 +00:00
Philip C Monk
d0389ec2c1 reworked ++ankh and ++soba 2015-09-05 21:14:00 -04:00
Philip C Monk
584dc5e9a9 fixed some bugs 2015-09-04 20:15:05 -04:00
Anton Dyudin
d051e2347a cosmetic multiline display change 2015-09-03 18:40:30 -07:00
Anton Dyudin
4f23f1b391 Merge branch 'nobreach' into pending 2015-09-03 18:33:50 -07:00
Anton Dyudin
7c73a9733f libraries and structures 2015-09-03 18:33:34 -07:00
Anton Dyudin
f537cd1ba0 Merge branch 'nobreach' into pending 2015-09-03 16:19:58 -07:00
Anton Dyudin
4e554b4494 reset after a dojo crash, just maybe fixing #295 2015-09-03 16:19:25 -07:00
Anton Dyudin
d9eca53958 dojo restart, variables, file writing 2015-09-03 16:17:34 -07:00
Anton Dyudin
5c47efdd29 multiline, tall expressions 2015-09-03 15:10:18 -07:00
Philip C Monk
490798b908 disallow multiple simultaneous merges to same desk 2015-09-03 17:14:35 -04:00