ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-30 10:27:11 +03:00
Code Issues Packages Projects Releases Wiki Activity
2,645 Commits 6 Branches 0 Tags 164 MiB
7718f4e32f
Commit Graph

530 Commits

Author SHA1 Message Date
Philip C Monk
e39cfecded Merge branch 'typedclay' into test 2015-04-28 17:39:07 -04:00
Philip C Monk
2547c08f67 Merge branch 'test' of https://github.com/urbit/urbit into test 
Conflicts:
	urb/urbit.pill
 2015-04-28 17:39:03 -04:00
Philip C Monk
f073b515f6 fixed %cy hashes and allow de-sync from unix 2015-04-28 17:36:37 -04:00
Anton Dyudin
4a3c08e8f1 gall no longer talks to clay 2015-04-28 13:02:32 -07:00
Philip C Monk
280728d1f3 sync to main-away 2015-04-28 14:20:22 -04:00
Philip C Monk
0fc29d1a38 fixed hash bug 2015-04-24 17:07:34 -04:00
Philip C Monk
df357653e9 send merge messages to talk 2015-04-24 16:03:23 -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
Philip C Monk
75e4b36d36 port merge tools to dojo model 2015-04-23 20:34:36 -04: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
5ebe273494 added sole history 2015-04-20 14:46:40 -07:00
Anton Dyudin
dab189541a fixed reload order 2015-04-16 16:41:00 -07: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
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
Philip C Monk
9e10039dfc bug fixing 2015-04-08 20:51:34 -04:00
C. Guy Yarvin
d76b5d43c7 New url stuff on test branch. 2015-04-08 15:01:47 -07:00
C. Guy Yarvin
2310047968 Merge branch 'master' of https://github.com/urbit/urbit 
Conflicts:
	urb/urbit.pill
 2015-04-08 11:36:01 -07:00
Philip C Monk
56948115ef added :helm+init 2015-04-08 14:27:51 -04:00
C. Guy Yarvin
ee91ef6888 "Fix" init sync. 2015-04-07 19:19:31 -07:00
Anton Dyudin
3c2762a9d1 :helm+sync syd her sud 2015-04-07 18:08:48 -07:00
Anton Dyudin
f2efac054b Merge branch 'dillbo' of https://github.com/urbit/urbit into dillbo 2015-04-07 16:07:35 -07:00
Anton Dyudin
33bd5366cc hook/door/dill-belt/mar 2015-04-07 16:07:10 -07:00
Philip C Monk
c7d8cfd114 mostly working userlevel conflict merge 2015-04-07 18:24:16 -04:00
C. Guy Yarvin
033537eb76 Various fixes and improvements. 2015-04-07 15:12:12 -07:00
C. Guy Yarvin
832da6c6c0 Rename gun to dog; some dojo syntax updates. 2015-04-07 14:15:06 -07:00
C. Guy Yarvin
982467e95f Various fixes and improvements. 2015-04-07 12:05:21 -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
C. Guy Yarvin
30dc55c92a Various fixes and improvements. 2015-04-05 10:00:36 -07:00
C. Guy Yarvin
23d1175a2b Fix previous commit. Disable ++pray. 2015-04-04 03:54:25 -07:00
C. Guy Yarvin
2439350cc3 Various fixes and improvements. 2015-04-04 03:44:22 -07:00
Philip C Monk
76fd6824a6 :merge rework 2015-04-03 21:31:57 -04:00
C. Guy Yarvin
332fd26fd4 New krow system, will become work. 2015-04-03 11:25:21 -07:00
C. Guy Yarvin
1ed2060aae Merge branch 'dillbo' of https://github.com/urbit/urbit into dillbo 
Conflicts:
	urb/urbit.pill
 2015-04-02 12:27:02 -07:00
C. Guy Yarvin
2b3a929ad2 Various fixes and improvements. 2015-04-02 11:50:31 -07:00
C. Guy Yarvin
e52327a083 Various fixes and improvements. 2015-04-01 13:56:43 -07:00
C. Guy Yarvin
7a939c247a Remove all talk. 2015-03-31 17:20:07 -07:00
C. Guy Yarvin
17c7ff476e About to move talk to radio. 2015-03-31 17:17:30 -07:00
C. Guy Yarvin
20628f135e Various fixes and improvements. 2015-03-31 00:40:43 -07:00
C. Guy Yarvin
accaa6d957 Proper prompting, mostly. 2015-03-30 13:25:30 -07:00
C. Guy Yarvin
7900271094 New talk-in-radio, proper message printing. 2015-03-29 23:43:48 -07:00
C. Guy Yarvin
68b0dece78 Before a radio revision. 2015-03-29 22:13:33 -07:00
C. Guy Yarvin
b032d7e8cc More renaming. 2015-03-28 03:57:02 -07:00
C. Guy Yarvin
b0fd0b0684 Rename :drum back to :talk. :-) 2015-03-27 15:53:35 -07:00
C. Guy Yarvin
a17157761b Add entropy to configuration interface. 2015-03-27 13:36:24 -07:00
C. Guy Yarvin
1e5f6d868b Merge branch 'dillbo' of https://github.com/urbit/urbit into dillbo 
Conflicts:
	urb/urbit.pill
 2015-03-27 13:08:04 -07:00
C. Guy Yarvin
589b2d7101 Fix some error handling issues. 2015-03-27 12:43:27 -07:00