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,579 Commits 6 Branches 0 Tags 164 MiB
e11b1a5468
Commit Graph

1579 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Henry Ault
daa0a70d2b Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-26 17:29:15 -07: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
Philip C Monk
31dfd24dc5 plug new memory leak 2015-05-21 15:15:41 -04:00
C. Guy Yarvin
abd9afc1ea No dirty pages. 2015-05-21 11:33:04 -07:00
Philip C Monk
36ac4e041d Merge branch 'nextbreach' 
Conflicts:
	urb/urbit.pill
 2015-05-21 13:49:21 -04:00
C. Guy Yarvin
ed40602cbe Fix up demo a little bit. 2015-05-21 09:05:14 -07:00
C. Guy Yarvin
3a790011f6 Merge branch 'master' into test 2015-05-20 23:17:02 -07:00
C. Guy Yarvin
f1491de7f4 Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-20 23:09:05 -07:00
Philip C Monk
fa17629697 improved unix sync 2015-05-20 20:32:54 -04:00
C. Guy Yarvin
bb97c37d46 Merge branch 'master' of https://github.com/urbit/urbit 2015-05-20 16:59:17 -07:00
C. Guy Yarvin
9c8222ea02 Merge branch 'test' 2015-05-20 16:58:58 -07:00
Anton Dyudin
277bfda9af Update commands.txt 2015-05-20 15:25:25 -07:00
Anton Dyudin
787fa17eba Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-20 15:13:42 -07:00
Henry Ault
a4a2f0c789 Merge branch 'do' of https://github.com/urbit/urbit into do 
Conflicts:
	urb/zod/base/ape/bit/core.hook
 2015-05-20 13:50:42 -07:00
Anton Dyudin
9103a1cd06 Update commands.txt 
Don't forget to start :bit
 2015-05-20 13:23:35 -07:00
Henry Ault
deceedd591 bitcoin instructions 2015-05-20 12:39:14 -07:00
C. Guy Yarvin
b915ade744 Merge branch 'test' 
Conflicts:
	urb/urbit.pill
 2015-05-20 12:33:34 -07:00
C. Guy Yarvin
08b3e2710c Merge branch 'test' 
Conflicts:
	urb/urbit.pill
 2015-05-20 12:29:30 -07:00
Anton Dyudin
ac44d6f9d0 Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-20 12:22:52 -07:00
C. Guy Yarvin
fe660a9455 Fix web login address. 2015-05-20 12:04:53 -07:00
C. Guy Yarvin
e221451eb5 Remove printf. 2015-05-20 11:53:07 -07:00
Anton Dyudin
46b5d32e6b Merge branch 'test' into do 2015-05-20 11:46:35 -07:00
Anton Dyudin
345713edac Merge branch 'test' into do 
Conflicts:
	urb/urbit.pill
	urb/zod/base/arvo/  --  took --theirs
	urb/zod/base/fap/talk/core.hook
 2015-05-20 11:45:37 -07:00
C. Guy Yarvin
c097c81012 Fix some name issues. 2015-05-20 11:39:27 -07:00
C. Guy Yarvin
d7b7af7ea6 Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-19 21:08:20 -07:00
C. Guy Yarvin
5b16f99726 Latest greatest scriptest. 2015-05-19 21:07:53 -07:00
Anton Dyudin
fe550a766e Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-19 20:31:32 -07:00
C. Guy Yarvin
8964da0c8b Check in demo instructions. 2015-05-19 19:38:03 -07:00
C. Guy Yarvin
d11dced141 Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-19 17:04:23 -07:00
C. Guy Yarvin
9bfc5674c3 Enable -q. 2015-05-19 17:04:08 -07:00
Galen Wolfe-Pauly
7405dd3323 Merge branch 'test' of github.com:urbit/urbit into test 2015-05-19 16:54:41 -07:00
Galen Wolfe-Pauly
ce2cc29d13 Merge branch 'test' of github.com:urbit/urbit into test 2015-05-19 16:22:58 -07:00
Galen Wolfe-Pauly
fcb29827c0 Merge branch 'test' of github.com:urbit/urbit into test 2015-05-19 16:13:27 -07:00
C. Guy Yarvin
1d5aefe142 Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-19 16:10:44 -07:00
Philip C Monk
9e2f7eddc2 Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-19 18:43:34 -04:00
Philip C Monk
384ab7b37e add (disabled) bad event ignore 2015-05-19 18:43:12 -04:00
Galen Wolfe-Pauly
2767bce602 Merge branch 'master' into test 
Conflicts:
	urb/urbit.pill
	urb/zod/base/arvo/eyre.hoon
 2015-05-19 15:42:49 -07:00