Commit Graph

6710 Commits

Author SHA1 Message Date
Anton Dyudin
2efd948bd9 Merge branch 'master' into mar-umd 2017-11-22 12:20:35 -08:00
Anton Dyudin
f6cdecb58b fix mar/umd 2017-11-20 12:30:53 -08:00
Anton Dyudin
a8fb0ed8f8 Merge branch 'mar-umd' into master 2017-11-20 11:17:39 -08:00
Anton Dyudin
04579db473 pass text metadata through verbatim 2017-11-20 11:01:35 -08:00
Matthew Levan
cd6141ff2e Merge branch 'master' of https://github.com/urbit/arvo 2017-11-17 11:40:14 -08:00
C. Guy Yarvin
bd17e5ece5 Rename ++twig to ++hoon. 2017-11-16 13:50:03 -08:00
C. Guy Yarvin
c7e73c22f9 Rename ++span to ++type. 2017-11-16 12:44:27 -08:00
Matthew Levan
8d0eca1c3a swap poja and pojo 2017-11-16 10:39:31 -08:00
C. Guy Yarvin
260c9a4479 Fix some names. 2017-11-14 14:55:05 -08:00
C. Guy Yarvin
8661c292ed Merge remote-tracking branch 'eglaysher/deco' 2017-11-14 13:24:55 -08:00
Elliot Glaysher
64787c8096 Partial %143-ization of deco. 2017-11-14 13:16:06 -08:00
Matthew Levan
f266eb9a2b restored codemirror 2017-11-14 13:06:17 -08:00
Anton Dyudin
ea39cb9421 update cram test suite for master 2017-11-13 18:45:53 -08:00
Anton Dyudin
5ef15d5fda remove disabled commonmark test case 2017-11-13 18:44:48 -08:00
Anton Dyudin
ee02ba804e add temporary .front extraction for .umd 2017-11-13 18:25:01 -08:00
Anton Dyudin
f5fbbb206a remove vast2 reference from test suite, update umd 2017-11-13 18:19:37 -08:00
Anton Dyudin
ab09057187 merge /+ vast2 changes into hoon.hoon 2017-11-13 18:02:40 -08:00
Anton Dyudin
8e641bd764 clean up ++twig "manx" forms 2017-11-13 17:59:44 -08:00
C. Guy Yarvin
5b5d28e219 Partial fixes. 2017-11-10 13:29:22 -08:00
C. Guy Yarvin
b19ba4df49 Merge branch 'master' of http://github.com/urbit/arvo 2017-11-09 11:04:27 -08:00
C. Guy Yarvin
dfff3f7d5c Clean up some comments. 2017-11-09 11:03:39 -08:00
Keaton Dunsford
c1afa035f9
Merge pull request #448 from mattlevan/master
/lib/old-zuse - Add ++lore, ++role and ++nule
2017-11-08 21:30:25 -08:00
Keaton Dunsford
7be64a77f4 /lib/old-zuse - Add ++role 2017-11-08 21:28:16 -08:00
C. Guy Yarvin
6c07aadb99 Remove random foos; sort profiler hit counter. 2017-11-06 19:13:06 -08:00
Matthew Levan
ec6c932396 Added lore and nule 2017-11-03 17:31:28 -07:00
Anton Dyudin
cdb1fffcca get lib/vast2 to bail-meme not explicily error 2017-11-01 11:47:09 -07:00
Anton Dyudin
53c00b1f7b Merge branch 'unmark-test' into mar-umd
fenced:cram will need to be tweaked
2017-11-01 11:46:40 -07:00
Anton Dyudin
d7b2ddf87b fix *&foo to actually be invokable 2017-10-31 13:24:51 -07:00
Anton Dyudin
68ec996c1e Revert "Merge remote-tracking branch 'origin/automount'"
This reverts commit 29158d9397, reversing
changes made to 57006281f2.
2017-10-31 13:23:54 -07:00
Anton Dyudin
b07abebb6d minor gen/ fixes 2017-10-31 13:00:34 -07:00
C. Guy Yarvin
6734fbf58b Merge markdown properly. 2017-10-31 12:50:21 -07:00
C. Guy Yarvin
835a0f4050 Merge remote-tracking branch 'oHaitch/merge-nozap' 2017-10-31 12:34:23 -07:00
C. Guy Yarvin
9db8213ff3 Correctly merge ++cram. 2017-10-31 11:27:54 -07:00
C. Guy Yarvin
291f5f17c8 Merge branch 'master' of https://github.com/urbit/arvo 2017-10-31 11:18:17 -07:00
Anton Dyudin
90136af200 fix automount 2017-10-31 11:15:16 -07:00
C. Guy Yarvin
b7c6567449 Merge branch 'master' of https://github.com/urbit/arvo 2017-10-31 11:08:07 -07:00
C. Guy Yarvin
d2a33d4028 Rename ++hoon to ++hoon-version. 2017-10-31 11:07:42 -07:00
Anton Dyudin
c396584886 Merge branch 'nozap' 2017-10-30 18:13:06 -07:00
Anton Dyudin
29158d9397 Merge remote-tracking branch 'origin/automount' 2017-10-30 17:05:45 -07:00
Anton Dyudin
57006281f2 Merge remote-tracking branch 'urbit/maint-20170614' 2017-10-30 17:05:17 -07:00
C. Guy Yarvin
32278ff153 Clean up some memory-eating junk. 2017-10-30 15:12:38 -07:00
C. Guy Yarvin
2a1fd3f2fe Clear some debug settings. 2017-10-30 10:48:56 -07:00
C. Guy Yarvin
c83bc5f700 Merge remote-tracking branch 'belisarius222/sec-fixes' 2017-10-26 15:47:31 -07:00
C. Guy Yarvin
334ab6086f Merge branch 'master' of http://github.com/urbit/arvo 2017-10-26 15:39:14 -07:00
Ted Blackman
dd93a904ee app/ask.hoon: fixed syntax error 2017-10-26 15:10:30 -07:00
Ted Blackman
1b98a083dc twitter app compiles 2017-10-26 15:10:30 -07:00
Ted Blackman
cd3bb9b1e0 fixed gmail app and lib/http.hoon 2017-10-26 15:10:30 -07:00
Ted Blackman
b886374fef fixed init-oauth2-google 2017-10-26 15:10:30 -07:00
Ted Blackman
8ffdab7b0e twitter compiles now. gets error 32 2017-10-26 15:10:30 -07:00
Ted Blackman
06dd438f82 slack works 2017-10-26 15:10:30 -07:00