urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-13 16:03:36 +03:00
Code Issues Packages Projects Releases Wiki Activity
7,887 Commits 768 Branches 10 Tags 215 MiB
4846fb1c8f
Commit Graph

661 Commits

Author SHA1 Message Date
Fang
4c16ecba89 Remove trailing whitespace from ames. 2018-02-22 19:11:59 +01:00
Fang
2c07f0ab25 Bump ames protocol version. Now set in a single constant. 2018-02-22 19:11:41 +01:00
Fang
e875efd771
Merge pull request #637 from Fang-/breach-cleanup 
Pre-breach cleanup
 2018-02-22 18:44:33 +01:00
Joe Bryan
f7329c5872 escapes "{" in tape print (++dash:us) (#636) 
modifies ++dash:us to take a list of additional characters to escape
 2018-02-22 16:03:13 +01:00
Fang
0d647de570 Clean up ++load of vanes. 2018-02-22 15:19:17 +01:00
C. Guy Yarvin
57eff328d3 Ready to test seminouns. 2018-02-21 21:27:35 -08:00
Ted Blackman
3e753e1286
Merge pull request #628 from ohAitch/keep-cache 
propagate cache properly when erroring inside /_
 2018-02-20 13:14:22 -08:00
Anton Dyudin
66533b7aa6 propagate cache properly when erroring inside /_ 2018-02-19 19:15:40 -08:00
C. Guy Yarvin
e2b5379f3d Fully adapted to seminouns in ++coil. 2018-02-19 17:27:23 -08:00
C. Guy Yarvin
66165cea0c Fully disengaged jets from core assembly. 2018-02-19 13:04:57 -08:00
Fang
3452d8756e Fixed error in #417, use "type" instead of "span". 2018-02-19 18:36:41 +01:00
C. Guy Yarvin
8d101aaf21 Move core assembly back to pure hoon. 2018-02-18 17:52:25 -08:00
C. Guy Yarvin
6535275333 Restored ^% ripple switch for fast testing. 2018-02-18 14:19:09 -08:00
C. Guy Yarvin
a42b5eac61 ++mine battery builder for callback from jets. 2018-02-18 13:42:44 -08:00
Ted Blackman
958fbdb649
Merge pull request #407 from max19/dragonfix 
Dragon4 fix
 2018-02-16 14:01:15 -08:00
Ted Blackman
b40103a059
Revert "updates ++boil:ap to crash if a book has pages with the same tag" 2018-02-16 13:14:04 -08:00
Fang
09b812bae7
Merge pull request #417 from frodwith/fixnest-master 
correct an oversight in ++nest:ut (mismatch with jet)
 2018-02-16 21:57:05 +01:00
Ted Blackman
b47cf9cd6a
Merge pull request #619 from jfranklin9000/gate 
Use ++mold instead of ++gate in ++cask and ++hypo.
 2018-02-16 12:53:36 -08:00
Ted Blackman
0921f90b38
Merge branch 'master' into fixnest-master 2018-02-16 12:49:29 -08:00
Ted Blackman
2f6941b365
Merge branch 'master' into dragonfix 2018-02-16 12:46:04 -08:00
Ted Blackman
43383877e3
Merge pull request #363 from joemfb/safe-book 
updates ++boil:ap to crash if a book has pages with the same tag
 2018-02-16 12:26:58 -08:00
C. Guy Yarvin
5f780a2b52 Lazy execution in ++musk. 2018-02-15 15:53:32 -08:00
C. Guy Yarvin
e6f2ab99c0 Properly rippled. 2018-02-15 10:23:25 -08:00
C. Guy Yarvin
6d07e585cd Ready to try to chill ripple. 2018-02-15 09:39:42 -08:00
C. Guy Yarvin
e0147a724c Working ripple, sort of. 2018-02-14 17:39:08 -08:00
C. Guy Yarvin
eca422513f Some ripple-ization that works. 2018-02-14 16:31:09 -08:00
C. Guy Yarvin
c1182da583 About to test ripple. 2018-02-14 15:59:30 -08:00
Ted Blackman
e094ca44de
Merge pull request #610 from Fang-/clay-permissions 
Clay permissions
 2018-02-14 10:11:21 -08:00
C. Guy Yarvin
55ea6e6aea Cleared fab flags; preparing to ripple. 2018-02-13 21:36:25 -08:00
C. Guy Yarvin
3d462e184a Only one fabrication bit. 2018-02-13 14:19:11 -08:00
Fang
3b233303d2 Make dill properly deal with clay acks. 
Also adds a comment about the reason for making the %kids desk public.
 2018-02-13 22:47:04 +01:00
Fang
29001f2386 Actually support %crow moves in gall. 2018-02-13 20:12:30 +01:00
Fang
7c747731ca For %crow tasks: Skim instead of murn. No longer include desks with no rules. 2018-02-13 20:04:47 +01:00
Fang
3b2543dfe8 Fixed and simplified logic in ++allowed-by. 2018-02-13 19:47:17 +01:00
Fang
a6c6714c5d Fixed incorrect recursion logic for finding permissions. 2018-02-13 19:45:24 +01:00
John Franklin
a33eec2d75 Use ++mold instead of ++gate in ++cask and ++hypo. 2018-02-13 04:43:52 -06:00
C. Guy Yarvin
d44f8e3f5f About to disable old modeling. 2018-02-12 19:25:46 -08:00
C. Guy Yarvin
9a8dfb21fc Almost fully transitioned. 2018-02-12 17:09:22 -08:00
Fang
61505ff785 Clay task for retrieving the rules that apply to a group. 2018-02-12 17:57:59 +01:00
Fang
9f66086936 Permission list structure. 2018-02-12 17:57:04 +01:00
Fang
ab0dc23065 Return an error when trying to add rules that contain undefined permission groups. 2018-02-12 16:27:14 +01:00
Fang
8c532942b4 Deleting a permissions group now deletes it from all rules. 2018-02-12 16:02:32 +01:00
John Franklin
3d791048e8 Replace $-(* *) with gate. 2018-02-12 06:45:11 -06:00
C. Guy Yarvin
7b28975ebb Converted whole kernel to use modern defaulting. 2018-02-11 21:01:25 -08:00
C. Guy Yarvin
314b431b23 Improve tracing in ++musk. 2018-02-11 20:03:38 -08:00
C. Guy Yarvin
5a9aba2185 Most of the way to default-clean. 2018-02-10 21:24:22 -08:00
C. Guy Yarvin
be17ea51f4 Adjust %deft to take a hoon. 2018-02-09 15:15:32 -08:00
Fang
9f05d2f662 Add faces to clay ++task. 2018-02-09 14:48:08 +01:00
Fang
315823250f Add req alias for incoming requests. 2018-02-09 13:33:15 +01:00
Fang
e541a55575 Cleanup and stylistic changes. 2018-02-09 13:25:46 +01:00
Fang
f60bb7efc1 Actually do permission checks in ++lobes-at-path, for %many requests. 2018-02-09 13:00:12 +01:00
Fang
ee1fb2b4ab We no longer need to set local copies of remote desks to readable explicitly. 2018-02-09 12:59:42 +01:00
Fang
d7fdb4545e Ensure %kids desk is publicly readable. 
Set permissions for that during boot and clay update.
 2018-02-09 00:37:17 +01:00
Fang
f835ac4c57 Fix permission checks for %y and %z requests. 2018-02-09 00:35:42 +01:00
Fang
aa2843fedb Maintain old %warp interface. Use %werp for %west read requests. 
This also makes live-updating to this new clay easier.
 2018-02-08 17:11:32 +01:00
Fang
97eb2a91ae State adapter. 2018-02-08 14:39:53 +01:00
Fang
91fe74d7d6 Add requester ship to clay's %warp task to aid in permission checks for %wests. 2018-02-08 00:42:40 +01:00
Fang
f0ee403285 Misc small cleanup. 2018-02-07 22:28:33 +01:00
Fang
f296c9bbae Ensure local copies of foreign desks are always fully accessible. 2018-02-07 22:14:59 +01:00
Fang
c890dad271 Support %p requests. 2018-02-07 21:11:25 +01:00
Fang
3f7e76cca5 Implement requests for reading and writing permission groups. 2018-02-07 21:07:42 +01:00
Fang
8b0b82eb72 Implemented permission checks for read requests. 2018-02-07 21:04:07 +01:00
Fang
6a67b11915 Request sources are now properly bound to the requests, rather than only passed into the desk core initially. 2018-02-07 17:56:50 +01:00
Fang
1b231e82f8 Implement %perm clay request for setting permissions of a node. 2018-02-07 17:56:22 +01:00
Fang
3244cd2802 No longer deduce request source from duct, but pull from socks in %warp and %west as intended. 2018-02-06 21:57:38 +01:00
C. Guy Yarvin
28e4ab691c Disable debug printfs. 2018-02-05 16:25:58 -08:00
C. Guy Yarvin
d90c16b977 Suppress printf. 2018-02-05 16:24:51 -08:00
C. Guy Yarvin
2e217b562a Tuple cribs in process. 2018-02-03 21:52:57 -08:00
C. Guy Yarvin
423f2bf00f Adjust construct recursion logic. 2018-02-03 20:04:56 -08:00
C. Guy Yarvin
cba2dfc8d0 Preadapt ++probe for explicit tuples. 2018-02-03 18:45:07 -08:00
C. Guy Yarvin
c2dd5d19dc Rename ++tile to ++crib. 2018-02-03 14:01:36 -08:00
C. Guy Yarvin
842fb0bd96 Add $~ default rune; remove $~ legacy uaes. 2018-02-02 21:23:22 -08:00
C. Guy Yarvin
2dae5c3ec7 Reorder for default. 2018-02-02 20:53:15 -08:00
C. Guy Yarvin
5ab69a2c97 Merge remote-tracking branch 'belisarius222/fjord' into research-fjord 2018-01-31 16:17:03 -08:00
C. Guy Yarvin
e749d60b1d Merged with constant errors disabled. 2018-01-31 15:36:48 -08:00
C. Guy Yarvin
b1a668bb17 Boots after rebase, though talk is broken. 2018-01-31 14:06:29 -08:00
C. Guy Yarvin
ebf5751a67 Reinstate fast probe. 2018-01-31 13:53:28 -08:00
C. Guy Yarvin
3b99f4c269 Fix constant block. 2018-01-31 13:53:28 -08:00
C. Guy Yarvin
9b14546e83 Stash commit, testing defaulting with ^%. 2018-01-31 13:53:28 -08:00
C. Guy Yarvin
1358010427 Add fabrication model bit. 2018-01-31 13:53:28 -08:00
C. Guy Yarvin
349f989cd4 Blind overflows when sample is proper default. 2018-01-31 13:53:28 -08:00
C. Guy Yarvin
7404bb0a1e Booting without any constant blocks. 2018-01-31 13:53:27 -08:00
C. Guy Yarvin
7d3334d6dd Disable blocking crash for stability commit. 2018-01-31 13:52:49 -08:00
C. Guy Yarvin
1039458536 Controlled defaulting in ++tile. 2018-01-31 13:52:04 -08:00
C. Guy Yarvin
d863c7f58f Transition probe default model. 2018-01-31 13:52:04 -08:00
C. Guy Yarvin
4f98f0ebcb Work in progress. 2018-01-31 13:52:04 -08:00
C. Guy Yarvin
23680f4b89 Add %funk tile for direct $-(). 2018-01-31 13:52:04 -08:00
Paul Driver
1fba410c4b fix jet discrepancies in ++fond 2018-01-31 13:52:04 -08:00
C. Guy Yarvin
15e824da0b ut_find debugging branch. 2018-01-31 13:52:04 -08:00
C. Guy Yarvin
0509820eea More constant-blocking cleanups. 2018-01-31 13:52:04 -08:00
C. Guy Yarvin
ae7f263a43 More constant-folding cleanups. 2018-01-31 13:52:04 -08:00
C. Guy Yarvin
35fb2545ab Some %zuse cleanups. 2018-01-31 13:52:04 -08:00
C. Guy Yarvin
12a41d56e7 Unblocking constants. 2018-01-31 13:50:56 -08:00
C. Guy Yarvin
5055a64e71 Better constant folding. 2018-01-31 13:50:56 -08:00
C. Guy Yarvin
51e0505fbd Improve $-() defaulting. 2018-01-31 13:50:56 -08:00
C. Guy Yarvin
77e364e79f Adjustments for content blocking. 2018-01-31 13:50:56 -08:00
C. Guy Yarvin
2745b9587b Remove old modeling code. 2018-01-31 13:50:56 -08:00
C. Guy Yarvin
6cb5c77ab6 Fix walk processing of %ktcn. 2018-01-31 13:50:55 -08:00
C. Guy Yarvin
1730862581 Disable constant blocking error; track it at runtime. 2018-01-31 13:50:55 -08:00
C. Guy Yarvin
8ec6ee61d0 Minor fix to preceding.a 2018-01-31 13:50:55 -08:00
C. Guy Yarvin
5acfb04cc6 First two tiers are constant-safe. 2018-01-31 13:50:55 -08:00
C. Guy Yarvin
45adb4e373 Constant fixes. 2018-01-31 13:50:55 -08:00
C. Guy Yarvin
129e1cbba2 Some adjustments for constant folding. 2018-01-31 13:50:55 -08:00
C. Guy Yarvin
f050415e3b Resolved $- folding problem. 2018-01-31 13:50:55 -08:00
C. Guy Yarvin
9f3e73a88c Various fixes and improvements. 2018-01-31 13:50:55 -08:00
C. Guy Yarvin
6484ff2b81 More diagnostics. 2018-01-31 13:50:55 -08:00
Fang
68809ff6e8 Proposal for accessing request source. 2018-01-26 16:24:25 +01:00
Ted Blackman
a9443ca78b fixed %news and %warp sending for rebuilds 2018-01-25 15:42:33 -08:00
Fang
72d9a6abd4 Add new clay cards to gall. 2018-01-25 17:22:29 +01:00
Fang
a6a6081b0b Update state structures and related code. 2018-01-25 16:15:01 +01:00
Fang
c1dda042a8 Finalizing interface. 2018-01-25 00:09:46 +01:00
Fang
39f11b7ccd Updates interface to include support for write permissions. 2018-01-24 16:33:41 +01:00
Fang
a4f552cb8f Update clay permissions interface to always supply the source of a node's rule. 2018-01-24 14:30:58 +01:00
Fang
36d40e00de Merge commit 'af4fe5d88597a877135931aeedcc9d460262cf45' into clay-permissions 2018-01-24 14:29:54 +01:00
Ted Blackman
af4fe5d885
Merge pull request #597 from Fang-/clay-multisub 
Clay %mult multiple cares
 2018-01-23 14:48:31 -08:00
Fang
2e364287d7 Clay permissions interface proposal. 2018-01-23 22:52:31 +01:00
Fang
8a1da39aac Remove ++gift copy from internal clay structures. 2018-01-23 17:38:13 +01:00
Fang
7a0e2f216b Change %mult interface to allow different/multiple cares per path. 2018-01-23 17:35:12 +01:00
cgyarvin
c0e7a71633
Merge pull request #534 from mrdomino/master 
New key for ~tyr
 2018-01-22 16:22:48 -08:00
Ted Blackman
a8354821b0
Merge pull request #575 from Fang-/clay-multisub 
Clay multi-%next: %mult (and fix for %next)
 2018-01-22 11:16:13 -08:00
Fang
d9409e8dff Clean up ++cach. 2018-01-22 16:01:00 +01:00
Fang
635d235cd7 Made %mult requests produce only a case and set of paths. 
It now works the way %next should.
 2018-01-22 15:54:37 +01:00
Anton Dyudin
ebc95233a8
Update hoon.hoon 
Fix #95 per request to just patch it on master
 2018-01-19 13:42:50 -08:00
Ted Blackman
163f2bdcf6 Comments and whitespace 2018-01-18 18:04:53 -08:00
Ted Blackman
ba4405565f Clay subscribes to changes to marks, so Ford can cache-promote them. Seems much faster 2018-01-18 18:03:02 -08:00
Fang
e3cbbd31a2 Consolidates the logic for %next and %mult. 
Not thoroughly tested yet.
 2018-01-19 01:54:41 +01:00
Anton Dyudin
6fcbaab5fa don't error on off-graph dependency notification 2018-01-18 13:53:14 -08:00
Ted Blackman
eda36249c2
Merge pull request #521 from Fang-/jael-burn 
Reverted accidentally renamed jael tag.
 2018-01-18 12:19:13 -08:00
cgyarvin
015972a51e
Merge pull request #538 from Fang-/gall-nocrash 
Prevent gall from breaking things over bone 0
 2018-01-18 11:30:52 -08:00
Fang
7044ee543b Fix erroneous indentation. 2018-01-18 19:07:57 +01:00
Fang
5bb364636d Fix an oopsie that was part of a change "lightly refactor ++wake %next" that accidentally made it into 4671526a. 2018-01-18 01:54:24 +01:00
Fang
e2b056eff9 Rewrite ++dedupe to roll instead of skim, and fix issue where it wasn't accounting for different cases correctly. 
ie, it wasn't making sure that the found case was *actually* before the new request's case.
 2018-01-18 01:25:58 +01:00
Fang
4671526a3e Make use of alias types more consistent. 2018-01-18 01:23:31 +01:00
Fang
70ad73e8ba Modified %mult to support past revisions, but with only a single case for all files. 2018-01-17 23:55:54 +01:00
Fang
5840c496c7 Fixed the ++start-request for next to properly take non-existing files into account when checking through older versions. 2018-01-17 16:49:16 +01:00
Fang
0d1b98852e Comments and cleanup based on feedback. 2018-01-17 16:43:20 +01:00
Anton Dyudin
641c577c7b promote key and not just the value to current beak 2018-01-16 16:34:26 -08:00
Anton Dyudin
28c4caedfd cancel remaining subs on [%news @uvH] 2018-01-16 16:23:11 -08:00
Anton Dyudin
c59a3869b2 put rebuild printfs behind ~? 2018-01-16 16:11:42 -08:00
Ted Blackman
31dac082b6 assertions in ++beam-dents-in-dir 2018-01-16 14:19:40 -08:00
Fang
d4b0b408cf Fix %next to not cancel the subscription if the watched file doesn't yet exist. 
Instead, register file creation as a change.
 2018-01-15 23:45:33 +01:00
Fang
307b86bb3b Clay state adapter. 2018-01-15 20:24:11 +01:00
Fang
b2669ed2ed Add a %mult rave to the clay interface. Add a %wris gift to support its output. 
%mult acts like %next, except it watches multiple paths. If any of them change, it sends all changes to the watched files in a %wris.
 2018-01-15 20:23:37 +01:00
Anton Dyudin
3f9223094a add state adapter for %many refactoring 2018-01-10 17:59:15 -08:00
Ted Blackman
916135b58e more hoon %143 syntax replacement 2018-01-10 10:47:43 -08:00
Ted Blackman
7e009048a4 ++beam-dents-in-dir:na to go with ++de-dup-subdirs 2018-01-09 17:34:28 -08:00
Ted Blackman
2cfccc3670 reorganize and comment ++rebuild. 
may have fixed a logic bug where it ignored %beam dependencies in `new`.
 2018-01-09 13:47:32 -08:00
Ted Blackman
3e1f07170f hoon %143 syntax for molds and a few other places 2018-01-09 13:43:48 -08:00
Ted Blackman
f579d0dd0b WIP Fixed some issues with rebuilding. 2018-01-08 18:00:42 -08:00
Ted Blackman
b71a4a65cf Ported deduplication logic from master 2018-01-08 14:48:22 -08:00
Fang
62b5310695 Consider passing bone 0 in cards invalid. 2018-01-08 23:05:10 +01:00
Steven Dee
942956c8c0 New key for ~tyr 
Also put on an n in compliance with current Steven Dee naming
conventions (and various government IDs.)
 2018-01-05 09:17:21 -05:00
Ted Blackman
682870f082 manually fixed greedy-ford for new arvo master 2018-01-03 18:47:15 -08:00
Ted Blackman
845696a3a6 Fix Clay %next revision 
adapted from commit 852997ac16a751c69775489c61ae8e5b650c9a50
 2018-01-03 16:37:44 -08:00
Ted Blackman
6169a6311a adapt changes to ++rove 
from commit 180751aa8223cdd66648ccc4e685fde784328585
 2018-01-03 16:29:59 -08:00
Anton Dyudin
b2030e47f3 Fix gall scry 
cf. aaa9267, fixes #512
 2017-12-21 15:57:35 -08:00
Fang
6a0385eeeb Reverted accidentally renamed jael tag. 2017-12-21 22:44:17 +01:00
C. Guy Yarvin
390062e296 Update galaxy table for changes committed only in jael. 2017-12-19 16:06:46 -08:00
Fang
ed8e30bcf3 Disabled %cake-woot-bad printf in ames. 2017-12-14 00:11:34 +01:00
Anton Dyudin
eaea2b528c picked up a few more mis-replaced jet hints 
having been bound they'll stay bound, but these seem less crucial,
being mostly called from already inside the other compiler jets
 2017-12-11 18:46:43 -08:00
Anton Dyudin
b3d5acb48b
HT @belisarius222 2017-12-11 15:54:42 -08:00
Anton Dyudin
496a9c87aa Don't erase types in (lake %noun), which should always suceed 2017-12-11 15:36:55 -08:00
Anton Dyudin
3fd968fbc7 HOTFIX 2: the hotfixening 
(invalidate old "%tsgl = ++rap" jet hint cached at c layer)
 2017-12-11 15:14:52 -08:00
Anton Dyudin
f2c04bfcd3 HOTFIX fix ++tap ~/ %tsgl jet hint 
@cgyarvin pls sed more responsibly. Should fix the various json/html serialization stack overflows that have been happening.
 2017-12-11 14:02:37 -08:00
Anton Dyudin
beaa8ec4c5 Merge branch 'newmodel' 2017-12-07 13:04:32 -08:00
Keaton Dunsford
81d22528c0 Ames protocol version 7 2017-12-07 11:56:09 -08:00
C. Guy Yarvin
7d4a6d808f Fix compiler error. 2017-12-07 11:07:30 -08:00
C. Guy Yarvin
2ce5e27447 Rename ovra to arvo. 2017-12-07 10:13:34 -08:00
C. Guy Yarvin
7d4b35c86b Remove non-shipping code. 2017-12-07 09:56:45 -08:00
C. Guy Yarvin
befec1ddc0 Adjust spacing. 2017-12-07 08:48:06 -08:00
C. Guy Yarvin
2d30ac17a4 Conservative commit without time increase. 2017-12-06 22:01:38 -08:00
C. Guy Yarvin
caa44d977f Temporarily revert ++musk expansion. 2017-12-06 21:30:05 -08:00
C. Guy Yarvin
c282baaf51 Update for repainting. 2017-12-06 21:27:29 -08:00
C. Guy Yarvin
cc324f5db7 Minor cleanups. 2017-12-06 16:30:29 -08:00
C. Guy Yarvin
bb62dfe35d Instrumented and disabled ++aq; ^% hard blows. 2017-12-06 16:19:10 -08:00
C. Guy Yarvin
95ba547327 Seems to work but with performance/overflow issues. 2017-12-06 16:19:10 -08:00
C. Guy Yarvin
797d40d6ff New ++ax seems almost working. 2017-12-06 16:19:10 -08:00
C. Guy Yarvin
f421c2e057 New ++al (++ax in h.h) passes smoke test. 2017-12-06 16:19:10 -08:00
C. Guy Yarvin
a4c9bdc69f Move %wtts to %fits; clean up %xray. 2017-12-06 16:19:10 -08:00
C. Guy Yarvin
98e0fa51f6 Initial commit of new model system. 2017-12-06 16:19:10 -08:00
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