urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-14 11:08:45 +03:00
Code Issues Packages Projects Releases Wiki Activity
1,148 Commits 768 Branches 10 Tags 215 MiB
c1a4aa7886
Commit Graph

124 Commits

Author SHA1 Message Date
Jared Hance
c1a4aa7886 Merge branch 'master' into klay 
Conflicts:
	urb/urbit.pill
 2014-07-30 15:14:38 -04:00
Anton Dyudin
cc9bf52fc8 working* %zuse in chat hax 2014-07-29 18:09:11 -07:00
Anton Dyudin
473944dca1 %zuse in chat hax 2014-07-29 18:05:05 -07:00
Anton Dyudin
15e6734ccb Added :wipe gall %wipe app retcon utility. 2014-07-29 16:45:33 -07:00
Jared Hance
ef94352267 Merge branch 'master' into klay 
Conflicts:
	urb/urbit.pill
 2014-07-29 13:25:18 -04:00
Jared Hance
dbb5995c9d Trivial fixes 2014-07-28 10:25:07 -04:00
Jared Hance
3a48876a4d Fix referential transparency in %cu 2014-07-25 13:44:06 -04:00
Jared Hance
667ad45403 Semi-working merges. 2014-07-24 15:21:58 -04:00
Jared Hance
fb24594e9e Can boot subs now! 2014-07-24 11:11:40 -04:00
Anton Dyudin
d4cd1cdb47 :update "merge method" clarification 2014-07-23 15:36:10 -07:00
Anton Dyudin
cde3031388 :begin ~ship ~ticket form 2014-07-23 15:15:30 -07:00
C. Guy Yarvin
3378245281 Functional build skeleton. 2014-07-20 20:15:02 -07:00
Jared Hance
3c85c88040 Merge branch 'clay' 
Conflicts:
	urb/urbit.pill
 2014-07-16 13:56:34 -04:00
pcmonk
0dd086550d add timestamps and textual names for = in chat 2014-07-10 12:01:24 -07:00
pcmonk
8b8e1218fd chat private messaging prompt now persistent 2014-07-10 10:42:05 -07:00
Jared Hance
07998df9e1 Add ++niku to ++saba. 2014-07-10 10:38:53 -04:00
pcmonk
77db780c48 chat no longer echoes own messages 2014-07-07 18:15:53 -07:00
pcmonk
dcd09da912 fixed backlog, heartbeat, private messages in chat 2014-07-03 18:47:51 -07:00
pcmonk
40329afb12 improved chat 2014-07-03 11:14:22 -07:00
pcmonk
f0d41ea9d6 progress in chat, added reverse of sup.hid 2014-07-02 18:53:53 -07:00
pcmonk
ea49cdca02 progress on %gall over %ames 2014-07-02 15:08:02 -07:00
Anton Dyudin
9dd5731acc :thumb fix 2014-06-28 00:09:41 -07:00
~hatteb-mitlyd
348f11255b Merge remote-tracking branch 'urbit/newnextbreach' 
this obsoletes newnextbreach, nextbreach, newbreach, et cetera.

Conflicts:
	gen164/4/in.c
	urb/zod/arvo/hoon.hoon
 2014-06-25 13:39:48 -07:00
pcmonk
bbdc396446 Fixed 80-column violation. 2014-06-09 18:47:32 -07:00
pcmonk
79b4512479 Updated chat. Also added +-tur to ++by. 2014-06-09 18:45:19 -07:00
~hatteb-mitlyd
ccab422c6f minor cleanups 2014-06-07 13:58:29 -07:00
Gavin Whelan
eeb1591fb6 Minor changes 2014-06-07 13:42:48 -04:00
C. Guy Yarvin
209f8bf9dd No card in begin 2014-06-06 11:51:24 -07:00
C. Guy Yarvin
14301c9beb Visible Arvo. 2014-06-05 20:41:47 -07:00
Gavin Whelan
376e1079d4 Removed printout and improved :update 2014-06-02 14:41:53 -04: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
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
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
Gavin Whelan
70622cb64e Small chat fixes 2014-05-31 10:58:39 -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
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
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
feec26017d Merge changes 2014-05-28 16:34:05 -07:00
C. Guy Yarvin
25ef176649 %gall now added to solid. 2014-05-28 15:06:52 -07:00
Gavin Whelan
a242cea2b2 Merging merge 2014-05-28 12:26:16 -07:00
~hatteb-mitlyd
bacbf0f1fc correct parsing for govt, actually fix %lady form 2014-05-24 18:19:47 -07:00