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

1374 Commits

Author SHA1 Message Date
Philip C Monk
4ced937e60 %mate conflict detection 2015-02-20 21:07:45 -05:00
Philip C Monk
9d4daa1e2c waypoint 2015-02-19 20:01:30 -05:00
Philip C Monk
bee28f639a fixed diff bug 2015-02-19 13:39:28 -05:00
Philip C Monk
c826908afe fix %eyre 2015-02-18 20:51:02 -05:00
Philip C Monk
979898f2bf ford %join 2015-02-18 19:53:28 -05:00
Philip C Monk
26aef3ab54 %mate works 2015-02-17 20:31:27 -05:00
Philip C Monk
c33156be9d mate waypoint 2015-02-17 18:40:53 -05:00
Philip C Monk
5b3233f30f fixed explicit merge errors 2015-02-17 15:06:28 -05:00
Philip C Monk
9d3911a41c first pass at explicit errors 2015-02-16 20:02:28 -05:00
Philip C Monk
39ea84d2a3 %init, %fine, %this, and %that work 2015-02-16 18:09:13 -05:00
Philip C Monk
34ab4060b6 %init merge works 2015-02-13 19:56:38 -05:00
Philip C Monk
b1c880ba2e %init works except sync 2015-02-13 18:38:09 -05:00
Philip C Monk
4bf41c1539 compiles and boots 2015-02-13 17:39:31 -05:00
Philip C Monk
1af61fe25f waypoint 2015-02-12 20:19:13 -05:00
Philip C Monk
94ee8be8f2 waypoint 2015-02-12 20:15:01 -05:00
Philip C Monk
856a4b4863 boots clean 2015-02-12 17:58:37 -05:00
Philip C Monk
aefc104137 boots 2015-02-12 14:55:06 -05:00
Philip C Monk
428aaa0674 waypoint 2015-02-11 20:41:05 -05:00
Philip C Monk
0e128a1a3e waypoint 2015-02-10 20:36:02 -05:00
Philip C Monk
b2b6fe4949 waypoint 2015-02-09 21:26:47 -05:00
Philip C Monk
72ce8e7b52 added preliminary ++gage 2015-02-09 18:38:03 -05:00
Philip C Monk
43ffa183ce typo 2015-02-04 14:15:35 -05:00
Philip C Monk
d5e20e9f3d fixed clay changed-files processing 2015-02-03 16:26:09 -05:00
Philip C Monk
28311b857a performance 2015-02-02 19:50:45 -05:00
Philip C Monk
73f286afb1 deletion works 2015-01-30 19:40:07 -05:00
Philip C Monk
15d1828567 waypoint 2015-01-29 20:06:02 -05:00
Philip C Monk
381a0761bc working in/out 2015-01-29 14:47:51 -05:00
Philip C Monk
abb97d78d6 waypoint 2015-01-28 20:28:10 -05:00
Philip C Monk
829411ed74 waypoint 2015-01-27 19:57:24 -05:00
Philip C Monk
ab5723ce36 start in/out split 2015-01-23 19:13:29 -05:00
Philip C Monk
6421719732 Merge remote-tracking branch 'origin/master' into typedclay 
Conflicts:
	urb/urbit.pill
 2015-01-23 14:39:41 -05:00
Philip C Monk
95c206465c optimizations 2015-01-23 14:36:36 -05:00
Philip C Monk
6aa9e8bc0f syncs in from unix 2015-01-22 19:28:32 -05:00
Philip C Monk
4466b6ff46 boots again 2015-01-21 20:47:49 -05:00
Anton Dyudin
619dfbb563 Added eyre a//=code=/<our> printf 2015-01-17 18:03:52 -08:00
Anton Dyudin
5f1fcad714 Revert "Tile %smsm, replaced instance in ames with ++hard call" 
Kept the %ames part.
This reverts commit 3dcf69e125a12518e6d0d30a50e3ef79d8819048.

Conflicts:
	urb/urbit.pill
	urb/zod/arvo/hoon.hoon
	urb/zod/main/app/bang/core.hook
	urb/zod/main/app/cat/core.hook
 2015-01-17 13:57:55 -08:00
Philip C Monk
782a416793 waypoint 2015-01-16 00:59:05 -05:00
Philip C Monk
0e82a9a1f1 Merge branch 'master' into typedclay 
Conflicts:
	urb/urbit.pill
	urb/zod/arvo/ford.hoon
	urb/zod/main/app/cat/core.hook
	urb/zod/main/app/ls/core.hook
	urb/zod/main/app/reload/core.hook
	urb/zod/main/app/shell/core.hook
	urb/zod/main/app/solid/core.hook
 2015-01-15 16:21:11 -05:00
Philip C Monk
38b289bad3 waypoint 2015-01-15 15:57:13 -05:00
C. Guy Yarvin
a76eb4f661 Merge branch 'radio' 
Conflicts:
	urb/urbit.pill
	urb/zod/arvo/hoon.hoon
	urb/zod/main/app/talk/core.hook
 2015-01-15 12:02:28 -08:00
C. Guy Yarvin
b6c7b64d77 A little more cleanup. 2015-01-15 11:25:22 -08:00
C. Guy Yarvin
29cec7719e Memory and other optimizations. 2015-01-15 11:10:29 -08:00
Anton Dyudin
fea0b21789 Merge branch 'auth', by extension pony2 and all associated refactoring. 
Conflicts:
	urb/urbit.pill
	urb/zod/arvo/hoon.hoon
 2015-01-14 19:47:05 -08:00
Anton Dyudin
6827205bb7 Cleaned up stray printfs 2015-01-14 19:07:26 -08:00
Anton Dyudin
48ada5795b Auth, debugging build 2015-01-14 17:47:51 -08:00
Philip C Monk
5b97583293 self-perpetuation ftw 2015-01-14 19:43:39 -05:00
Philip C Monk
c31d9c6d3b boots and accepts input 2015-01-14 19:15:39 -05:00
Philip C Monk
6742a73fcc boots to terminal, then hangs 2015-01-14 19:01:59 -05:00
Anton Dyudin
e4945f22e6 Further ~? tweaking 2015-01-14 15:18:03 -08:00
Anton Dyudin
1e30a55ad9 inane single-letter face typo 2015-01-13 21:57:55 -08:00