ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-17 11:51:32 +03:00
Code Issues Packages Projects Releases Wiki Activity
3,356 Commits 6 Branches 0 Tags 164 MiB
8435b965e3
Commit Graph

3356 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anton Dyudin
b845051bf6 Merge branch 'master' into test 
Conflicts:
	urb/urbit.pill
	urb/zod/base/mar/oct3-move.hoon
	urb/zod/base/pub/cloud/fab/hymn.hook
	urb/zod/base/pub/cloud/src/main.js
 2015-06-16 15:19:51 -07:00
Philip C Monk
bdeb4e4a11 Merge remote-tracking branch 'origin/test' into newunix 
Conflicts:
	urb/urbit.pill
	urb/zod/base/arvo/clay.hoon
 2015-06-16 17:44:47 -04:00
Anton Dyudin
098bb0fed7 rectify tree and cat usage of %tang 2015-06-16 14:36:04 -07:00
Philip C Monk
b1e59ec8b3 ergo merges 2015-06-16 17:34:21 -04:00
Anton Dyudin
e042154265 put flops on all tang->text boundaries 2015-06-16 14:01:07 -07:00
Anton Dyudin
035d5c1efa talk ;help v1 2015-06-16 12:34:40 -07:00
Anton Dyudin
6cbb6b060d Revert "remove docs for demo", "remove odds and ends", "demo network", "DEMO ONLY: root beak as %demo.", "DEMO ONLY: don't show doznec flapping.", "Prinrtf." 
This reverts commit 8e1e40d75b3ab15c194b6bf9570f3edc46e2de58.
This reverts commit f073c490f9fd7c5abc033af4857df92229877de7.
This reverts commit f187d2d7e01a54823f3e979af9bbd148b398e7e9.
This reverts commit bc272862a73cfce1b118586ca39d3a377d841f1b.
This reverts commit 30a397513f8890a3406dc7ab91c6e067e3bbfbbb.
This reverts commit 4fc6856fb50d88c20a0f533392ca606641c5f38f.

Conflicts:
	urb/urbit.pill
	urb/zod/base/lib/drum.hoon
 2015-06-15 18:10:02 -07:00
Anton Dyudin
49ee373df7 Merge branch 'test' into demo 
Conflicts:
	urb/urbit.pill
	urb/zod/base/ape/hood.hoon
	urb/zod/base/mar/hoon.hoon
 2015-06-15 15:06:59 -07:00
Anton Dyudin
ff94ef162b Revert "Revert "remove docs for demo", "remove odds and ends", "demo network", "DEMO ONLY: root beak as %demo."" 
This reverts commit b07f8c81db3f7ab0a10d1b8ddc58de7c593612fc.

Conflicts:
	urb/urbit.pill
	urb/zod/base/pub/doc/guide/a-ford.md
	urb/zod/base/pub/doc/hoon/library/3bg.md
 2015-06-15 14:56:52 -07:00
Philip C Monk
894468a70d fixed more problems 2015-06-12 20:48:16 -04:00
Philip C Monk
f77720cfa5 fixed (?) pier-not-coming-up issue 2015-06-12 20:23:08 -04:00
Philip C Monk
2aa655fa3d more whitespace cleanup 2015-06-12 14:24:14 -04:00
Philip C Monk
e3537b3412 partial whitespace cleanup 2015-06-12 13:56:30 -04:00
Philip C Monk
c0baedb438 mount mostly works 2015-06-11 23:52:42 -04:00
Anton Dyudin
307e8cf776 formatting, .hoon highlighting 2015-06-11 14:53:32 -07:00
Anton Dyudin
458a2923e2 moved lilt cache to use beak 2015-06-11 14:53:19 -07:00
Henry Ault
d4fedca801 ip loop 2015-06-11 14:30:48 -07:00
Henry Ault
303d79a556 ip addresses 2015-06-11 13:03:49 -07:00
Philip Monk
a14ef8594a Merge pull request #289 from chc4/code-doc 
runnable <pre urb:exec=""> examples
 2015-06-11 12:19:24 -07:00
