1
0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-26 00:12:28 +03:00
Commit Graph

270 Commits

Author SHA1 Message Date
Philip C Monk
9571a2b434 Merge remote-tracking branch 'origin/test' into pending
Conflicts:
	urb/urbit.pill
2015-07-14 18:56:05 -04:00
Anton Dyudin
0ff792a69d remove warning printf to kinda close 2015-07-14 13:45:19 -07:00
Anton Dyudin
e34ae099f3 update %news to include dep 2015-07-10 13:38:12 -07:00
Anton Dyudin
d03e1df1be changed silk structure 2015-07-10 11:51:47 -07:00
Anton Dyudin
6977515ead better type safety in %eyre injection 2015-07-10 11:51:47 -07:00
Anton Dyudin
302ea51d22 fix scope issue, finally close 2015-07-07 12:51:25 -07:00
Anton Dyudin
1c57c4d4f5 updated %ford silk interface as per specification 2015-07-07 10:34:21 -07:00
Philip C Monk
811c17a9ac Merge remote-tracking branch 'origin/newunix' into test
Conflicts:
	urb/urbit.pill
	urb/zod/ape/hood.hoon
2015-06-29 16:04:16 -04:00
Philip C Monk
54c98f2085 Merge remote-tracking branch 'origin/master' into newunix
Conflicts:
	urb/urbit.pill
2015-06-29 15:40:14 -04:00
Raymond Pasco
9db29dcd27 Cross-browser compatibility for %eyre auth
Fixes 
2015-06-28 13:09:12 -04:00
Anton Dyudin
2eab6ad42a Rename %time to %behn, tym to now; closes 2015-06-24 12:50:30 -07:00
Philip C Monk
c9539452e2 Merge remote-tracking branch 'origin/newunix'
Conflicts:
	urb/urbit.pill
	urb/zod/base/mar/bit-accounts.hoon
	urb/zod/base/mar/bit-addr-made.hoon
	urb/zod/base/mar/bit-addr-request.hoon
	urb/zod/base/mar/bit-api-call.hoon
	urb/zod/base/mar/bit-get-token.hoon
	urb/zod/base/mar/bit-transaction.hoon
	urb/zod/base/mar/bit/accounts.hoon
	urb/zod/base/mar/bit/addr-made.hoon
	urb/zod/base/mar/bit/addr-request.hoon
	urb/zod/base/mar/bit/api-call.hoon
	urb/zod/base/mar/bit/get-token.hoon
	urb/zod/base/mar/bit/transaction.hoon
	urb/zod/base/mar/cloud-auth.hoon
	urb/zod/base/mar/cloud-secret.hoon
	urb/zod/base/mar/cloud/auth.hoon
	urb/zod/base/mar/cloud/secret.hoon
	urb/zod/base/mar/dill-belt.hoon
	urb/zod/base/mar/dill-blit.hoon
	urb/zod/base/mar/dill/belt.hoon
	urb/zod/base/mar/dill/blit.hoon
	urb/zod/base/mar/oct3-move.hoon
	urb/zod/base/mar/oct3-update.hoon
	urb/zod/base/mar/oct3/move.hoon
	urb/zod/base/mar/oct3/update.hoon
	urb/zod/base/mar/oct4-move.hoon
	urb/zod/base/mar/oct4-update.hoon
	urb/zod/base/mar/oct4/move.hoon
	urb/zod/base/mar/oct4/update.hoon
	urb/zod/base/mar/sole-action.hoon
	urb/zod/base/mar/sole-effect.hoon
	urb/zod/base/mar/sole/action.hoon
	urb/zod/base/mar/sole/effect.hoon
	urb/zod/base/mar/talk-command.hoon
	urb/zod/base/mar/talk-report.hoon
	urb/zod/base/mar/talk/command.hoon
	urb/zod/base/mar/talk/report.hoon
	urb/zod/mar/bit-accounts.hoon
	urb/zod/mar/bit-addr-made.hoon
	urb/zod/mar/bit-addr-request.hoon
	urb/zod/mar/bit-api-call.hoon
	urb/zod/mar/bit-get-token.hoon
	urb/zod/mar/bit-transaction.hoon
	urb/zod/mar/cloud-auth.hoon
	urb/zod/mar/cloud-auth/door.hook
	urb/zod/mar/cloud-secret.hoon
	urb/zod/mar/cloud-secret/door.hook
	urb/zod/mar/dill-belt.hoon
	urb/zod/mar/dill-blit.hoon
	urb/zod/mar/oct3-move.hoon
	urb/zod/mar/oct3-update.hoon
	urb/zod/mar/oct4-move.hoon
	urb/zod/mar/oct4-update.hoon
	urb/zod/mar/sole-action.hoon
	urb/zod/mar/sole-effect.hoon
	urb/zod/mar/talk-command.hoon
	urb/zod/mar/talk-report.hoon
2015-06-23 19:28:46 -04:00
Philip C Monk
72ef5c2cbd urb/zod/base -> urb/zod 2015-06-19 17:16:48 -04:00
Philip C Monk
f55f5bc295 moving stuff around 2015-03-11 20:37:37 -04:00
Philip C Monk
31d3788115 Merge remote-tracking branch 'origin/master' into typedclay
Conflicts:
	urb/urbit.pill
	urb/zod/arvo/eyre.hoon
	urb/zod/arvo/hoon.hoon
	urb/zod/arvo/zuse.hoon
	urb/zod/main/app/poke/core.hook
	urb/zod/main/app/reboot/core.hook
	urb/zod/main/app/shell/core.hook
	urb/zod/main/app/tree/core.hook
