urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-19 08:32:39 +03:00
Code Issues Packages Projects Releases Wiki Activity
1,793 Commits 768 Branches 10 Tags 215 MiB
c982805552
Commit Graph

1793 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Henry Ault
5c525b1f15 Merge branch 'master' of https://github.com/urbit/urbit 2015-02-10 12:20:01 -08:00
Henry Ault
cde77dc068 MIT LICENSE 2015-02-10 12:19:37 -08:00
C. Guy Yarvin
045f862a84 Full test pathway. 2015-02-09 12:40:44 -08:00
C. Guy Yarvin
a3bb81f397 Check in some testing stuff. 2015-02-08 13:22:33 -08:00
C. Guy Yarvin
248d679367 Merge branch 'master' of https://github.com/urbit/urbit 2015-02-06 14:49:22 -08:00
Anton Dyudin
0bbb541e2c Merge branch 'master' into eyre-new 
Conflicts:
	urb/zod/main/mar/psal/door.hook
 2015-02-05 21:04:40 -08:00
Galen Wolfe-Pauly
3282c574c3 Merge branch 'master' of github.com:urbit/urbit-new 2015-02-04 14:59:40 -08:00
C. Guy Yarvin
73e0dcf33b Merge branch 'master' of https://github.com/urbit/urbit 2015-02-04 10:29:32 -08:00
Philip C Monk
6888ba9f95 performance 2015-02-02 19:50:45 -05:00
C. Guy Yarvin
5d707603c4 Fix out of memory on stack overflow. 2015-02-02 11:03:14 -08:00
Philip C Monk
f7455b7db8 deletion works 2015-01-30 19:40:07 -05:00
Anton Dyudin
1f73bb3fe4 Revert "License file" pending outside/ directory review 
This reverts commit 6e28dcd7fa238fb70dda9a3b5598c3ae351152aa.
 2015-01-29 18:38:13 -08:00
Anton Dyudin
1194bb48bf License file 2015-01-29 18:35:30 -08:00
Philip C Monk
28841a3e74 waypoint 2015-01-29 20:06:02 -05:00
Philip C Monk
1b5c21f4f4 working in/out 2015-01-29 14:47:51 -05:00
Anton Dyudin
656e7569f1 Merge branch 'test' 
Conflicts:
	urb/urbit.pill
 2015-01-29 11:17:01 -08:00
Philip C Monk
f86e6c4d35 waypoint 2015-01-28 20:28:10 -05:00
Galen Wolfe-Pauly
7bc732b14d Merge branch 'master' of github.com:urbit/urbit-new 2015-01-28 07:13:42 -08:00
Galen Wolfe-Pauly
7383228274 Merge pull request #249 from ShaneWilton/patch-1 
Add cmake to the list of OS X dependencies
 2015-01-28 07:06:30 -08:00
Shane Wilton
cc1a5a9cd7 Add cmake to the list of OS X dependencies 2015-01-28 00:24:23 -08:00
Philip C Monk
ab09e78a11 waypoint 2015-01-27 19:57:24 -05:00
Galen Wolfe-Pauly
01b4b95b49 Merge branch 'master' into test 2015-01-27 09:01:25 -08:00
Galen Wolfe-Pauly
0bc50d1302 Merge branch 'test' of github.com:urbit/urbit into test 2015-01-27 09:01:07 -08:00
Philip C Monk
efb39d2b40 Merge remote-tracking branch 'origin/test' 
Conflicts:
	urb/urbit.pill
 2015-01-27 00:28:33 -05:00
Galen Wolfe-Pauly
446d064b99 Merge branch 'test' of github.com:urbit/urbit-new into test 2015-01-26 17:59:52 -08:00
Anton Dyudin
ae301b32b9 Merge branch 'test' of https://github.com/urbit/urbit into test 2015-01-26 16:36:19 -08:00
C. Guy Yarvin
b568763116 Stage down to 163. 2015-01-26 16:25:27 -08:00
Anton Dyudin
af3e9e9818 Merge branch 'master' into test 
Conflicts:
	urb/urbit.pill
	urb/zod/arvo/eyre.hoon
 2015-01-26 15:55:53 -08:00
Anton Dyudin
28d1fc478c Revert "Breach compatibility rc2", "Revert "Tile %smsm, replaced instance in ames with ++hard call"" 
This reverts commit 66e94bd04b9333fd7cdafaacc1714d69b3cab059.
This reverts commit d3ac409e27bafe7fc2074be71eaf86a6d97f887c.
 2015-01-26 15:44:58 -08:00
Anton Dyudin
d49569ac21 Merge branch 'exec' into test 
Conflicts:
	urb/zod/main/app/shell/core.hook
	urb/zod/main/app/terminal/core.hook
 2015-01-25 21:29:21 -08:00
Anton Dyudin
ad63f76568 Merge branch 'test' of https://github.com/urbit/urbit into test 2015-01-25 20:49:39 -08:00
C. Guy Yarvin
4e72941101 Merge branch 'test' of https://github.com/urbit/urbit into test 
Conflicts:
	urb/urbit.pill
 2015-01-25 17:39:37 -08:00
Philip C Monk
a1ef36e02d start in/out split 2015-01-23 19:13:29 -05:00
Philip C Monk
5e74c7286b Merge remote-tracking branch 'origin/master' into typedclay 
Conflicts:
	urb/urbit.pill
 2015-01-23 14:39:41 -05:00
Anton Dyudin
d444e244af Merge branch 'test' of https://github.com/urbit/urbit into test 
Conflicts:
	urb/urbit.pill
 2015-01-22 14:16:19 -08:00
C. Guy Yarvin
2b06b7f497 Merge branch 'test' of https://github.com/urbit/urbit into test 
Conflicts:
	urb/urbit.pill
 2015-01-22 14:01:39 -08:00
Anton Dyudin
f081dd273f Twitter daemon v1: auth, tweeting 2015-01-21 19:31:40 -08:00
Philip C Monk
75c6647475 boots again 2015-01-21 20:47:49 -05:00
Anton Dyudin
c622ac2513 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
0f2db4bd57 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
938e01bc00 waypoint 2015-01-15 15:57:13 -05:00
Anton Dyudin
e45aa0ff83 Merge branch 'master' into exec 2015-01-15 12:05:36 -08:00
C. Guy Yarvin
fb2afb4417 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
8a4ab744eb Memory and other optimizations. 2015-01-15 11:10:29 -08:00
Anton Dyudin
58680f441d 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
Philip C Monk
ba4f951dfd boots to terminal, then hangs 2015-01-14 19:01:59 -05:00
Anton Dyudin
413a1be805 Further ~? tweaking 2015-01-14 15:18:03 -08:00
Anton Dyudin
8f3ca6d4e3 sgbr was broken due to nonconforming jet 2015-01-13 22:22:39 -08:00
Philip C Monk
94138294d0 boots now (sort of) 2015-01-13 20:58:25 -05:00
Anton Dyudin
d50d625efa Sidestream sgwt 2015-01-13 14:13:08 -08:00