ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-21 13:51:50 +03:00
Code Issues Packages Projects Releases Wiki Activity
1,353 Commits 6 Branches 0 Tags 164 MiB
f98eeda228
Commit Graph

1353 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
C. Guy Yarvin
f98eeda228 Adjust dill for forward compatibility. 2015-03-17 13:53:38 -07:00
C. Guy Yarvin
a1a6cc8ad3 Right before pill switch from dull to dill. 2015-03-17 10:56:54 -07:00
C. Guy Yarvin
2ddd377f89 Merge branch 'master' into dillbo 
Conflicts:
	urb/urbit.pill
 2015-03-05 13:31:35 -08:00
C. Guy Yarvin
4eefaeb953 Start dojo. 2015-03-05 13:25:08 -08:00
Philip Monk
b74beae6c0 Merge pull request #261 from mrdomino/openbsd-fixes 
Conditionally disable unused-result on OpenBSD
 2015-03-02 13:47:40 -08:00
Steven Dee
21242e9c61 Conditionally disable unused-result on OpenBSD 2015-03-02 16:44:21 -05:00
Philip Monk
bbe0cc0971 Merge pull request #259 from mrdomino/openbsd-fixes 
Fixes for OpenBSD build
 2015-03-02 11:07:34 -08:00
Steven Dee
63908d386e Fix linux build 2015-03-02 14:04:20 -05:00
Steven Dee
6173d1577c Fixes for OpenBSD build 2015-03-02 13:36:46 -05:00
C. Guy Yarvin
a3a2ec2260 Basic dialog workings. 2015-02-25 08:57:43 -08:00
C. Guy Yarvin
21e3a0aee8 Recover a BUNCH of old stuff from a stash. 2015-02-24 15:31:58 -08:00
C. Guy Yarvin
597cfd11ca Barnaby, almost working. 2015-02-24 14:53:31 -08:00
C. Guy Yarvin
12d11b7781 Merge branch 'master' into dillbo 
Conflicts:
	urb/urbit.pill
	urb/zod/arvo/ford.hoon
 2015-02-24 11:01:26 -08:00
Galen Wolfe-Pauly
87691797a2 moved into doc desk 2015-02-23 15:28:09 -08:00
C. Guy Yarvin
69f265fcd1 GHETTO timestamp tracing. 2015-02-19 15:22:51 -08:00
C. Guy Yarvin
3235a8e1eb Merge branch 'master' of https://github.com/urbit/urbit 2015-02-19 15:19:25 -08:00
Galen Wolfe-Pauly
7f88f98447 merge master 2015-02-18 18:51:04 -08:00
Galen Wolfe-Pauly
31f1c2d4cd talk in 2015-02-18 14:25:58 -08:00
Galen Wolfe-Pauly
25839ecd9f no node_modules 2015-02-18 09:03:18 -08:00
Galen Wolfe-Pauly
d163c41f78 Merge branch 'master' into doc 2015-02-18 09:00:51 -08:00
C. Guy Yarvin
95fbf2915b Before experiment in reversing arvo moves. 2015-02-17 19:30:53 -08:00
Galen Wolfe-Pauly
26a0b6c20b Merge branch 'master' of github.com:urbit/urbit-new 2015-02-17 12:53:13 -08:00
C. Guy Yarvin
4f0a620972 Various fixes and improvements. 2015-02-13 16:37:40 -08:00
C. Guy Yarvin
2c80dd5297 Reverse i search 2015-02-11 18:57:33 -08:00
Henry Ault
fd49091755 licensing and such 2015-02-10 15:13:17 -08:00
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
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
C. Guy Yarvin
5d707603c4 Fix out of memory on stack overflow. 2015-02-02 11:03:14 -08: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
Anton Dyudin
656e7569f1 Merge branch 'test' 
Conflicts:
	urb/urbit.pill
 2015-01-29 11:17:01 -08: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
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