ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-24 23:44:56 +03:00
Code Issues Packages Projects Releases Wiki Activity
3,108 Commits 6 Branches 0 Tags 164 MiB
6e86d8efc4
Commit Graph

3108 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anton Dyudin
31c2cb220b OT tweaking 2015-04-14 19:01:26 -07:00
Philip C Monk
8560bae3b8 waypoint 2015-04-14 20:48:37 -04:00
Anton Dyudin
3d0e11750f Dead duct pile 2015-04-14 14:16:46 -07:00
Anton Dyudin
93c2956fc7 cursor tweak 2015-04-14 13:57:12 -07:00
Anton Dyudin
6d76b13162 pub/sole/fab up 2015-04-14 13:38:37 -07:00
Philip C Monk
2e462a3c0d waypoint 2015-04-13 20:29:54 -04:00
Anton Dyudin
da107ab17c share.coffee lib/sole implementation 2015-04-13 17:20:54 -07:00
Philip C Monk
b62bacbf1d annotated merges seem to be working 2015-04-13 17:29:39 -04:00
C. Guy Yarvin
6faeed1ca6 Merge branch 'master' of https://github.com/urbit/urbit 2015-04-11 15:03:09 -07:00
Galen Wolfe-Pauly
519c1627f8 date instead of time 2015-04-10 16:05:18 -07:00
Galen Wolfe-Pauly
2d6666e5e8 Merge branch 'master' of github.com:urbit/urbit 2015-04-10 15:45:29 -07:00
Galen Wolfe-Pauly
cb15c3ce11 use .json in unsub 2015-04-10 15:45:17 -07:00
Anton Dyudin
fde1401bca Loosen dill-belt type XX temporary 2015-04-10 15:13:20 -07:00
Galen Wolfe-Pauly
afdbac72b7 oh yeah uncomment that 2015-04-10 14:47:53 -07:00
Galen Wolfe-Pauly
6d6ea4fc27 url speech type and required urb.js changes 2015-04-10 14:43:44 -07:00
Galen Wolfe-Pauly
01a8563bc4 Merge branch 'test' of github.com:urbit/urbit into test 2015-04-10 10:55:24 -07:00
Galen Wolfe-Pauly
fb5f1e57ea num util 2015-04-10 10:55:07 -07:00
Anton Dyudin
4b35965138 converters up 2015-04-09 23:57:04 -07:00
Anton Dyudin
83ed68829b Revert "Pass dependencies as mark /$" 
This reverts commit b7d00f943270eeb9f33df07fa4149fbc0c86887a.

Conflicts:
	urb/zod/arvo/eyre.hoon
	urb/zod/arvo/ford.hoon
	urb/zod/main/mar/urb/door.hook
 2015-04-09 13:42:11 -07:00
Galen Wolfe-Pauly
8093339c4f Merge branch 'test' of github.com:urbit/urbit into test 2015-04-09 10:13:44 -07:00
Galen Wolfe-Pauly
86d4a85b74 Merge branch 'master' of github.com:urbit/urbit-new 2015-04-09 10:07:25 -07:00
Galen Wolfe-Pauly
4e2d3901bc error pages 2015-04-09 10:06:13 -07:00
Galen Wolfe-Pauly
a11a019533 error pages 2015-04-09 10:05:03 -07:00
Anton Dyudin
1d9490c322 Merge remote-tracking branch 'origin/test' into dillbo 
Conflicts:
	urb/urbit.pill
 2015-04-08 18:42:06 -07:00
Anton Dyudin
886bbe9aca Matrix frontend v1 2015-04-08 18:37:43 -07:00
Philip C Monk
9e10039dfc bug fixing 2015-04-08 20:51:34 -04:00
C. Guy Yarvin
970448d2c5 Merge branch 'test' of https://github.com/urbit/urbit into test 
Conflicts:
	urb/urbit.pill
 2015-04-08 15:06:29 -07:00
C. Guy Yarvin
d76b5d43c7 New url stuff on test branch. 2015-04-08 15:01:47 -07:00
Philip C Monk
e314355a9e forgot to add init 2015-04-08 15:02:36 -04:00
Galen Wolfe-Pauly
8e37b7608c Merge branch 'master' of github.com:urbit/urbit-new 2015-04-08 11:46:14 -07:00
Galen Wolfe-Pauly
90e8b3efc3 urb js unsub 2015-04-08 11:46:05 -07:00
C. Guy Yarvin
2310047968 Merge branch 'master' of https://github.com/urbit/urbit 
Conflicts:
	urb/urbit.pill
 2015-04-08 11:36:01 -07:00
Philip C Monk
41cb6dcb76 Merge branch 'master' of https://github.com/urbit/urbit 2015-04-08 14:28:02 -04:00
Philip C Monk
56948115ef added :helm+init 2015-04-08 14:27:51 -04:00
C. Guy Yarvin
ee91ef6888 "Fix" init sync. 2015-04-07 19:19:31 -07:00
Galen Wolfe-Pauly
f0efeb068a login / out 2015-04-07 19:06:13 -07:00
Anton Dyudin
3c2762a9d1 :helm+sync syd her sud 2015-04-07 18:08:48 -07:00
Anton Dyudin
fcb46d2cef stopped urb.js %mean retry 2015-04-07 17:13:46 -07:00
Philip C Monk
b851e60057 Merge branch 'master' of https://github.com/urbit/urbit 2015-04-07 19:16:18 -04:00
C. Guy Yarvin
9b2ad6358b Entropy check and entropy hash. 2015-04-07 16:15:25 -07:00
Anton Dyudin
f2efac054b Merge branch 'dillbo' of https://github.com/urbit/urbit into dillbo 2015-04-07 16:07:35 -07:00
Anton Dyudin
33bd5366cc hook/door/dill-belt/mar 2015-04-07 16:07:10 -07:00
Philip C Monk
4f1049c5ec Merge branch 'master' of https://github.com/urbit/urbit 2015-04-07 18:49:43 -04:00
C. Guy Yarvin
78f0c0be3c Update protocol number to 2. 2015-04-07 15:39:51 -07:00
Philip C Monk
c7d8cfd114 mostly working userlevel conflict merge 2015-04-07 18:24:16 -04:00
C. Guy Yarvin
8072111d2c Merge branch 'master' into dillbo 
Conflicts:
	urb/zod/docs/pub/doc/guide/a-ford.md
 2015-04-07 15:18:07 -07:00
C. Guy Yarvin
14aeab7aaa Revert some erroneous anton changes. 2015-04-07 15:16:37 -07:00
C. Guy Yarvin
b81d2891e2 Merge branch 'dillbo' of https://github.com/urbit/urbit into dillbo 2015-04-07 15:12:44 -07:00
C. Guy Yarvin
033537eb76 Various fixes and improvements. 2015-04-07 15:12:12 -07:00
C. Guy Yarvin
832da6c6c0 Rename gun to dog; some dojo syntax updates. 2015-04-07 14:15:06 -07:00