urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-15 21:03:10 +03:00
Code Issues Packages Projects Releases Wiki Activity
7,278 Commits 768 Branches 10 Tags 215 MiB
ae413b04de
Commit Graph

7278 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ted Blackman
c5ced61d15
Merge pull request #469 from Fang-/talk-hotfix-1-of-2 
[HOTFIX] Talk: implement ++quit arms
 2017-12-08 10:18:00 -08:00
Fang
97a09f4214 Clean up transitionary code for the talk ++quit fix. 2017-12-08 16:00:40 +01:00
Fang
21f0f55d25 Implements ++quit arms for talk, so that it can recover from losing connection to hall. 2017-12-08 15:58:58 +01:00
Anton Dyudin
2fb9ce78d5 fix |reset trying to pull /===/sys/ovra 2017-12-07 17:43:16 -08:00
Anton Dyudin
beaa8ec4c5 Merge branch 'newmodel' 2017-12-07 13:04:32 -08:00
Anton Dyudin
ccaffc55e6 [ci] update pinned vere binary 2017-12-07 13:00:01 -08:00
Keaton Dunsford
81d22528c0 Ames protocol version 7 2017-12-07 11:56:09 -08:00
Ted Blackman
60cffd62ce
Merge pull request #452 from Fang-/remaint-merge-talk 
Hall (New Talk): the PR
 2017-12-07 11:14:58 -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
98a6ea3707 Easiest things first. 2017-12-06 21:28:11 -08:00
C. Guy Yarvin
c282baaf51 Update for repainting. 2017-12-06 21:27:29 -08:00
C. Guy Yarvin
2eff9cab87 Merge remote-tracking branch 'origin/master' into newmodel 2017-12-06 17:53:44 -08:00
C. Guy Yarvin
40645b0a19 Hand patch. 2017-12-06 17:53:17 -08:00
C. Guy Yarvin
732c7803c8 Unrevert. 2017-12-06 17:51:26 -08:00
Anton Dyudin
67034edf14 fix single +solid 2017-12-06 17:31:28 -08:00
C. Guy Yarvin
9d2d8710eb Revert broken solid. 2017-12-06 17:13:26 -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
Anton Dyudin
c4fd65de92 fix /+ old-zuse for move-json merge 2017-12-06 14:49:26 -08:00
Fang
c46f1e0ccb
Merge pull request #1 from belisarius222/remaint-merge-talk 
fix fora import
 2017-12-06 23:27:48 +01:00
Ted Blackman
33ef3928dd fix fora import 2017-12-06 14:24:24 -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
Fang
2a2f2a2211 Removed public domain notice. 2017-12-06 17:10:24 +01:00
Fang
1287c04443 The talk interface now properly pretends to be the planet when run on a moon. 2017-12-06 17:09:59 +01:00
Fang
27db17d1a4 Fixed incorrect usage of ++team:title. 2017-12-06 16:54:08 +01:00
Fang
3ecd885177 Now properly avoids sending burden updates to the reporter again. 2017-12-06 12:30:19 +01:00
Fang
122362e732 Fixed syntax error introduced into hood.hoon. 2017-12-06 00:19:56 +01:00
Fang
a167fe94c9 Merge commit 'bd76ab5da4043b19867dbf74938497e588e4b4f5' into remaint-merge-talk 2017-12-06 00:05:01 +01: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
Fang
07885a3c98 Removed version requirements from hall and talk. 
Also small comment cleanup.
 2017-12-05 22:32:55 +01:00
Fang
41098a2121 Merge commit '8bf726fdb1ecaf072d72ec795948f842ff7ea2e7' into remaint-merge-talk 2017-12-05 22:31:00 +01: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
780b278547
Merge pull request #461 from ohAitch/org-libs 
reorganize generator and :hood libraries
 2017-12-05 12:19:34 -08:00
Anton Dyudin
2eac6be25d Merge branch 'org-libs' into master 2017-12-05 12:07:33 -08:00
Ted Blackman
c31dbeff69
Merge pull request #460 from ohAitch/trivia 
misc cleaning
 2017-12-05 11:51:45 -08:00
Ted Blackman
76ec2db3b5
Merge pull request #465 from ohAitch/womb-fixes 
Pull in off-mainline womb fixes, make |invite usable
 2017-12-05 11:45:34 -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