ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-21 05:41:43 +03:00
Code Issues Packages Projects Releases Wiki Activity
2,637 Commits 6 Branches 0 Tags 164 MiB
f58a43c327
Commit Graph

129 Commits

Author SHA1 Message Date
Philip C Monk
de8ff5c595 fixd deeper hash bug 2015-04-24 19:35:24 -04:00
Philip C Monk
ca788cac3c Merge remote-tracking branch 'origin/test' into typedclay 
Conflicts:
	urb/urbit.pill
	urb/zod/main/app/helm/core.hook
	urb/zod/main/arvo/ford.hoon
 2015-04-23 20:46:25 -04:00
Galen Wolfe-Pauly
f78916e2ad Merge branch 'test' of github.com:urbit/urbit into test 2015-04-22 17:43:58 -07:00
Galen Wolfe-Pauly
a8dd15c34d a cleaner library 2015-04-22 17:43:52 -07:00
Philip C Monk
dd0716eb72 Merge branch 'master' into typedclay 
Conflicts:
	n/t.c
	urb/urbit.pill
	urb/zod/main/app/reload/core.hook
	urb/zod/main/app/shell/core.hook
	urb/zod/main/app/solid/core.hook
	urb/zod/main/arvo/dill.hoon
	urb/zod/main/arvo/eyre.hoon
	urb/zod/main/arvo/ford.hoon
	urb/zod/main/arvo/gall.hoon
	urb/zod/main/arvo/hoon.hoon
	urb/zod/main/mar/json/door.hook
	urb/zod/main/mar/md/door.hook
	urb/zod/main/mar/txt/door.hook
	v/raft.c
	v/unix.c
 2015-04-22 20:18:19 -04:00
Anton Dyudin
6d76b13162 pub/sole/fab up 2015-04-14 13:38:37 -07:00
Anton Dyudin
da107ab17c share.coffee lib/sole implementation 2015-04-13 17:20:54 -07:00
Philip C Monk
b62bacbf1d annotated merges seem to be working 2015-04-13 17:29:39 -04:00
Galen Wolfe-Pauly
afdbac72b7 oh yeah uncomment that 2015-04-10 14:47:53 -07:00
Anton Dyudin
4b35965138 converters up 2015-04-09 23:57:04 -07:00
Anton Dyudin
83ed68829b Revert "Pass dependencies as mark /$" 
This reverts commit b7d00f943270eeb9f33df07fa4149fbc0c86887a.

Conflicts:
	urb/zod/arvo/eyre.hoon
	urb/zod/arvo/ford.hoon
	urb/zod/main/mar/urb/door.hook
 2015-04-09 13:42:11 -07:00
Anton Dyudin
1d9490c322 Merge remote-tracking branch 'origin/test' into dillbo 
Conflicts:
	urb/urbit.pill
 2015-04-08 18:42:06 -07:00
Anton Dyudin
886bbe9aca Matrix frontend v1 2015-04-08 18:37:43 -07:00
C. Guy Yarvin
d76b5d43c7 New url stuff on test branch. 2015-04-08 15:01:47 -07:00
Anton Dyudin
33bd5366cc hook/door/dill-belt/mar 2015-04-07 16:07:10 -07:00
Philip C Monk
939c129539 bug fixes 2015-04-06 19:20:28 -04:00
C. Guy Yarvin
438816f893 Update talk-report for %cabal. 2015-04-06 12:57:23 -07:00
Philip C Monk
76fd6824a6 :merge rework 2015-04-03 21:31:57 -04:00
C. Guy Yarvin
e52327a083 Various fixes and improvements. 2015-04-01 13:56:43 -07:00
Anton Dyudin
259311f205 Merge branch 'eyre-new' into dillbo 
Conflicts:
	urb/urbit.pill
 2015-03-26 13:33:08 -07:00
