Commit Graph

4253 Commits

Author SHA1 Message Date
Galen Wolfe-Pauly
bf28b5d61a blog etc 2015-10-19 13:33:20 -07:00
C. Guy Yarvin
ceae907383 Merge branch 'test' of https://github.com/galenwp/urbit into karpi 2015-10-19 11:16:23 -07:00
Galen Wolfe-Pauly
9f00c34cf2 tree-ing 2015-10-18 23:19:27 -07:00
Galen Wolfe-Pauly
68d466d760 ok test 2015-10-18 16:30:49 -07:00
C. Guy Yarvin
7bef988d9b Rotate to protocol version 6 for continuity breach. 2015-10-17 13:39:57 -07:00
C. Guy Yarvin
d624d0945b Merge branch 'test' 2015-10-17 13:07:36 -07:00
C. Guy Yarvin
dcbfcad8e1 Remove incomplete work. 2015-10-17 13:07:10 -07:00
C. Guy Yarvin
9d40d206e3 Merge cgyarvin fixes into test. 2015-10-17 13:01:38 -07:00
C. Guy Yarvin
a5f642f14e Merge branch 'test', because of continuity breach. 2015-10-17 12:03:25 -07:00
C. Guy Yarvin
ccc458603e Merge in Galen's test branch. 2015-10-16 16:12:43 -07:00
Raymond Pasco
86fec0c245 Merge remote-tracking branch 'cahiggins/moon-talk' into test 2015-10-15 23:59:51 -04:00
Galen Wolfe-Pauly
6581e332ba more corrections, links, &c 2015-10-15 16:37:49 -07:00
Anton Dyudin
39108ab80e Merge branch 'nobreach' into test 2015-10-15 15:49:09 -07:00
Galen Wolfe-Pauly
6297bb6292 preening tree 2015-10-15 14:43:23 -07:00
Anton Dyudin
49af5a2948 re-subscribe work to talk on quit 2015-10-15 14:05:18 -07:00
Galen Wolfe-Pauly
366466383d styles, no console 2015-10-15 09:47:44 -07:00
Galen Wolfe-Pauly
38f677a7f1 something 2015-10-14 18:22:06 -07:00
Anton Dyudin
34a187fdb6 check for empty revision 2015-10-13 11:57:56 -07:00
Galen Wolfe-Pauly
49565417a1 blog tree 2015-10-12 17:44:14 -07:00
Anton Dyudin
c10bc16db4 Revert "restore old guides"
This reverts commit daf97b8dd0e2562d8fc16d4657bfa1bdc3ae7737.
2015-10-12 17:14:00 -07:00
C. Guy Yarvin
e7e9fdeaa0 Merge branch 'test' of https://github.com/urbit/urbit into karpi
Conflicts:
	urb/urbit.pill
2015-10-12 17:10:56 -07:00
Alex Higgins
a6070d3a68 Long form for more conformity 2015-10-12 14:53:52 -05:00
Galen Wolfe-Pauly
e3ec3ea638 merging styles 2015-10-11 23:17:56 -07:00
Galen Wolfe-Pauly
fb87b1a7e9 Merge branch 'test' of github.com:galenwp/urbit into test 2015-10-11 21:48:38 -07:00
Galen Wolfe-Pauly
ade572da0d working on tree options 2015-10-11 21:48:22 -07:00
C. Guy Yarvin
f979e96d10 Doc fixes and changes to match. 2015-10-09 18:31:07 -07:00
Anton Dyudin
d070022164 talk deli counter fix 2015-10-09 15:28:55 -07:00
Anton Dyudin
e6ebf598df fix octs for sole %clr 2015-10-09 15:20:05 -07:00
Anton Dyudin
428b557293 fixed web sole tang flop 2015-10-09 13:56:50 -07:00
Anton Dyudin
d850e59673 fix up ford examples 2015-10-09 12:52:20 -07:00
Anton Dyudin
7b0275efec restore old guides 2015-10-09 12:25:55 -07:00
Anton Dyudin
e5ff969867 Merge branch 'master' of https://github.com/urbit/urbit into nobreach 2015-10-09 10:56:57 -07:00
Raymond Pasco
9773a23650 Merge branch 'gulf-fix' into test 2015-10-09 10:44:27 -04:00
Raymond Pasco
4f961d6074 Correct off by one in ++gulf 2015-10-08 19:35:33 -04:00
Anton Dyudin
3f613aaffe Merge branch 'nobreach' into pittyp 2015-10-08 15:24:29 -07:00
Anton Dyudin
a913d92787 pastebin v1 2015-10-08 15:23:05 -07:00
Anton Dyudin
f6b234d4d5 pull upstream hoon.js 2015-10-08 15:23:03 -07:00
Raymond Pasco
faf75786ba Merge branch 'talk-nicknames' into test 2015-10-08 17:52:57 -04:00
Raymond Pasco
f1c8e0a3aa implement reverse nick lookups 2015-10-08 16:55:06 -04:00
Raymond Pasco
e226fdf0b8 implement viewing nicknames 2015-10-08 16:26:16 -04:00
Raymond Pasco
ed90a87d48 implement setting nicknames 2015-10-08 16:09:28 -04:00
Raymond Pasco
b7870e6751 correctly typed stub ;nick command 2015-10-08 14:01:40 -04:00
Raymond Pasco
b1c1898812 add stub ;nick command 2015-10-08 13:26:42 -04:00
Anton Dyudin
07558d710a minor hymn fix 2015-10-07 16:40:32 -07:00
Anton Dyudin
7e59ba1c46 Merge branch 'pittyp' into test 2015-10-07 16:35:53 -07:00
Anton Dyudin
32f5252a8a fix octs for sole %clr 2015-10-07 16:33:48 -07:00
Anton Dyudin
9dac5d822f Merge branch 'test' of https://github.com/urbit/urbit into pittyp 2015-10-07 16:31:52 -07:00
C. Guy Yarvin
81a660d49b Merge branch 'test' of https://github.com/urbit/urbit into karpi 2015-10-07 16:24:11 -07:00
C. Guy Yarvin
4e51134436 Remove # prompt. 2015-10-07 15:42:19 -07:00
Anton Dyudin
2ba55308fd Merge branch 'nobreach' into test 2015-10-07 11:59:31 -07:00