2015-03-05 18:27:07 -05:00
Philip C Monk
0e024a009f move along, nothing to see here 2015-02-27 01:35:41 -05:00
Anton Dyudin
4d17234fd6 Put out eyre fires 2015-01-30 17:48:22 -08:00
Anton Dyudin
9cdab44c9b Eyre js auth redirect: req script under /gop, get window.location change 2015-01-27 12:21:43 -08:00
C. Guy Yarvin
a1fd3597e6 Turn off gall queue management, temporarily. 2015-01-26 18:54:14 -08:00
Anton Dyudin
50f19ec56f eyre double-unsub hackaround 2015-01-26 15:30:50 -08:00
Galen Wolfe-Pauly
441393137a eyre change 2015-01-26 14:43:47 -08:00
Anton Dyudin
cffbe9b15b Polling, sort of 2015-01-23 21:16:12 -08:00
Galen Wolfe-Pauly
6627ea38d1 simpler auth 2015-01-23 10:07:05 -08:00
C. Guy Yarvin
db584de28d Make %eyre send tooks for a rush. 2015-01-22 14:02:29 -08:00
C. Guy Yarvin
dac4ea96db 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
969402edb7 Added eyre a//=code=/<our> printf
Conflicts:
	urb/urbit.pill
2015-01-19 14:30:55 -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
Anton Dyudin
bdde93d01c Auth working? 2015-01-13 16:23:44 -08:00
Anton Dyudin
9d29dc5a3e First-try auth, usage /gel?url=http%3A%2F%2Flocalhost%3A8443%2F... 2015-01-13 13:26:23 -08:00
Matt Earnshaw
afeb76b0f0 ruthlessly amputate extraneous arms 2015-01-12 21:49:33 +00:00
Anton Dyudin
8fd3e7cd8f Normalized +-rep and ++slug forms 2015-01-08 15:56:48 -08:00
Galen Wolfe-Pauly
abe70600df parsing dates and empty path 2014-12-16 17:19:06 -08:00
Galen Wolfe-Pauly
2e859498b2 date parsing in urls 2014-12-16 14:43:23 -08:00
Philip C Monk
6a19b061d4 fix json converted on sub in eyre 2014-12-09 20:39:51 -05:00
Philip C Monk
c6f86e7b6a Merge branch 'test' into dish
Conflicts:
	include/v/vere.h
	urb/urbit.pill
	urb/zod/arvo/ames.hoon
	urb/zod/arvo/hoon.hoon
	v/loop.c
	v/raft.c
2014-11-04 16:42:02 -05:00
Philip C Monk
5242925469 Merge branch 'test' into shell
Conflicts:
	include/v/vere.h
	urb/urbit.pill
	urb/zod/arvo/clay.hoon
	urb/zod/arvo/eyre.hoon
	urb/zod/arvo/hoon.hoon
	urb/zod/main/mar/hook/door.hook
	urb/zod/main/mar/psal/door.hook
	urb/zod/main/mar/txt/door.hook
	urb/zod/main/pub/src/doc/ref/vol/1.md
	v/loop.c
	v/raft.c
	v/reck.c
	v/unix.c
2014-11-04 15:22:33 -05:00
C. Guy Yarvin
4f29307601 Various fixes and improvements. 2014-10-31 15:36:01 -07:00
Philip C Monk
34bd31893d Merge remote-tracking branch 'origin/shell' into dish
Conflicts:
	urb/urbit.pill
	urb/zod/main/app/shell/core.hook
2014-10-31 13:56:33 -04:00
Anton Dyudin
f6e6620514 Removed $_ bunt meaning 2014-10-30 20:13:40 -07:00
Philip C Monk
5d40a20598 Merge remote-tracking branch 'origin/shell' into dish
Conflicts:
	urb/urbit.pill
	urb/zod/arvo/hoon.hoon
	urb/zod/main/app/terminal/hymn/script.js
2014-10-30 16:48:18 -04:00
Anton Dyudin
080512a129 Refactored xml* to poxo and poxa 2014-10-30 13:33:15 -07:00
Anton Dyudin
0e988b588d Removed tyq:ag 2014-10-28 13:15:44 -07:00
Ubuntu
c9d0ec374a Merge branch 'shell' into dish
Conflicts:
	urb/urbit.pill
2014-10-23 21:11:10 +00:00
Ubuntu
c94b900977 auto-convert from json to mark 2014-10-23 21:09:39 +00:00
Ubuntu
0a2c2938e4 Merge branch 'shell' into dish
Conflicts:
	urb/urbit.pill
2014-10-23 03:20:13 +00:00
Ubuntu
c363149abe Merge branch 'shell' of https://github.com/urbit/urbit into shell
Conflicts:
	urb/urbit.pill
2014-10-23 03:17:03 +00:00
Ubuntu
6fda6d75f1 have eyre convert to json 2014-10-23 03:13:10 +00:00
Ubuntu
2d6377f530 Merge branch 'shell' into dish
Conflicts:
	urb/urbit.pill
2014-10-23 03:08:22 +00:00