Anton Dyudin
9e73238769 non-json messages up 2015-03-26 12:13:32 -07:00
C. Guy Yarvin
427403a701 Great renamings. 2015-03-25 11:12:35 -07:00
C. Guy Yarvin
d20338305c Renaming, first step. 2015-03-25 11:03:40 -07:00
Anton Dyudin
cc45140ca6 Cached %bake 
Conflicts:
	urb/zod/main/arvo/ford.hoon
	urb/zod/main/mar/react-snip/door.hook
	urb/zod/main/mar/react/door.hook
	v/raft.c
 2015-03-24 16:30:30 -04:00
C. Guy Yarvin
f541021cc8 Various fixes and improvements. 2015-03-23 05:30:00 -07:00
Anton Dyudin
bf84060fde debug/to support files 2015-03-13 16:44:46 -07:00
Philip C Monk
995d006e7a sub downloads files, but doesn't start terminal 2015-03-12 20:38:12 -04:00
Philip C Monk
c5fb969904 remove extraneous printfs 2015-03-09 17:36:04 -04:00
Philip C Monk
1d6e199d65 merging across network tentatively works 2015-03-06 17:28:55 -05:00
Philip C Monk
459604b7df first over-the-network typed merge 2015-03-06 16:07:34 -05:00
Philip C Monk
4f2e514563 waypoint 2015-03-05 20:19:54 -05:00
Philip C Monk
31d3788115 Merge remote-tracking branch 'origin/master' into typedclay 
Conflicts:
	urb/urbit.pill
	urb/zod/arvo/eyre.hoon
	urb/zod/arvo/hoon.hoon
	urb/zod/arvo/zuse.hoon
	urb/zod/main/app/poke/core.hook
	urb/zod/main/app/reboot/core.hook
	urb/zod/main/app/shell/core.hook
	urb/zod/main/app/tree/core.hook
 2015-03-05 18:27:07 -05:00
Philip C Monk
0e024a009f move along, nothing to see here 2015-02-27 01:35:41 -05:00
Anton Dyudin
d5b51d1842 Cached %bake 2015-02-20 13:42:57 -08:00
Anton Dyudin
32c86fc4e5 Merge branch 'master' into eyre-new 
Conflicts:
	urb/urbit.pill
 2015-02-19 15:16:52 -08:00
Anton Dyudin
836dd6fa52 Client-side hash update 2015-02-18 15:15:27 -08:00
Anton Dyudin
8c1ce4fa55 Init auth 2015-02-17 13:05:28 -08:00
Galen Wolfe-Pauly
261fcc9029 better snips 2015-02-17 12:53:06 -08:00
Anton Dyudin
dbc02e0749 Pass dependencies as mark /$ 2015-02-13 19:48:40 -08:00
Anton Dyudin
6ea8322432 Minor mark tweaks 2015-02-13 19:41:37 -08:00
Anton Dyudin
12508568af Shell : edit path inference 2015-02-12 13:04:33 -08:00
Anton Dyudin
c96c630ab4 Merge branch 'master' into eyre-new 
Conflicts:
	urb/zod/main/mar/psal/door.hook
 2015-02-05 21:04:40 -08:00
Anton Dyudin
fe338abe87 Initial eyre paring down 2015-02-05 21:00:35 -08:00
Galen Wolfe-Pauly
886a91c15f need the psal garb 2015-02-04 17:23:47 -08:00
Galen Wolfe-Pauly
dde694b535 snips 2015-02-04 14:59:15 -08:00
Galen Wolfe-Pauly
b796b9d8e0 class -> className 2015-02-03 13:01:24 -08:00
Galen Wolfe-Pauly
1fee5836ee react mar 2015-01-30 18:02:40 -08:00
Galen Wolfe-Pauly
26d26af927 react door 2015-01-29 17:50:35 -08:00
C. Guy Yarvin
8c0e89949b Stage down to 163. 2015-01-26 16:25:27 -08:00
C. Guy Yarvin
335cb42764 Fix bad merge. 2015-01-26 09:44:09 -08:00