ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-17 03:44:34 +03:00
Code Issues Packages Projects Releases Wiki Activity
1,159 Commits 6 Branches 0 Tags 164 MiB
e48181b23e
Commit Graph

859 Commits

Author SHA1 Message Date
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
Jared Hance
2769378368 ++forge compiles 2014-07-31 16:17:37 -04:00
Jared Hance
c1a4aa7886 Merge branch 'master' into klay 
Conflicts:
	urb/urbit.pill
 2014-07-30 15:14:38 -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
pcmonk
fb8bf21a2e Merge branch 'master' of https://github.com/urbit/urbit 2014-07-30 11:12:30 -07:00
pcmonk
46a27f53e6 %ford search in right place for protocols 2014-07-30 11:09:48 -07:00
C. Guy Yarvin
6febd493c3 Merge branch 'master' of github.com:urbit/urbit 
Conflicts:
	urb/zod/main/pro/down/core.hoon
 2014-07-30 10:53:58 -07:00
C. Guy Yarvin
0a01d489df Various fixes and improvements. 2014-07-30 10:53:30 -07: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
1a2c960325 couple of %ford fixes 2014-07-29 16:29:56 -07:00
pcmonk
c5fe282e75 added %wipe to wipe app state 2014-07-29 15:44:41 -07:00
pcmonk
20da6ef2f1 fixed timeout crash with ++peek 2014-07-29 14:25:13 -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
pcmonk
22dd323fbc Merge branch 'master' of https://github.com/urbit/urbit 
Conflicts:
	urb/urbit.pill
 2014-07-28 16:21:40 -07:00
pcmonk
d5eda8f962 fixed autoreload 2014-07-28 16:17:59 -07: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
c2bf2592c9 %eyre drops old subscribers even without ++pull 2014-07-28 13:23:26 -07:00
pcmonk
6d386f15cc give (slightly) more helpful crud errors in %gall 2014-07-28 12:23:51 -07:00
Jared Hance
dbb5995c9d Trivial fixes 2014-07-28 10:25:07 -04:00
C. Guy Yarvin
3c4696fefd More tweaking round the bleeding edges. 2014-07-27 05:04:30 -07:00
C. Guy Yarvin
c8399fdacf Moving toward new translation. 2014-07-27 03:26:17 -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
C. Guy Yarvin
d8b3c5f7d5 Remove eyre console code to save memory. 2014-07-25 09:38:22 -07:00
C. Guy Yarvin
2f42a419ea Ford, with some comments to save memory. 2014-07-25 09:26:12 -07:00
Jared Hance
d71b5c6bc1 Functional neoclay 2014-07-25 11:38:13 -04:00
Jared Hance
873bd9b208 Simple change 2014-07-25 08:53:39 -04:00
C. Guy Yarvin
faf33d012b Ford compiles - still needs some syntax. 2014-07-24 13:29:16 -07: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
C. Guy Yarvin
f9e53c2541 Merge branch 'master' of github.com:urbit/urbit 2014-07-24 11:16:50 -07:00
C. Guy Yarvin
96e2eef2b2 Fix some indents. 2014-07-24 11:16:39 -07: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
C. Guy Yarvin
20c5c1d5a0 Code complete on ford. 2014-07-23 16:23:53 -07:00
Anton Dyudin
7e50755029 Restructured raws/rads:og for =^ result order, added /=pals= %ames .^ 2014-07-23 14:01:52 -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
424fa7398d once more into the breach 2014-07-23 01:31:09 -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