Charlie Cummings
e2124792cc runnable <pre urb:exec> examples 2015-06-11 15:09:12 -04:00
Henry Ault
521c83207a Merge branch 'demo' of https://github.com/urbit/urbit into demo 2015-06-10 17:01:46 -07:00
Henry Ault
9bb5d52804 big clean up 2015-06-10 17:01:23 -07:00
Henry Ault
273400608c cutting out create-disk 2015-06-10 13:53:43 -07:00
C. Guy Yarvin
94fca664fe Some formatting cleanups. 2015-06-10 11:08:49 -07:00
C. Guy Yarvin
0acc1cd921 Format. 2015-06-10 10:38:40 -07:00
C. Guy Yarvin
638ec00f08 DEMO ONLY: don't show doznec flapping. 2015-06-09 19:37:34 -07:00
Anton Dyudin
b3fbdc6d3a various fixes and improvements 2015-06-09 16:35:04 -07:00
C. Guy Yarvin
47409846e0 Revert "Debug printfs." 
This reverts commit a565c4ae8d515311883e9fa4ad7e9f253de38d0c.

Conflicts:
	urb/zod/base/ape/talk.hoon
 2015-06-09 16:34:03 -07:00
C. Guy Yarvin
ef3052e696 Revert "Moar printf." 
This reverts commit 4455f5388aaea0229afee9532f59108c4a7b22aa.

Conflicts:
	urb/zod/base/ape/talk.hoon
 2015-06-09 16:33:34 -07:00
C. Guy Yarvin
c81f2448bc Revert "Right." 
This reverts commit fbdff0c3e2aae8364f044c4572eff9faa1dc1700.

Conflicts:
	urb/zod/base/ape/talk.hoon
 2015-06-09 16:33:00 -07:00
C. Guy Yarvin
831cd4757e Merge branch 'demo' of https://github.com/urbit/urbit into demo 2015-06-09 16:12:53 -07:00
Galen Wolfe-Pauly
76dfbc4110 Merge branch 'demo' of github.com:urbit/urbit into demo 2015-06-09 14:57:02 -07:00
Galen Wolfe-Pauly
9076c6074b talk detail 2015-06-09 14:56:54 -07:00
Philip C Monk
b13941458b all compiles 2015-06-09 16:55:07 -04:00
Anton Dyudin
a0c5212ee3 work around ^~ language issue, restore lib/talk 
Conflicts:
	urb/zod/base/lib/talk.hoon
 2015-06-09 12:21:54 -07:00
Anton Dyudin
a02f8d0f06 work around ^~ language issue, restore lib/talk 2015-06-09 12:20:51 -07:00
Philip C Monk
07fc0a5def basic clay stuff written, haven't compiled 2015-06-09 15:18:32 -04:00
Henry Ault
277886d092 list images 2015-06-09 10:35:02 -07:00
Galen Wolfe-Pauly
ae4ddbb50b Merge branch 'demo' of github.com:urbit/urbit into demo 2015-06-09 10:12:10 -07:00
C. Guy Yarvin
63a71c7200 Some tweaks. 2015-06-09 08:23:40 -07:00
C. Guy Yarvin
e09301dd48 Fix obsolete-beak and gall-misordering bugs. 2015-06-08 23:53:39 -07:00
Galen Wolfe-Pauly
d030d5dc82 Merge branch 'demo' of github.com:urbit/urbit into demo 2015-06-08 18:14:51 -07:00
Galen Wolfe-Pauly
a4e3254c8a fonts and some talk details 2015-06-08 18:14:18 -07:00
C. Guy Yarvin
d290c2288b But compiling. 2015-06-08 17:06:42 -07:00
C. Guy Yarvin
5c745dbcc4 Prinrtf. 2015-06-08 17:05:43 -07:00
C. Guy Yarvin
e35e682bd4 Yes. 2015-06-08 16:48:46 -07:00
C. Guy Yarvin
edb77b95cb But actually compiling. 2015-06-08 16:46:56 -07:00
C. Guy Yarvin
ecc39e0fef Printf. 2015-06-08 16:46:26 -07:00
C. Guy Yarvin
1d09626776 Less. 2015-06-08 16:36:14 -07:00
C. Guy Yarvin
b9b470ae78 Moar! 2015-06-08 16:20:50 -07:00