urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-13 16:03:36 +03:00
Code Issues Packages Projects Releases Wiki Activity
754 Commits 768 Branches 10 Tags 215 MiB
025bb6bce0
Commit Graph

754 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gavin Whelan
025bb6bce0 Merge branch 'master' of https://github.com/urbit/urbit 2014-06-02 15:09:42 -04:00
Gavin Whelan
ee60334853 Merge branch 'master' of https://github.com/urbit/urbit 
This commit is broken, but I needed to merge before pulling in the fix

Conflicts:
	urb/urbit.pill
 2014-06-02 14:56:27 -04:00
Luke Patmore
0930a9eb77 Added jet linkage for co_emco, co_oxco, and co_roco. Added templates for co jets. 2014-06-02 11:48:16 -07:00
Gavin Whelan
376e1079d4 Removed printout and improved :update 2014-06-02 14:41:53 -04:00
Gavin Whelan
4b4ba12e1c Merge branch 'master' of https://github.com/urbit/urbit 2014-06-02 09:19:06 -04:00
Gavin Whelan
6838d3aed8 Commit for debugging, formatting and stuff 2014-06-02 09:19:00 -04:00
John Dulin
6cb0150ae1 Merge branch 'master' of https://github.com/urbit/urbit 2014-06-01 18:31:41 -07:00
John Dulin
c037d463cc Commented set, map, jar, jug, queue arms. Added jet tag to ++ fac 2014-06-01 18:31:32 -07:00
C. Guy Yarvin
a198114ab5 Before mysterious zapcol crash. 2014-06-01 16:28:49 -07:00
C. Guy Yarvin
20c3964c14 Merge branch 'master' of github.com:urbit/urbit 2014-06-01 14:07:38 -07:00
C. Guy Yarvin
ea54293ee2 Improved eyre/gall integration. 2014-06-01 14:07:13 -07:00
James Torre
1e1c40377f syntax error fixed, cenhep -> colhep 2014-06-01 17:54:39 +00:00
pcmonk
6bc6175fad Fixed few bugs, removed line noise in chat/haus 2014-05-31 21:00:10 -07:00
~hatteb-mitlyd
a2ad059d05 Fix :report for ames 2014-05-31 19:28:04 -07:00
johncburnham
4d450a4e3d Merge branch 'master' of https://github.com/urbit/urbit 2014-05-31 18:41:44 -07:00
johncburnham
e080ee108d added some comments 2014-05-31 18:41:27 -07:00
C. Guy Yarvin
08400bbefb Merge branch 'master' of github.com:urbit/urbit 2014-05-31 17:43:01 -07:00
C. Guy Yarvin
10f48cd797 Fix proxy bug. 2014-05-31 17:42:48 -07:00
johncburnham
130f653433 fixed hmac comment 2014-05-31 16:49:48 -07:00
pcmonk
9b523d1767 Fixed multiple entrance/exit notice bug. 2014-05-31 14:46:10 -07:00
Gavin Whelan
7eea04ce1e Minor interface changes 2014-05-31 14:11:11 -07:00
pcmonk
a03634a7e1 Fixed docs 2014-05-31 14:04:22 -07:00
pcmonk
f9406a7927 Fixed chat writing-to-old-version-of-file bug. 2014-05-31 14:03:17 -07:00
pcmonk
a830b6cfa9 Fixed :haus name bug 2014-05-31 13:56:40 -07:00
C. Guy Yarvin
4db07a816d More pre-breach fixes. 2014-05-31 13:22:49 -07:00
C. Guy Yarvin
32295555c5 Scry interface fixes. 2014-05-31 12:40:02 -07:00
C. Guy Yarvin
26be7c0871 Update packet version number to 0. 2014-05-31 11:31:15 -07:00
C. Guy Yarvin
8ed177e55a Remove a printf. 2014-05-31 11:25:10 -07:00
Gavin Whelan
341779681e Merge branch 'master' of https://github.com/urbit/urbit 2014-05-31 10:58:55 -07:00
Gavin Whelan
70622cb64e Small chat fixes 2014-05-31 10:58:39 -07:00
C. Guy Yarvin
733ff7f0c6 Fill in some stubs in %ford. 2014-05-31 05:52:06 -07:00
C. Guy Yarvin
afa57ae065 Change %ames namespace. 2014-05-30 21:58:37 -07:00
~hatteb-mitlyd
1c20ba00f4 actually commit the protocol 2014-05-30 18:58:16 -07:00
~hatteb-mitlyd
733e1b0a8f Merge remote-tracking branch 'origin/newbreach' 
Update protocol for breach.

Conflicts:
	f/trac.c
	urb/urbit.pill
	urb/zod/arvo/zuse.hoon
	v/raft.c
 2014-05-30 17:56:12 -07:00
C. Guy Yarvin
42bd55fdb4 Eliminate use of ++vane. 2014-05-30 16:51:35 -07:00
Gavin Whelan
47774a10a4 Final stuff 2014-05-30 16:40:56 -07:00
Gavin Whelan
cded6c902d Merge various changes 2014-05-30 16:13:44 -07:00
Gavin Whelan
6177ebbb26 Merge and minor merge changes 2014-05-30 15:59:58 -07:00
C. Guy Yarvin
dc4e9a41ca Changed some interfaces. 2014-05-30 15:51:31 -07:00
pcmonk
314ade93ea Updated chat, changed room to haus 2014-05-30 15:41:22 -07:00
C. Guy Yarvin
80dda23245 Add version state to vanes. 2014-05-30 15:10:39 -07:00
C. Guy Yarvin
a087b13417 Unbreak :reset. 2014-05-30 15:04:20 -07:00
C. Guy Yarvin
7c1cad4672 Revert "Remove unused arms from arvo external core." 
This reverts commit b754c2aeadbc8028a2e7989066dbbf08d2f293ef.
 2014-05-30 14:51:28 -07:00
C. Guy Yarvin
eb2f4a560b Remove unused arms from arvo external core. 2014-05-30 14:45:41 -07:00
Gavin Whelan
fec9999f42 Using named tiles 2014-05-30 13:58:12 -07:00
C. Guy Yarvin
6455b41363 Slow things commented out. 2014-05-30 13:57:49 -07:00
johncburnham
6aac6caf9c added glyph mnemonics 2014-05-30 13:52:35 -07:00
Gavin Whelan
aaee76e324 Merging clay fixes 2014-05-30 13:36:51 -07:00
C. Guy Yarvin
f729afacb1 Clay refactored to top-level redes. 2014-05-29 19:26:35 -07:00
C. Guy Yarvin
7d0be097de Middle stage of clay restructuring. 2014-05-29 19:12:02 -07:00