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,017 Commits 768 Branches 10 Tags 215 MiB
58e1f03655
Commit Graph

1017 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jared Hance
58e1f03655 Ugly ++lize stuff. 
Well, merges work better, two-way parties seem fine with merging back
and forth.
 2014-07-11 14:05:07 -04:00
Jared Hance
8e5c44a628 Update mergepoints. 2014-07-10 16:54:28 -04:00
Jared Hance
057ff37574 Clay revision control basically works. 
Just need to update the agons, coming soon.
 2014-07-10 16:07:48 -04:00
Jared Hance
7eb4282f33 Finish ++alne. 2014-07-10 15:24:22 -04:00
Jared Hance
d9782a5b5f Merges work again. 2014-07-10 15:13:42 -04:00
Jared Hance
8c7281a330 Modify the data flow in zuse. 
Gets the ++niku passed around everywhere, so we have enough information
to actually merge.
 2014-07-10 10:45:17 -04:00
Jared Hance
07998df9e1 Add ++niku to ++saba. 2014-07-10 10:38:53 -04:00
Jared Hance
d549b6a4fe Fix revision origin. 2014-07-10 10:24:29 -04:00
Jared Hance
235583e858 Almost there... 2014-07-09 16:56:23 -04:00
Jared Hance
8703188407 Restructure clay. 
Hopefully this is the only commit that would require a breach.

Writing a data transition would be trivial later.

Still need to fix ++domo.
 2014-07-09 15:11:25 -04:00
Jared Hance
3866e5a5df Small indent fix. 2014-07-09 11:36:28 -04:00
C. Guy Yarvin
5496fe9e79 Fix FCGI cache handling. 2014-07-09 02:40:49 -07:00
C. Guy Yarvin
2d9e4e4a29 Merge branch 'master' of github.com:urbit/urbit 
Conflicts:
	urb/urbit.pill
 2014-07-09 00:40:19 -07:00
C. Guy Yarvin
f9236fe2c8 Various fixes and improvements. 2014-07-09 00:37:47 -07:00
C. Guy Yarvin
8296c6189d Fix FCGI suffix. 2014-07-08 20:24:40 -07:00
pcmonk
2e230304fc Fixed lag bug 2014-07-08 20:20:38 -07:00
C. Guy Yarvin
95eb7baca5 Various fixes and improvements. 2014-07-08 20:00:30 -07:00
C. Guy Yarvin
acbb821155 Fix basic functional publishing. 2014-07-08 15:46:34 -07:00
C. Guy Yarvin
46c9731e21 A bunch of translators. 2014-07-08 15:12:42 -07:00
pcmonk
90f915752d Bump protocol number 2014-07-08 12:51:24 -07:00
C. Guy Yarvin
fee2d7011e Merge branch 'master' of github.com:urbit/urbit 
Conflicts:
	urb/urbit.pill
 2014-07-08 12:07:38 -07:00
C. Guy Yarvin
6337290934 Fix json reparser. 2014-07-08 11:38:07 -07:00
Jared Hance
0becefd519 Small change. 
Not sure why I had troubles doing this before. Probably didn't change
%+  to  %-  or something.
 2014-07-08 14:07:14 -04:00
Jared Hance
56b590f5e6 Rewrite ++urle. 
In theory this is an optimization...
 2014-07-08 14:07:14 -04:00
C. Guy Yarvin
ffad1ede43 Merge branch 'master' of github.com:urbit/urbit 
Conflicts:
	urb/urbit.pill
 2014-07-07 23:19:18 -07:00
C. Guy Yarvin
b67420b10f Merge branch 'master' of github.com:urbit/urbit 
Conflicts:
	urb/urbit.pill
 2014-07-07 23:16:17 -07:00
pcmonk
77db780c48 chat no longer echoes own messages 2014-07-07 18:15:53 -07:00
pcmonk
55738f5215 Merge branch 'master' of https://github.com/urbit/urbit 2014-07-07 17:33:30 -07:00
pcmonk
a55d4d1413 fixed %nice, %mean over %ames 2014-07-07 17:32:58 -07:00
Anton Dyudin
912c7b35f9 Merge branch 'master' of https://github.com/urbit/urbit 2014-07-07 17:08:22 -07:00
pcmonk
a4d8d0478c %rasp is now replaced with %nice and %mean 2014-07-07 16:59:39 -07:00
pcmonk
b2f5a36cae Merge branch 'temp' 
Conflicts:
	urb/urbit.pill
 2014-07-07 16:56:44 -07:00
pcmonk
ce2a89fdd2 partial switch away from %rasp 2014-07-07 16:36:35 -07:00
Anton Dyudin
3ccb376995 new file: urb/zod/main/lib/urb.js 2014-07-07 16:19:21 -07:00
C. Guy Yarvin
6e1acf52fe Fix some ford and md bugs. 2014-07-07 16:17:21 -07:00
Jared Hance
239ed25154 Some cleanup in ++auld. 2014-07-07 16:11:40 -04:00
pcmonk
5edc4de136 fixed chat with functional publishing changes 2014-07-07 11:18:10 -07:00
pcmonk
996ed44e9d bug fix in %gall 2014-07-07 10:58:15 -07:00
Jared Hance
c787b33b8e More ++doze in %clay changes... 
Still trying to figure out the %clay model.
 2014-07-07 10:59:11 -04:00
Jared Hance
1242d1b456 Rewrite ++doze in %clay. 
I'm always a fan of removing ugly names just for a single call.
 2014-07-07 10:29:47 -04:00
C. Guy Yarvin
4387713100 Eliminate old XML abbreviations. 2014-07-06 15:16:20 -07:00
C. Guy Yarvin
e35426a8f5 Eliminate superfluous |* in funpub. 2014-07-06 09:57:37 -07:00
C. Guy Yarvin
e473ab7cf4 Fix functional publishing and add debug feedback. 2014-07-05 16:38:15 -07:00
C. Guy Yarvin
b0f6e59f66 Merge branch 'master' of github.com:urbit/urbit 2014-07-05 14:27:08 -07:00
C. Guy Yarvin
35b48e0cb9 Various fixes and improvements. 2014-07-05 14:26:35 -07:00
Anton Dyudin
b44c6ff94c ++inde indented block combinator no longer produces optimistic hair 2014-07-05 14:02:52 -07:00
pcmonk
dcd09da912 fixed backlog, heartbeat, private messages in chat 2014-07-03 18:47:51 -07:00
C. Guy Yarvin
f9f5f7c29d Merge branch 'master' of github.com:urbit/urbit 
Conflicts:
	urb/urbit.pill
 2014-07-03 13:06:52 -07:00
Jared Hance
e96868996b Rewrite ++lode and ++wode 
Total lines added/deleted for patch.
 2014-07-03 15:50:55 -04:00
Jared Hance
49364e07ce Rewrite ++lith. 2014-07-03 15:32:10 -04:00