Commit Graph

326 Commits

Author SHA1 Message Date
cgyarvin
540ba66506
Merge pull request #458 from ohAitch/move-json
move ++json and other above-arvo types to zuse
2017-12-06 13:25:44 -08:00
cgyarvin
ca0ad49ef1
Merge pull request #456 from ohAitch/cleaner-deco
clean up / improve coverage of :> :< implementation
2017-12-06 12:59:15 -08:00
Anton Dyudin
25809f120e fix conflict-resolution for new twig type 2017-12-06 12:12:06 -08:00
Ted Blackman
bd76ab5da4
Merge pull request #451 from urbit/Fang--patch-2
Fix small issue in ++op:dejs-soft:format when calling ++my:nl
2017-12-05 13:47:00 -08:00
Anton Dyudin
f24f2190a5 Merge branch 'master' into cleaner-deco
Conflicts:
	gen/deco.hoon
	sys/hoon.hoon
2017-12-05 12:24:06 -08:00
Ted Blackman
8bf726fdb1
Merge pull request #463 from ohAitch/fix-sso
recover SSO code from history
2017-12-05 12:20:30 -08:00
Ted Blackman
c31dbeff69
Merge pull request #460 from ohAitch/trivia
misc cleaning
2017-12-05 11:51:45 -08:00
Ted Blackman
a0120e7bd2
Merge pull request #464 from ohAitch/travis
enable Travis CI, base test "does dojo run"
2017-12-05 11:27:16 -08:00
C. Guy Yarvin
87e658a765 Remove $% duplicate detection, which broke something. 2017-12-02 05:33:08 -08:00
Anton Dyudin
d70d81d98f test pill autobuild code 2017-12-01 21:23:34 -08:00
C. Guy Yarvin
1b47073c11 Manually complete prior integrations. 2017-12-01 19:02:46 -08:00
C. Guy Yarvin
37ca298f88 Correctly hand-merge e3e0a7f. 2017-12-01 15:54:50 -08:00
C. Guy Yarvin
db4a6008be Revert a bad merge. 2017-12-01 15:53:40 -08:00
C. Guy Yarvin
60e3381bd0 Revert "Fixed bad merge."
This reverts commit 16b84c0ce7.
2017-12-01 15:52:15 -08:00
C. Guy Yarvin
16b84c0ce7 Fixed bad merge. 2017-12-01 15:50:09 -08:00
C. Guy Yarvin
299558f245 Merge commit 'd6c5912' into master-pulls 2017-12-01 15:48:28 -08:00
C. Guy Yarvin
b40e976862 Merge commit '3740378' into master-pulls 2017-12-01 15:48:08 -08:00
C. Guy Yarvin
ca36e63bfe Merge commit 'c46740d' into master-pulls 2017-12-01 15:47:55 -08:00
C. Guy Yarvin
c009427372 Merge commit 'e3e0a7f' into master-pulls 2017-12-01 15:30:19 -08:00
C. Guy Yarvin
ec6e4cda7a Merge commit 'fe7c9cc' into master-pulls 2017-12-01 15:13:39 -08:00
Joseph Bryan
b21db93729 restructures ++sign:able:xmas to avoid duplicate tag 2017-12-01 14:05:57 -08:00
Joseph Bryan
cc605d0e5e updates ++boil:ap to crash if a book has pages with the same tag 2017-12-01 14:05:57 -08:00
Max
942d595fa9 Comment typo 2017-12-01 14:05:57 -08:00
Anton Dyudin
c8d98a1220 eagerly evaluate "eyre: execute" error info
to avoid issues from lazy traps in defunct requests

(cherry picked from commit 46320bf9d9579508fa0492b88ab055979929e049)
2017-12-01 14:05:57 -08:00
Max G
18350b6b92 Dragon4 hoon fix 2017-12-01 14:05:57 -08:00
C. Guy Yarvin
f80695ed96 Remove debug. 2017-11-30 15:22:05 -08:00
C. Guy Yarvin
b26639b690 Revert "Cache tile defaults."
This reverts commit db54f72514.
2017-11-30 14:31:28 -08:00
C. Guy Yarvin
db54f72514 Cache tile defaults. 2017-11-30 11:13:39 -08:00
C. Guy Yarvin
d862c7cdd1 Revert "Defaulting."
This reverts commit 1f896543ba.
2017-11-30 11:04:13 -08:00
Anton Dyudin
477aebd128 recover SSO code from history
"revert eyrelearning" didn't quite get everything
2017-11-29 20:18:50 -08:00
C. Guy Yarvin
1f896543ba Defaulting. 2017-11-29 15:49:43 -08:00
C. Guy Yarvin
ecafc30064 Like last commit but actually works. 2017-11-29 12:36:02 -08:00
C. Guy Yarvin
212f58368f Add =model syntax. 2017-11-29 10:59:48 -08:00
C. Guy Yarvin
a4538d4643 Move to ++writ, more generalized help. 2017-11-27 21:17:21 -08:00
C. Guy Yarvin
1b034afb3b Move to ++writ. 2017-11-27 20:40:08 -08:00
C. Guy Yarvin
cbb2f82656 Merge remote-tracking branch 'eglaysher/deco' 2017-11-27 20:37:52 -08:00
Anton Dyudin
19ebc829d6 fix +ivory, web/unmark/test, flag arvo.hoon as broken 2017-11-27 18:09:33 -08:00
C. Guy Yarvin
50c7bd7154 Merge branch 'master' of http://github.com/urbit/arvo 2017-11-27 14:54:36 -08:00
C. Guy Yarvin
9f3293a349 Fix ++lone bug. 2017-11-27 14:53:15 -08:00
Anton Dyudin
8a244ec716 get rid of unused but:epic 2017-11-27 12:51:45 -08:00
cgyarvin
3c86ea262a
Merge pull request #459 from Fang-/gall-quit
Remove registered subscription from gall when sending %quit.
2017-11-27 11:29:32 -08:00
C. Guy Yarvin
06280f904a Use /foo//bar for [%foo %$ %bar], foo/3 for [%foo 3] 2017-11-26 15:08:52 -08:00
C. Guy Yarvin
49429adb45 Remove debug flag. 2017-11-25 13:13:53 -08:00
C. Guy Yarvin
122c269332 Complete initial transition to ++blow as %ktcn. 2017-11-25 13:13:53 -08:00
C. Guy Yarvin
626b7026b9 Initial testing configuration. 2017-11-25 13:13:53 -08:00
C. Guy Yarvin
1c5c1f12a9 Interpreter runs. 2017-11-25 13:13:53 -08:00
C. Guy Yarvin
b3245ae96b ++musk committed, still testing. 2017-11-25 13:13:53 -08:00
Fang
18cd954af7 Remove registered subscription from gall when sending %quit. 2017-11-23 22:16:59 +01:00
Anton Dyudin
a6723ee3a5 move ++json and other above-arvo types to zuse 2017-11-22 13:28:07 -08:00
Anton Dyudin
47f2c2f54a fix "span" references in ford 2017-11-22 12:28:31 -08:00