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
2,840 Commits 6 Branches 0 Tags 164 MiB
999e19e3c2
Commit Graph

2840 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Galen Wolfe-Pauly
8dc635c4a6 preening 2015-04-07 14:02:40 -07:00
Galen Wolfe-Pauly
71a907835c mobile header 2015-04-07 13:47:46 -07:00
Galen Wolfe-Pauly
cbb47e0e41 Merge branch 'dillbo' of github.com:urbit/urbit-new into dillbo 2015-04-07 13:37:54 -07:00
Galen Wolfe-Pauly
63e6d87265 resubscribe when full 2015-04-07 13:37:39 -07:00
Anton Dyudin
f8e6df644d fixed 2015-04-07 13:36:33 -07:00
Anton Dyudin
970ac7bdb0 Pass through mean 2015-04-07 13:31:09 -07:00
Anton Dyudin
9f7dd4a9ff Merge branch 'dillbo' of https://github.com/urbit/urbit into dillbo 2015-04-07 12:06:22 -07:00
Anton Dyudin
f42a848495 wire parsing up 2015-04-07 12:06:05 -07:00
C. Guy Yarvin
982467e95f Various fixes and improvements. 2015-04-07 12:05:21 -07:00
Anton Dyudin
2113be07d8 commented instrumentation 2015-04-06 17:48:42 -07:00
Anton Dyudin
3d154f055b instrumented for lost ytf means 2015-04-06 17:32:30 -07:00
Anton Dyudin
c9a4a23969 Merge branch 'dillbo' into wires 2015-04-06 17:07:39 -07:00
C. Guy Yarvin
0fe7f18f34 Now workings. 2015-04-06 17:04:25 -07:00
Anton Dyudin
9cb8fea1ff urb.send wires 2015-04-06 16:49:35 -07:00
Anton Dyudin
4be4aa208a unsubscribe wire 2015-04-06 16:43:46 -07:00
Anton Dyudin
8889e8bcd7 Merge branch 'dillbo' of https://github.com/urbit/urbit into dillbo 2015-04-06 16:36:49 -07:00
Anton Dyudin
e16d2105e0 wire-based source requests 2015-04-06 16:36:07 -07:00
Galen Wolfe-Pauly
3cb3c03326 Merge branch 'dillbo' of github.com:urbit/urbit-new into dillbo 2015-04-06 16:32:55 -07:00