Commit Graph

12 Commits

Author SHA1 Message Date
Philip C Monk
7c5860412a fix %talk-telegrams 2015-09-17 15:10:01 -04:00
Anton Dyudin
8d10ee10d9 fixed json tank reading 2015-09-15 16:26:22 -07:00
Anton Dyudin
1b67230713 tank handling 2015-09-15 10:50:30 -07:00
Anton Dyudin
4c14bd845a better task rendering for frontend 2015-09-15 10:45:04 -07:00
Anton Dyudin
e0b3f6b2b1 fixed telegrams serialization 2015-09-14 18:03:40 -07:00
Philip C Monk
490798b908 disallow multiple simultaneous merges to same desk 2015-09-03 17:14:35 -04:00
Philip C Monk
4ec8907b39 performance improvements 2015-09-03 17:14:35 -04:00
Philip C Monk
c968e8d6b6 forgot a couple of files 2015-09-03 17:14:35 -04:00
Anton Dyudin
bac25edb79 Sur disqualification moved to userspace
sed -i'' -e '/^|/{x;/./{p;s/.*//;};x;};/ *\\/-.*\\*/{h;s/ //g;s/,[a-z]*//g;s/^[^a-z]*/[/;s/ *::.*$//;s/$/ .]/;s/*/ /g;x;s/\\*//g;}' urb/zod/**.{hoon,hook}
  Followed by manual fixes where e.g. the file didn't start with a core
2015-09-03 17:14:33 -04:00
Anton Dyudin
f8fd191b4b prettier printing 2015-09-02 11:10:23 -07:00
Anton Dyudin
9c1e695e8a show work-tasks on talk web frontend, clean up {foo}=React.DOM 2015-09-02 11:10:20 -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