ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-30 02:12:22 +03:00
Code Issues Packages Projects Releases Wiki Activity
2,104 Commits 6 Branches 0 Tags 164 MiB
0d73a1bbba
Commit Graph

371 Commits

Author SHA1 Message Date
Anton Dyudin
f5ec44de15 ++perk cube fern parser 2014-08-13 18:46:10 -07:00
C. Guy Yarvin
7a25b4d59f Merge branch 'master' of github.com:urbit/urbit 2014-08-13 13:50:26 -07:00
C. Guy Yarvin
26d5b811e5 Translate some memory code. 2014-08-13 12:32:14 -07:00
Anton Dyudin
2526a5c29f Added ++scanf, beginnings of 3b doc 2014-08-12 16:16:30 -07:00
C. Guy Yarvin
7c543b2f22 Fix JSON escaping. 2014-08-11 11:51:48 -07:00
johncburnham
daa6204336 hmac was broken 2014-08-07 15:37:25 -07:00
Jared Hance
03362d6cb6 Various fixes to merge 2014-08-07 14:07:04 -04:00
Jared Hance
48ffc3ded9 Add ++zeas, future ++zeal 2014-08-06 13:31:42 -04:00
Jared Hance
24f522281c Some %fine merges weren't doing anything, oops 2014-08-06 09:49:10 -04:00
Jared Hance
6bc5ecd9ad Fix this/that 2014-08-06 09:11:17 -04:00
Jared Hance
125b0a9603 Fix hashes in ++azel 2014-08-05 10:10:15 -04:00
C. Guy Yarvin
1d49dc93cc Ames protocol to 3. 2014-08-04 18:19:15 -07:00
pcmonk
b7f2e2bc79 Merge branch 'master' into klay 
Conflicts:
	urb/urbit.pill
 2014-08-01 16:53:42 -07:00
pcmonk
a70b13bae5 Merge branch 'master' into e2e-real 
Conflicts:
	urb/urbit.pill
 2014-08-01 16:46:00 -07:00
C. Guy Yarvin
e97b3c08a5 Various fixes and improvements. 2014-08-01 16:39:15 -07:00
pcmonk
97755be677 Merge branch 'master' into e2e-real 
Conflicts:
	urb/urbit.pill
 2014-08-01 16:27:44 -07:00
Jared Hance
537e2695ff Merge branch 'master' into klay 
Conflicts:
	urb/urbit.pill
	urb/zod/arvo/zuse.hoon
 2014-08-01 14:02:51 -04:00
Jared Hance
83e0291f99 256 bit hashes for objects... 2014-08-01 12:40:19 -04:00
Jared Hance
e48181b23e Optimize merge ancestor location 2014-08-01 12:21:26 -04:00
Jared Hance
0512cc6d47 Optimize ++zerg for common case 2014-08-01 11:45:29 -04:00
Jared Hance
21034aa855 Various fixes, including timers 2014-08-01 10:54:31 -04:00
pcmonk
7d581a3714 most of new chat 2014-07-31 19:44:49 -07:00
C. Guy Yarvin
03c714afe5 Merge branch 'turbomem' 
Conflicts:
	urb/urbit.pill
 2014-07-31 13:38:05 -07:00
C. Guy Yarvin
46226c3dbf More memory pls. 2014-07-31 13:23:02 -07:00
Jared Hance
2769378368 ++forge compiles 2014-07-31 16:17:37 -04:00
Jared Hance
8f62bce5f4 Remove printfs 2014-07-30 15:09:59 -04:00
Jared Hance
968a002d68 Various fixes to make this thing usable 2014-07-30 14:56:51 -04:00
Jared Hance
9c20b7c2c1 Conflicts work 2014-07-30 13:42:48 -04:00
Jared Hance
c7a78be9bd Almost working 2014-07-30 13:04:40 -04:00
pcmonk
41d5757552 Merge branch 'master' into e2e-real 
Conflicts:
	urb/urbit.pill
	urb/zod/arvo/gall.hoon
	urb/zod/arvo/zuse.hoon
 2014-07-29 17:39:49 -07:00
Jared Hance
3e0b18494c Send original copy to merge 2014-07-29 14:16:35 -04:00
Jared Hance
68fb76214d Fix referential transparency in %merg 2014-07-29 13:43:20 -04:00
Jared Hance
ef94352267 Merge branch 'master' into klay 
Conflicts:
	urb/urbit.pill
 2014-07-29 13:25:18 -04:00
C. Guy Yarvin
d145dd069a Merge branch 'master' of github.com:urbit/urbit 
Conflicts:
	urb/urbit.pill
 2014-07-28 15:54:58 -07:00
C. Guy Yarvin
009a767f52 FCGI pulls markdown. 2014-07-28 15:46:03 -07:00
pcmonk
17592239e3 Merge branch 'master' into e2e-real 
Conflicts:
	urb/urbit.pill
 2014-07-28 10:56:39 -07:00
Jared Hance
dbb5995c9d Trivial fixes 2014-07-28 10:25:07 -04:00
pcmonk
1445aefca4 Merge branch 'master' into e2e-real 
Conflicts:
	urb/urbit.pill
 2014-07-25 19:34:51 -07:00
