urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-15 04:22:48 +03:00
Code Issues Packages Projects Releases Wiki Activity
2,694 Commits 768 Branches 10 Tags 215 MiB
f7565dc039
Commit Graph

2694 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Philip C Monk
f7565dc039 Merge branch 'dropped' into typedclay 2015-04-30 18:08:52 -04:00
Philip C Monk
f073b515f6 fixed %cy hashes and allow de-sync from unix 2015-04-28 17:36:37 -04:00
Philip C Monk
7a21ebcd85 Merge branch 'typedclay' into test 2015-04-28 14:20:40 -04:00
Philip C Monk
280728d1f3 sync to main-away 2015-04-28 14:20:22 -04:00
Anton Dyudin
4c59877cdf slightly fixed stack traces 2015-04-27 17:46:55 -07:00
Philip C Monk
ea2c2e2a8d local merge checkout optimization 2015-04-27 17:29:56 -04:00
Philip C Monk
de8ff5c595 fixd deeper hash bug 2015-04-24 19:35:24 -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
Galen Wolfe-Pauly
6e76dc5ecb better links, tree fix 2015-04-23 13:58:43 -07:00
Galen Wolfe-Pauly
8dc26c3eb6 working on links 2015-04-23 13:43:47 -07:00
Galen Wolfe-Pauly
0cce8e35d3 anchor links 2015-04-23 11:34:19 -07:00
Galen Wolfe-Pauly
51f90fd136 working on type 2015-04-23 11:32:38 -07:00
Galen Wolfe-Pauly
34f235bab2 whoops, live links 2015-04-22 17:45:12 -07: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
459be5899f 80 column violation 2015-04-22 15:55:46 -07:00
Anton Dyudin
1287173dc7 more ctrl keys 2015-04-22 15:35:35 -07:00
Anton Dyudin
4ffadbf7ee factored out websole coffee 2015-04-22 15:35:12 -07:00
Philip C Monk
ba69927f53 new hash algorithm works 2015-04-21 16:23:50 -04:00
Anton Dyudin
f5a0fa4f56 Added alt-arrow navigation 2015-04-20 17:55:00 -07:00
Anton Dyudin
e15a06ae4b communicate history changes to server 2015-04-20 16:46:08 -07:00
Anton Dyudin
4a94b574de Tracking down lost requests 2015-04-20 16:45:31 -07:00
Philip C Monk
4934595617 waypoint 2015-04-20 19:36:19 -04:00
Anton Dyudin
5ebe273494 added sole history 2015-04-20 14:46:40 -07:00
Philip C Monk
872bb5b1c1 cal in mate/meld 2015-04-20 16:42:18 -04:00
Philip C Monk
8de064cf1f new %meet compiles 2015-04-18 03:31:58 -04:00
Philip C Monk
af8617dc9a removed printfs 2015-04-17 19:21:54 -04:00
Philip C Monk
7ae4742d10 boots again 2015-04-16 20:22:39 -04:00
Anton Dyudin
dab189541a fixed reload order 2015-04-16 16:41:00 -07:00
Anton Dyudin
96e1eca2b4 jesc control character escaping 2015-04-16 16:22:30 -07:00
Anton Dyudin
f917d859af urb.wall disableable by setting urb.wal===false 2015-04-16 15:45:18 -07:00
Anton Dyudin
fff344f9ff reconnect to console 2015-04-16 12:40:53 -07:00
Anton Dyudin
71489b6b62 later prep 2015-04-14 19:12:08 -07:00
Anton Dyudin
31c2cb220b OT tweaking 2015-04-14 19:01:26 -07:00
Philip C Monk
8560bae3b8 waypoint 2015-04-14 20:48:37 -04:00
Anton Dyudin
3d0e11750f Dead duct pile 2015-04-14 14:16:46 -07:00
Anton Dyudin
93c2956fc7 cursor tweak 2015-04-14 13:57:12 -07:00
Anton Dyudin
6d76b13162 pub/sole/fab up 2015-04-14 13:38:37 -07:00
Philip C Monk
2e462a3c0d waypoint 2015-04-13 20:29:54 -04: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
519c1627f8 date instead of time 2015-04-10 16:05:18 -07:00
Galen Wolfe-Pauly
2d6666e5e8 Merge branch 'master' of github.com:urbit/urbit 2015-04-10 15:45:29 -07:00
Galen Wolfe-Pauly
cb15c3ce11 use .json in unsub 2015-04-10 15:45:17 -07:00
Anton Dyudin
fde1401bca Loosen dill-belt type XX temporary 2015-04-10 15:13:20 -07:00
Galen Wolfe-Pauly
afdbac72b7 oh yeah uncomment that 2015-04-10 14:47:53 -07:00