Commit Graph

1513 Commits

Author SHA1 Message Date
Ubuntu
b74dc1aee9 Merge branch 'test' of https://github.com/urbit/urbit into test
Conflicts:
	urb/urbit.pill
2014-09-03 20:04:27 +00:00
Ubuntu
06b0890e22 fixed clay bug 2014-09-03 19:56:16 +00:00
Galen Wolfe-Pauly
a9ca22a5a4 Better aut.ced hacks 2014-09-03 11:41:25 -07:00
Galen Wolfe-Pauly
8aa3c5ab3d Revert "Url aut hacks"
This reverts commit bbe14dd81309574eab0f56d875d5231d85f6ff13.
2014-09-03 11:32:48 -07:00
Anton Dyudin
ad5058d039 Url aut hacks 2014-09-03 11:09:00 -07:00
Galen Wolfe-Pauly
c09899136e Merge branch 'test' of github.com:urbit/urbit-new into test 2014-09-03 10:52:27 -07:00
Anton Dyudin
f9c0b35bb8 Merge branch 'test' of https://github.com/urbit/urbit into test 2014-09-03 00:20:19 -07:00
Anton Dyudin
c6ad315be6 Alphabetica 2014-09-03 00:20:08 -07:00
Ubuntu
8d7ecb1f5b updated %clay doc 2014-09-03 01:37:24 +00:00
johncburnham
2278666a05 Merge branch 'test' of https://github.com/urbit/urbit into test
Conflicts:
	urb/urbit.pill
	urb/zod/arvo/hoon.hoon
2014-09-02 17:15:20 -07:00
johncburnham
e63f332aaf hoon.hoon cleanup part 1 2014-09-02 17:12:38 -07:00
Galen Wolfe-Pauly
3ecb674c78 fas pam, not fas fas 2014-09-02 16:31:56 -07:00
C. Guy Yarvin
aaf45361e1 Merge branch 'test' of git://github.com/urbit/urbit-new into test 2014-09-02 13:13:36 -07:00
C. Guy Yarvin
ad83c31753 Ready to switch over mug. 2014-09-02 13:13:12 -07:00
ault011
f772d4cb30 Merge branch 'test' of https://github.com/urbit/urbit into test 2014-09-02 12:55:22 -07:00
ault011
9fbfb51a6d Fixed ford-advanced doc typo 2014-09-02 12:54:47 -07:00
C. Guy Yarvin
bc590ffa10 Merge branch 'test' of git://github.com/urbit/urbit-new into test 2014-09-02 12:24:24 -07:00
C. Guy Yarvin
91b1d718a3 Revert "some hoon.hoon edits"
This reverts commit c9670e2a48eaf2a089bd4dd2d9f47f5f38d42a91.
2014-09-02 12:23:39 -07:00
Anton Dyudin
69d64fe590 File browser browses files 2014-09-02 11:11:37 -07:00
johncburnham
f7f359fa6c Merge branch 'test' of https://github.com/urbit/urbit into test 2014-09-02 00:04:53 -07:00
johncburnham
00fde5f0c7 some hoon.hoon edits 2014-09-02 00:04:22 -07:00
Ubuntu
1af92e7dcc Merge branch 'master' into test 2014-09-02 00:47:05 +00:00
Ubuntu
aa484dd6d2 Merge branch 'master' of https://github.com/urbit/urbit-new 2014-09-02 00:46:35 +00:00
Ubuntu
91f5171e06 updated %clay doc 2014-09-02 00:46:21 +00:00
Ubuntu
af394c1907 Merge branch 'master' into test
Conflicts:
	urb/urbit.pill
2014-09-01 17:43:49 +00:00
Ubuntu
e92d03213e bump protocol number 2014-09-01 16:55:14 +00:00
Ubuntu
d89c0ff9f0 pokes over %ames now get acks 2014-08-29 17:05:00 +00:00
Anton Dyudin
9b04cf46dd Added clay browser 2014-08-28 18:28:13 -07:00
Anton Dyudin
b55c48ef2c Fixed say/arvo doc structure 2014-08-28 18:00:43 -07:00
Anton Dyudin
b84542fbc1 s/hymn/psal/ 2014-08-28 17:28:37 -07:00
Anton Dyudin
c843d99b78 Volumes up. 2014-08-28 16:33:15 -07:00
Anton Dyudin
8963999510 Flattened vol 2014-08-28 14:51:01 -07:00
Anton Dyudin
c2f6bc7d06 Chat repl time 2014-08-28 14:30:02 -07:00
ault011
623261f92f Merge branch 'test' of https://github.com/urbit/urbit into test 2014-08-28 13:42:55 -07:00
ault011
08eadcaf75 Propozed zuse sectioning 2014-08-28 13:42:30 -07:00
Anton Dyudin
19de1a4d7a Spurious date zeroes 2014-08-28 12:20:35 -07:00
Anton Dyudin
79b8e6aa29 Chat \\ leniency 2014-08-28 12:02:56 -07:00
Ubuntu
13d4772a95 Merge branch 'master' into test
Conflicts:
	urb/urbit.pill
2014-08-28 17:20:02 +00:00
Ubuntu
cde357f317 bump protocol number and add Anton's carrier 2014-08-28 16:59:44 +00:00
Ubuntu
e066bc2148 a few basic tests 2014-08-28 01:37:29 +00:00
Ubuntu
f7d338ab9c added bone to ++pour 2014-08-27 23:00:41 +00:00
Ubuntu
86ccab6a86 updated ames doc 2014-08-27 22:30:42 +00:00
Ubuntu
2e0038b272 Merge branch 'test' of https://github.com/urbit/urbit into test 2014-08-27 21:59:38 +00:00
Ubuntu
bdc921b56f lifecycle of a packet doc done 2014-08-27 21:59:20 +00:00
Anton Dyudin
be4848f3c9 Fixed blank-lined code blocks 2014-08-27 13:24:31 -07:00
Ubuntu
c3d15a202e Merge https://github.com/tjic/urbit_with_libuv11_characteristics into test
Conflicts:
	Makefile
2014-08-27 18:22:34 +00:00
ault011
d6aefb1cc2 Merge branch 'test' of https://github.com/urbit/urbit into test 2014-08-26 19:00:56 -07:00
ault011
10c80387da WIP single-file site 2014-08-26 19:00:09 -07:00
Ubuntu
351b148714 Merge branch 'test' of https://github.com/urbit/urbit into test 2014-08-27 01:45:48 +00:00
Ubuntu
5c107029f6 almost done with lifecycle of a packet 2014-08-27 01:45:26 +00:00