ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-14 17:41:33 +03:00
Code Issues Packages Projects Releases Wiki Activity
1,614 Commits 6 Branches 0 Tags 164 MiB
cfbcadd465
Commit Graph

1614 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Philip C Monk
cfbcadd465 finished with %into in 2015-06-05 19:35:41 -04:00
Philip C Monk
2f26b60d59 initial work 2015-06-04 22:47:27 -04:00
Anton Dyudin
7fd0f0aa1a Merge branch 'test' of https://github.com/urbit/urbit into test 
Conflicts:
	urb/urbit.pill
 2015-06-03 15:15:12 -07:00
Philip C Monk
14489860bd Merge branch 'test' of https://github.com/urbit/urbit into test 
Conflicts:
	urb/urbit.pill
 2015-06-03 17:36:45 -04:00
Philip C Monk
686d260f30 Merge branch 'test' of https://github.com/urbit/urbit into test 
Conflicts:
	urb/urbit.pill
	urb/zod/base/ape/hood/core.hook
	urb/zod/base/lib/helm/core.hook
 2015-06-03 17:31:37 -04:00
Anton Dyudin
7575e3bf99 Revert "demo network" 
This reverts commit f187d2d7e01a54823f3e979af9bbd148b398e7e9.

Conflicts:
	urb/urbit.pill
 2015-06-03 14:19:49 -07:00
Anton Dyudin
0e6bc0e24c Merge branch 'demo' into test 2015-06-03 13:15:46 -07:00
Anton Dyudin
89a703c954 Ignore commits 'f073c490f9f' and '8e1e40d75' in test. 
Docs kept, "odds and ends" kept
 2015-06-03 13:15:06 -07:00
Anton Dyudin
cae09b4e49 Merge commit 'f073c490f9^' into test 
Conflicts:
	urb/urbit.pill
 2015-06-03 12:54:56 -07:00
Henry Ault
d279d5245c Merge branch 'test' of https://github.com/urbit/urbit into test 2015-06-02 18:36:40 -07:00
Anton Dyudin
ce8b12dde3 Merge branch 'test' of https://github.com/urbit/urbit into test 
Conflicts:
	urb/urbit.pill
 2015-06-02 18:35:56 -07:00
Philip C Monk
33cf8404fb Merge branch 'goningfix' into test 2015-06-02 21:25:16 -04:00
Philip C Monk
c9f7d39f41 Merge branch 'test' of https://github.com/urbit/urbit into test 2015-06-02 21:24:56 -04:00
Philip C Monk
11c36dad35 add sanity assert 2015-06-02 20:35:09 -04:00
Philip C Monk
bdd7f6b171 better fix 2015-06-02 20:13:10 -04:00
C. Guy Yarvin
f93f84ffe0 Various fixes and improvements. 2015-06-02 16:17:55 -07:00
Philip C Monk
529301335b attempting to fix goning problem 2015-06-02 16:40:53 -04:00
Philip C Monk
0143c3ca21 Merge branch 'test' of https://github.com/urbit/urbit into test 2015-06-02 15:14:27 -04:00
Philip C Monk
91713054f8 fix a couple of small memory leaks 2015-06-01 21:31:37 -04:00
C. Guy Yarvin
e54b7f8d89 Merge branch 'test' into demo 
Conflicts:
	urb/urbit.pill
 2015-06-01 16:47:09 -07:00
Anton Dyudin
bfc3d70902 Merge branch 'test' of https://github.com/urbit/urbit into test 
Conflicts:
	urb/urbit.pill
 2015-06-01 16:25:21 -07:00
Philip C Monk
5525f22c1c fix build 2015-06-01 16:06:01 -04:00
C. Guy Yarvin
d7ec8c1880 Merge branch 'test' into demo 
Conflicts:
	urb/urbit.pill
 2015-06-01 10:59:17 -07:00
C. Guy Yarvin
dedce2cdb3 Moar filez. 2015-06-01 06:34:06 -07:00
Philip C Monk
bfd1caaeea Merge branch 'nextbreach' into test 
Conflicts:
	urb/zod/base/ape/hood/core.hook
	urb/zod/base/lib/kiln/core.hook
 2015-05-31 23:36:30 -04:00
Galen Wolfe-Pauly
2b281a79e9 demo network 2015-05-31 12:07:42 -07:00
C. Guy Yarvin
322cc92427 Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-29 12:45:27 -07:00
Anton Dyudin
95a59a2b67 updated gitignore 2015-05-29 12:13:49 -07:00
Anton Dyudin
2b5fdca621 Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-29 12:09:42 -07:00
C. Guy Yarvin
700173142a Merge branch 'test' of https://github.com/urbit/urbit into test 
Conflicts:
	urb/zod/base/ape/octo/core.hook
 2015-05-29 01:37:12 -07:00
Anton Dyudin
4adb4a701d Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-28 16:34:40 -07:00
Anton Dyudin
dedad89acb Merge branch 'test' of https://github.com/urbit/urbit into test 
Conflicts:
	urb/zod/base/ape/bit/core.hook
 2015-05-28 16:34:26 -07:00
C. Guy Yarvin
682efcdac0 Merge branch 'test' into goodtest 2015-05-28 12:17:44 -07:00
C. Guy Yarvin
e11b1a5468 Merge branch 'test' into goodtest 
Conflicts:
	urb/urbit.pill
	urb/zod/base/ape/dojo/core.hook
	urb/zod/base/ape/hood/core.hook
	urb/zod/base/ape/octo/core.hook
	urb/zod/base/arvo/hoon.hoon
 2015-05-28 12:16:10 -07:00
Anton Dyudin
f414331d80 Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-28 11:10:20 -07:00
Henry Ault
daa0a70d2b Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-26 17:29:15 -07:00
Philip C Monk
0ef81e84ef better unix.c errors 2015-05-26 19:53:37 -04:00
Anton Dyudin
941aaf99ab Merge branch 'master' into test 
Conflicts:
	urb/urbit.pill
	urb/zod/base/pub/tree/src/js/components/CodeMirror.coffee
	urb/zod/base/pub/tree/src/js/main.js
 2015-05-26 15:12:26 -07:00
Anton Dyudin
75dcff7dd0 Merge branch 'test'@0b9d56f 
Conflicts:
	urb/urbit.pill
 2015-05-26 14:45:48 -07:00
Anton Dyudin
7ee7c73327 Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-26 13:57:30 -07:00
Henry Ault
1cf1581aaa Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-25 19:28:24 -07:00
demo
1817064468 Merge branch 'master' of https://github.com/urbit/urbit 2015-05-25 19:14:34 +00:00
demo
ca024f1ceb better ssl error reporting 2015-05-25 19:14:20 +00:00
Galen Wolfe-Pauly
18d70ee885 bin/viere -> bin/urbit in readme 2015-05-25 10:38:26 -07:00
Anton Dyudin
8a28e44e7f Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-21 17:40:05 -07:00
Henry Ault
1555c3acfa Merge branch 'do' into test 2015-05-21 17:24:09 -07:00
Anton Dyudin
7b2ad984b0 Merge branch 'test' of https://github.com/urbit/urbit into test 
Conflicts:
	urb/urbit.pill
 2015-05-21 16:04:11 -07:00
C. Guy Yarvin
77e08e1b1f Merge branch 'master' of https://github.com/urbit/urbit 2015-05-21 15:35:30 -07:00
C. Guy Yarvin
82eca79910 No dirty pages 2015-05-21 15:35:14 -07:00
C. Guy Yarvin
6088ddcef5 No dirty pages. 2015-05-21 15:34:49 -07:00