Commit Graph

4158 Commits

Author SHA1 Message Date
Philip C Monk
c8bd8446e6 Merge remote-tracking branch 'galen/spam' into pending 2015-11-04 18:36:22 -05:00
Galen Wolfe-Pauly
49911d68ea ok ok 2015-11-04 15:29:38 -08:00
Galen Wolfe-Pauly
73b35829b0 good spam 2015-11-04 15:25:02 -08:00
Galen Wolfe-Pauly
0d1ab95aa3 takeout 2015-11-04 15:23:04 -08:00
Philip C Monk
c5adc39372 Merge remote-tracking branch 'galen/spam' into pending 2015-11-04 17:40:06 -05:00
Galen Wolfe-Pauly
d8298d0f18 Merge branch 'master' of github.com:urbit/urbit into spam 2015-11-04 14:28:22 -08:00
Galen Wolfe-Pauly
f323fc9190 nav fix and spam 2015-11-04 14:27:57 -08:00
Philip C Monk
7b10fd3f47 Merge branch 'kidsort-fixed', remote-tracking branches 'wilderr/master', 'anton/talk-offline' and 'curtis/trivial' into pending
kidsort-fixed is a fixed version of galen/kidsort.

fixes #516
2015-11-04 13:46:13 -05:00
Galen Wolfe-Pauly
3149dce765 date sort kids 2015-11-04 13:44:07 -05:00
C. Guy Yarvin
953e2ec334 More small edits. 2015-11-04 10:33:16 -08:00
cgyarvin
ed88c8a4e0 Merge pull request #517 from rsaarelm/master
Fix typo in tutorial
2015-11-04 10:32:52 -08:00
Risto Saarelma
cb8b8650a6 Fix typo in tutorial 2015-11-04 20:15:00 +02:00
Galen Wolfe-Pauly
b726b5a263 date sort kids 2015-11-03 16:26:20 -08:00
vere
db7d11e637 Merge remote-tracking branch 'curtis/trivial' 2015-11-03 23:51:46 +00:00
C. Guy Yarvin
fdc35df99f A trivial update. 2015-11-03 15:49:58 -08:00
Galen Wolfe-Pauly
adea97c3a5 Merge branch 'master' of github.com:urbit/urbit into newdoc 2015-11-03 14:03:35 -08:00
vere
fb420d8402 Merge branch 'master' of https://github.com/urbit/urbit 2015-11-03 22:02:06 +00:00
vere
c9d45b4d72 Merge remote-tracking branch 'curtis/newdoc' 2015-11-03 21:58:24 +00:00
C. Guy Yarvin
aa67631a97 Edit 0-nouns tutorial. 2015-11-03 13:49:33 -08:00
Anton Dyudin
1674f4e0da grammar, css; this branch closes #339 2015-11-03 13:31:24 -08:00
Galen Wolfe-Pauly
618bff849c next error and blockquotes 2015-11-03 13:17:30 -08:00
Henry Ault
4d49ee417e Merge branch 'master' of https://github.com/urbit/urbit 2015-11-03 12:50:23 -08:00
Henry Ault
5174cc3606 added where to find :talk instructions 2015-11-03 12:50:12 -08:00
Philip C Monk
c2a2eed8d0 Merge remote-tracking branch 'anton/talk-audi' into pending 2015-11-03 15:30:18 -05:00
Philip C Monk
0fc48ee14d Merge branch 'master' of https://github.com/urbit/urbit 2015-11-03 15:26:00 -05:00
Philip C Monk
586f97adc3 Merge remote-tracking branches 'anton/talkfix', 'anton/talk-audi' and 'curtis/no-ap-full' into pending 2015-11-03 15:22:42 -05:00
Anton Dyudin
489162d9c0 change parser to match ':' as own main 2015-11-03 12:16:10 -08:00
Anton Dyudin
7c78c40d4f check whether offline 2015-11-03 12:12:32 -08:00
Henry Ault
69d0b11e8e added instructions on how to switch between talk and dojo 2015-11-03 12:04:07 -08:00
Henry Ault
c56f5cd577 Merge branch 'master' of https://github.com/urbit/urbit 2015-11-03 11:58:48 -08:00
Henry Ault
9accf12bed changed urbit to bin/urbit 2015-11-03 11:58:07 -08:00
C. Guy Yarvin
c27796a6ae Publishing 0-nouns. 2015-11-03 11:49:57 -08:00
ault011
88dd7781bc changed identity to identities 2015-11-03 11:46:48 -08:00
ault011
0f0d913ac8 removed bin/urbit from this page
since we don't give instructions on what arguments to pass to this executable, let's just take this out.
2015-11-03 11:36:35 -08:00
Anton Dyudin
c50ca15a57 tightened persistence<->actions dependency cycles 2015-11-03 11:27:39 -08:00
Anton Dyudin
eeb546139d offline "banner" 2015-11-03 11:22:00 -08:00
Wilder Ramsey
572c271bfb Update talk.mdy 2015-11-02 16:58:45 -08:00
Anton Dyudin
cd345e5869 exponential backoff tweaks 2015-11-02 15:31:48 -08:00
Anton Dyudin
ea39b7ee37 clean up more indentation, command print order 2015-11-02 14:57:41 -08:00
C. Guy Yarvin
43b1eb549a Block ap-fill-full message. 2015-11-02 14:16:29 -08:00
Anton Dyudin
3101e61227 front end PM glyph display 2015-11-02 12:44:10 -08:00
Anton Dyudin
d442c5c51a fixed talk number indentation, talk number activation 2015-11-02 12:21:50 -08:00
Anton Dyudin
4aa03de827 better cli audience display 2015-11-02 12:04:07 -08:00
Philip C Monk
84bae67929 Merge remote-tracking branch 'anton/tree404' into pending 2015-11-02 14:50:07 -05:00
Philip C Monk
30122e2810 Merge remote-tracking branches 'anton/talkfix' and 'anton/print-eyre-code' into pending 2015-10-30 19:04:06 -04:00
Anton Dyudin
e58d0f0fc0 update glyphers on station bind 2015-10-30 15:37:13 -07:00
Anton Dyudin
a047f62a90 moved static html out of main.coffee 2015-10-30 15:36:30 -07:00
Anton Dyudin
c480381036 show station glyph on ship name 2015-10-30 13:39:16 -07:00
Anton Dyudin
4b9e3e57bc Print login code upon hitting eyre auth html 2015-10-30 13:11:41 -07:00
Anton Dyudin
117b07d7a5 restore tree 404 behaviour 2015-10-29 16:49:10 -07:00