Commit Graph

3306 Commits

Author SHA1 Message Date
Anton Dyudin
a8de86094f !: |% → :: |% isn't a valid syntax transform 2015-05-04 11:40:51 -07:00
Anton Dyudin
ede9f1e89e restored :hi 2015-05-04 11:10:02 -07:00
C. Guy Yarvin
acce20899f Continuity breach with new protocol 4. 2015-05-03 16:57:35 -07:00
cgyarvin
6f5abd44ae Merge pull request #277 from urbit/revert-276-revert-275-master
Revert "Revert "Jetted scrypt""
2015-05-03 16:32:12 -07:00
cgyarvin
62cb2f2812 Revert "Revert "Jetted scrypt"" 2015-05-03 16:31:45 -07:00
cgyarvin
f1fcff84a9 Merge pull request #276 from urbit/revert-275-master
Revert "Jetted scrypt"
2015-05-03 16:29:24 -07:00
cgyarvin
7d6815b009 Revert "Jetted scrypt" 2015-05-03 16:28:51 -07:00
cgyarvin
35417f4d60 Merge pull request #275 from Hmmm-Max/master
Jetted scrypt
2015-05-03 16:21:36 -07:00
Max G
ffbc4366be new bounds 2015-05-03 23:45:41 +03:00
Max G
3ef2611ff9 Jetted scrypt 2015-05-03 15:26:42 +03:00
Galen Wolfe-Pauly
c020671d3f Merge branch 'test' of github.com:urbit/urbit into test 2015-05-01 18:28:26 -07:00
Philip C Monk
334840e068 performance improvements 2015-05-01 21:26:59 -04:00
Galen Wolfe-Pauly
46264b255d minor talk fixes 2015-05-01 18:16:32 -07:00
Galen Wolfe-Pauly
276b8fc416 minor talk fixes 2015-05-01 18:06:28 -07:00
Anton Dyudin
95528fb7d4 v0 beam compilation 2015-05-01 17:16:57 -07:00
Anton Dyudin
f4b0255dd6 fixed tree to point at /=home= 2015-05-01 15:10:32 -07:00
Anton Dyudin
f2e605f491 Merge branch 'test' of https://github.com/urbit/urbit into test
Conflicts:
	urb/urbit.pill
2015-05-01 15:09:59 -07:00
Anton Dyudin
d22f243dfe multi-dependency support 2015-05-01 14:43:41 -07:00
Henry Ault
c363267149 old system 2015-05-01 13:43:10 -07:00
Philip C Monk
dc773b37f3 Merge branch 'test' of https://github.com/urbit/urbit into test
Conflicts:
	urb/urbit.pill
2015-05-01 16:41:34 -04:00
Philip C Monk
ff2597da68 performane improvements 2015-05-01 16:32:04 -04:00
Henry Ault
0f2c928a2f small update 2015-05-01 12:05:16 -07:00
Anton Dyudin
4c2e39b74b dep-missed drop 2015-05-01 12:03:02 -07:00
Galen Wolfe-Pauly
be192fbb73 Merge pull request #274 from fsteinel/guides-repair
fix link to the guides
2015-05-01 08:47:07 -07:00
Florian Steinel
c9b832d811 fix link to the guides 2015-05-01 15:18:01 +02:00
Henry Ault
460c7e723b reboot! 2015-04-30 20:22:05 -07:00
Anton Dyudin
8eba67cf03 norm mark beaks 2015-04-30 17:34:57 -07:00
C. Guy Yarvin
c4980f2563 Merge branch 'master' of https://github.com/urbit/urbit 2015-04-30 17:14:53 -07:00
Philip C Monk
8dd242fdb2 Merge branch 'typedclay' 2015-04-30 18:12:00 -04:00
Philip C Monk
f7565dc039 Merge branch 'dropped' into typedclay 2015-04-30 18:08:52 -04:00
C. Guy Yarvin
5d107f88d7 Merge branch 'master' of https://github.com/urbit/urbit 2015-04-30 15:06:16 -07:00
Anton Dyudin
253eb6c4c8 Merge remote-tracking branch 'origin/master' into test 2015-04-30 14:09:52 -07:00
Philip C Monk
38e20772a6 Merge branch 'master' of https://github.com/urbit/urbit 2015-04-30 17:09:18 -04:00
Philip C Monk
a672eb691e forgot to commit cat/helm/unix 2015-04-30 17:09:02 -04:00
Philip C Monk
7fc4a1a24e Merge remote-tracking branch 'origin/master' into test 2015-04-30 17:02:20 -04:00
Philip C Monk
b97b04a552 get rid of swapfile 2015-04-30 17:01:41 -04:00
Anton Dyudin
5a16059089 swap files! 2015-04-30 14:01:33 -07:00
Henry Ault
66c52cf4da parse list of droplets 2015-04-30 13:55:10 -07:00
Philip C Monk
6457c00c28 comment out %camping 2015-04-30 15:58:39 -04:00
Anton Dyudin
8240fc7723 Merge branch 'test' of https://github.com/urbit/urbit into test 2015-04-30 12:49:17 -07:00
Anton Dyudin
7ebfeda9a5 fixed main/ imports to base/ 2015-04-30 12:37:46 -07:00
Philip C Monk
d30dfc5270 bumped protocol number to 3 2015-04-30 14:52:51 -04:00
Philip C Monk
fb74e61885 moved ford dependencies to new model 2015-04-30 14:37:22 -04:00
Henry Ault
6c0a645c92 create droplets 2015-04-29 19:24:24 -07:00
Philip C Monk
75d4e2fbad added %next clay subscription type 2015-04-29 21:23:46 -04:00
Philip C Monk
ed698889f6 Merge branch 'test' of https://github.com/urbit/urbit into test
Conflicts:
	urb/urbit.pill
2015-04-29 19:03:59 -04:00
Philip C Monk
f03263852c main->base, arvo events depth-first 2015-04-29 18:48:45 -04:00
Henry Ault
c53723140a do app 2015-04-29 14:02:54 -07:00
Henry Ault
13dc51c80c Merge branch 'master' of https://github.com/urbit/urbit into do 2015-04-29 14:00:53 -07:00
Anton Dyudin
d6f18401c6 stub out unsubscription checking 2015-04-29 12:43:14 -07:00