pcmonk
2b4fec9a51 all (well-formed) test apps work 2014-07-25 19:10:24 -07:00
C. Guy Yarvin
a18ded751e Fix basic ford bugs. 2014-07-25 17:29:01 -07:00
Jared Hance
3a48876a4d Fix referential transparency in %cu 2014-07-25 13:44:06 -04:00
Jared Hance
d71b5c6bc1 Functional neoclay 2014-07-25 11:38:13 -04:00
Jared Hance
bd3f0377b8 Fast-forward merges should work (untested) 2014-07-24 16:23:54 -04:00
Jared Hance
667ad45403 Semi-working merges. 2014-07-24 15:21:58 -04:00
Jared Hance
9eea495578 Zuse compiles w/ some merge code. 2014-07-24 12:13:36 -04:00
Jared Hance
bb18c8b086 Unix sync out. 2014-07-24 11:47:11 -04:00
Jared Hance
fb24594e9e Can boot subs now! 2014-07-24 11:11:40 -04:00
pcmonk
2b9b533a6f work on making end-to-end acks work 2014-07-23 19:02:50 -07:00
pcmonk
13a4df24a1 cleanup 2014-07-23 11:25:53 -07:00
C. Guy Yarvin
7051a7f711 Merge branch 'master' of github.com:urbit/urbit 2014-07-23 11:17:55 -07:00
C. Guy Yarvin
271e4f2c0e Remove XX. 2014-07-23 11:17:43 -07:00
johncburnham
58921e9fd4 xml parser II: the richard donner cut 2014-07-22 16:12:38 -07:00
johncburnham
9d4302698d Revert "fixed minor bug in xml parser" 
This reverts commit 908d8d5fde6f03e41adb10bc8163e5cc2c0dc285.
 2014-07-22 15:59:43 -07:00
Jared Hance
38122c5b5a Fix merge... 2014-07-22 15:33:17 -04:00
Jared Hance
27f38c45bd Merge branch 'master' into klay 
Conflicts:
	urb/zod/arvo/zuse.hoon
 2014-07-22 15:03:59 -04:00
johncburnham
6bb974f2ec fixed minor bug in xml parser 2014-07-22 12:02:44 -07:00
Jared Hance
5ba302978c Broken. 2014-07-22 14:56:04 -04:00
Jared Hance
36549106ae zuse compiles again... 2014-07-22 10:11:03 -04:00
C. Guy Yarvin
edfae53ddc Fix horrid indentation thing. 2014-07-22 09:32:35 -07:00
C. Guy Yarvin
2b5e57de2d Replace ++logo with ++mark to match doc. 2014-07-21 15:14:52 -07:00
C. Guy Yarvin
3378245281 Functional build skeleton. 2014-07-20 20:15:02 -07:00
C. Guy Yarvin
ac488f6225 We are very close to the memory limit on :solid! 2014-07-18 19:45:10 -07:00
Jared Hance
f82578e30d Add useful stuff 2014-07-17 16:04:18 -04:00
Jared Hance
1933149d04 Zuse compiles again, new model. 2014-07-17 14:27:14 -04:00
Jared Hance
2bcde8f6ee Initial klay stuff. 
Clay.hoon doesn't work yet, haven't done subscriptions.

Should probably changes yakis to only reference yaki mugs rather than
yakis themselves - and have a blob map in the dome. Otherwise
subscriptions and merges will suck for large stuff.
 2014-07-17 11:40:52 -04:00
johncburnham
5987ff2f8d improved xml parser 2014-07-16 19:46:46 -07:00
C. Guy Yarvin
b9b6d522b9 Merge branch 'master' of github.com:urbit/urbit 
Conflicts:
	urb/urbit.pill
 2014-07-16 11:56:15 -07:00
C. Guy Yarvin
5b8844207e Minor tweaks. 2014-07-16 11:54:53 -07:00
Jared Hance
3c85c88040 Merge branch 'clay' 
Conflicts:
	urb/urbit.pill
 2014-07-16 13:56:34 -04:00
johncburnham
bbe73c468f added an xml parser 2014-07-15 22:47:43 -07:00
Anton Dyudin
ecb2ebf79b zl:jo no longer builds faceless poles 2014-07-15 16:07:39 -07:00
C. Guy Yarvin
ff5e56a05c Move silks around, etc. 2014-07-12 11:24:52 -07:00
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
C. Guy Yarvin
a608e99ce0 Various fixes and improvements. 2014-07-09 17:48:53 -07:00
C. Guy Yarvin
27bf640e79 Merge branch 'master' of github.com:urbit/urbit 
Conflicts:
	urb/urbit.pill
 2014-07-09 17:17:07 -07:00
C. Guy Yarvin
0d91fcb76a Changes to ++sill. 2014-07-09 17:16:17 -07:00
C. Guy Yarvin
56a8799501 Various fixes and improvements. 2014-07-09 16:12:26 -07:00
pcmonk
0966b543c8 Merge branch 'master' of https://github.com/urbit/urbit 
Conflicts:
	urb/urbit.pill
 2014-07-09 14:44:54 -07:00
C. Guy Yarvin
720ca0a14f Various fixes and improvements. 2014-07-09 14:43:30 -07:00
pcmonk
2c15e0c0bf %send effect does not need to drop through anymore 2014-07-09 14:42:08 -07: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
C. Guy Yarvin
5496fe9e79 Fix FCGI cache handling. 2014-07-09 02:40:49 -07:00
C. Guy Yarvin
f9236fe2c8 Various fixes and improvements. 2014-07-09 00:37:47 -07:00
C. Guy Yarvin
95eb7baca5 Various fixes and improvements. 2014-07-08 20:00:30 -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
4387713100 Eliminate old XML abbreviations. 2014-07-06 15:16:20 -07:00
C. Guy Yarvin
35b48e0cb9 Various fixes and improvements. 2014-07-05 14:26:35 -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