Commit Graph

245 Commits

Author SHA1 Message Date
Anton Dyudin
9f74a8d19a Merge branch 'clean-ford' into unspam 2017-11-01 15:44:05 -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
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
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
334ab6086f Merge branch 'master' of http://github.com/urbit/arvo 2017-10-26 15:39:14 -07:00
Anton Dyudin
71550b0bfd Revert "Merge branch 'jaelwomb' into cc-release"
(jael doesn't exist yet)

This reverts commit 13bc8ea59f, reversing
changes made to c232f670be.
2017-10-26 13:59:49 -07:00
Anton Dyudin
a1a200d793 Merge branches 'tarpam' and 'eyreunlearn' 2017-10-25 17:47:54 -07:00
Anton Dyudin
b041f70520 Revert "Merge branch 'eyrelearning' into cc-release"
This reverts commit 1365c178df, reversing
changes made to 278641b6c7.
2017-10-25 16:20:22 -07:00
C. Guy Yarvin
6390ea6464 Revert 143ization of %zuse. 2017-10-25 14:20:56 -07:00
C. Guy Yarvin
9f03be0e81 Remove redo printfs. 2017-10-25 14:20:43 -07:00
C. Guy Yarvin
7df058dd6f Reset %zuse pre 143. 2017-10-24 19:04:45 -07:00
C. Guy Yarvin
7b016c9c4f Merge branch 'master' of http://github.com/urbit/arvo 2017-10-24 17:16:21 -07:00
C. Guy Yarvin
9d516c7345 %zuse to 143; some fixes. 2017-10-24 16:50:11 -07:00
Fang
684ae0b3dc Fix small issue in ++op:dejs-soft:format when calling ++my:nl
Fixes #444
2017-10-25 00:16:26 +02:00
C. Guy Yarvin
808911d948 Fully 143-ize %ames. 2017-10-23 22:17:38 -07:00
C. Guy Yarvin
bf818adf09 Correct previous commit. 2017-10-23 21:48:07 -07:00
C. Guy Yarvin
7540a7605d Make , mode-switching syntax symmetrical. 2017-10-23 20:52:08 -07:00
Anton Dyudin
b7193da158 fix core pretty-printing 2017-10-23 15:09:26 -07:00
C. Guy Yarvin
4018c1b571 More syntax fixes; add , prefix for handmade pattern 2017-10-23 14:41:27 -07:00
C. Guy Yarvin
d2a1d2ea11 Revert. 2017-10-22 15:47:53 -07:00
C. Guy Yarvin
ab5fb62484 Various fixes and imprevements. 2017-10-22 15:46:07 -07:00
C. Guy Yarvin
d9dafeafc7 Remove spurious ++care. 2017-10-19 17:47:24 -07:00
C. Guy Yarvin
640632279f Merge branch 'master' of http://github.com/urbit/arvo 2017-10-19 10:37:09 -07:00
C. Guy Yarvin
8b727d48ca Fix |reset. 2017-10-19 10:36:53 -07:00
Anton Dyudin
6395acc935 fix ++sein not to hard-code ~zod
(cherry picked from commit 92158ba5ce9c35a42ba725020007c8b992d16ca5)
2017-10-18 15:05:27 -07:00
C. Guy Yarvin
6df5e754fa Fix some minor syntax bugs 2017-10-18 12:55:02 -07:00
C. Guy Yarvin
363d0f2ae4 Bring ames galaxy table up to date with jael. 2017-10-16 16:38:08 -07:00
C. Guy Yarvin
55d39b96bc Transfer ~nul to Matthew Liston. 2017-10-16 16:32:36 -07:00
C. Guy Yarvin
5c3fd13cc9 Ticketing works. 2017-10-11 17:00:21 -07:00
C. Guy Yarvin
266745b34a Fix some clay networking issues. 2017-10-10 15:11:06 -07:00
C. Guy Yarvin
e0cb33b815 Fix some boot issues. 2017-10-09 22:22:47 -07:00
C. Guy Yarvin
aaa92672c8 Fix ames scry. 2017-10-08 13:44:25 -07:00
C. Guy Yarvin
7a6b52f178 %wyll to %will. 2017-10-08 12:45:01 -07:00
Fang
ae72b8f10f Merge pull request #437 from joemfb/plan-serv-cc
forwardport #436
2017-10-07 13:31:28 +02:00
Joseph Bryan
e6f52193d5 writes web/plan to whichever desk has been |served 2017-10-06 19:59:28 -04:00
C. Guy Yarvin
fcdc3e0c52 Fake networking passes smoke test. 2017-10-05 22:12:09 -07:00
C. Guy Yarvin
279a97d766 Correctly activate zuse jets. 2017-10-03 16:37:39 -07:00
C. Guy Yarvin
1bc7a79319 Mysterious fix. 2017-10-03 12:07:16 -07:00
C. Guy Yarvin
180ff8ce92 Closer! 2017-10-02 21:49:12 -07:00
C. Guy Yarvin
f2a7257f8a Mostly merged. 2017-10-02 21:36:34 -07:00
C. Guy Yarvin
5a74064080 Merge branch 'remaint' into remaint-merge 2017-10-01 18:50:19 -07:00
C. Guy Yarvin
0b5a831551 Dual-boots on maintenance and master vere. 2017-09-27 17:27:08 -07:00
C. Guy Yarvin
eee8697782 Transfer ~nem to Jeremy Tunnell. 2017-09-22 11:48:37 -07:00
C. Guy Yarvin
dc25979f59 Merge remote-tracking branch 'origin/master' into piaf-runes 2017-09-21 18:45:27 -07:00