5657 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
C. Guy Yarvin	0c6fef08f9	Change ship to shop in scry.	2016-09-04 16:35:37 -07:00
C. Guy Yarvin	8bdeb902d4	Fix bad merge previous.	2016-09-03 22:56:02 -07:00
C. Guy Yarvin	ff7ba86d6f	Merge commit '2433a3f101e6e228cf786759273f5031ca5bab15' into relearning	2016-09-03 14:50:05 -07:00
C. Guy Yarvin	98b32fb443	Merge commit '859a9' into relearning	2016-09-03 14:49:44 -07:00
C. Guy Yarvin	6945a2cfa2	Merge commit '0ec6f47' into relearning	2016-09-03 14:48:33 -07:00
C. Guy Yarvin	27c328dc8d	Merge commit 'c903b0d' into relearning	2016-09-03 14:48:30 -07:00
C. Guy Yarvin	4235336985	Merge commit '98d9dc3' into relearning	2016-09-03 14:48:03 -07:00
C. Guy Yarvin	c88b969a3a	Merge commit '3cecb28' into relearning	2016-09-03 14:47:51 -07:00
C. Guy Yarvin	b3b15b33f8	Merge commit 'ba6ecf2' into relearning	2016-09-03 14:47:12 -07:00
C. Guy Yarvin	d20707365d	Merge commit '4c8e014' into relearning	2016-09-03 14:46:54 -07:00
C. Guy Yarvin	d9ff6caf2b	Merge commit 'bbc8381' into relearning	2016-09-03 14:36:14 -07:00
C. Guy Yarvin	aa30531212	Merge commit '904cc3' into relearning	2016-09-03 14:18:00 -07:00
C. Guy Yarvin	3d75361bd3	Merge commit 'f6086' into relearning	2016-09-03 14:16:49 -07:00
C. Guy Yarvin	4f9ed7c4b1	~| not allowed at this file position.	2016-09-03 14:16:17 -07:00
C. Guy Yarvin	13d41e78a8	Merge commit '7423392' into relearning	2016-09-03 14:15:17 -07:00
C. Guy Yarvin	f814f38d3c	Merge commit 'c24c77' into relearning	2016-09-02 15:34:40 -07:00
C. Guy Yarvin	290957862c	Merge commit 'd2acbc2' into relearning	2016-09-02 15:34:22 -07:00
C. Guy Yarvin	cd58458c71	Merge commit 'e482f' into relearning	2016-09-02 15:27:41 -07:00
C. Guy Yarvin	23b9e661dd	Merge commit '4645368' into relearning	2016-09-02 15:27:23 -07:00
C. Guy Yarvin	99183ca1a7	Merge commit '82df022' into relearning	2016-09-02 15:27:12 -07:00
C. Guy Yarvin	5797ac3cee	Merge commit 'e6f8146' into relearning	2016-09-02 15:26:42 -07:00
C. Guy Yarvin	1aa86242b8	Merge commit '84d1ee8' into relearning	2016-09-02 15:26:18 -07:00
C. Guy Yarvin	c93c9af79d	Merge commit 'daf33b9' into relearning	2016-09-02 15:25:58 -07:00
C. Guy Yarvin	f03066ae5a	Merge commit 'ba38f77' into relearning	2016-09-02 15:10:57 -07:00
C. Guy Yarvin	5234493de6	Merge commit 'fb67085' into relearning	2016-09-02 15:03:29 -07:00
C. Guy Yarvin	ee9787b688	Merge commit '7d7d7' into relearning	2016-09-02 14:16:54 -07:00
C. Guy Yarvin	9e66fd4a82	Merge commit '37de0c8a' into relearning	2016-09-02 12:52:31 -07:00
C. Guy Yarvin	d694a938b3	Merge commit 'cc470a302' into relearning	2016-09-02 12:49:36 -07:00
C. Guy Yarvin	de030736ae	Merge branch 'dumbo' into relearning	2016-09-02 12:45:20 -07:00
C. Guy Yarvin	30fecc912d	Fix error in last merge.	2016-09-02 12:45:13 -07:00
C. Guy Yarvin	82673d390c	Merge commit '40a232' into HEAD	2016-09-02 12:35:58 -07:00
C. Guy Yarvin	2f89baefb3	Merge commit '9ab824' into HEAD	2016-09-02 12:33:36 -07:00
C. Guy Yarvin	40d483de19	Merge commit '166343' into relearning	2016-09-01 18:08:22 -07:00
C. Guy Yarvin	a71e7120bc	Merge commit '9f82c' into relearning	2016-09-01 17:55:38 -07:00
C. Guy Yarvin	a8ecdebb0f	Various fixes and improvements.	2016-08-30 15:23:00 -07:00
Raymond Pasco	2433a3f101	Merge remote-tracking branches 'ohaitch/robots-back-in-eyre', 'Fang/oust', 'ohaitch/warn-pump-blocked', 'joemfb/moon-talk', 'yebyen/master', 'ohaitch/fix-login-css' and 'ray/repope-rep' ... Reinstate robots.txt hardcoded into eyre hack Add ++oust, arm to remove items from a list Pump blocked printf for security driver requests Allow moons to link to parent's talk Rekey ~del for new crypto era Use absolute path for login page CSS Rekey ~rep for new crypto era	2016-08-26 17:03:08 -04:00
Raymond Pasco	859a96cf6d	Rekey ~rep for crypto B era	2016-08-26 17:00:58 -04:00
Anton Dyudin	0ec6f47642	Absolute path for login CSS	2016-08-25 14:54:48 -07:00
C. Guy Yarvin	31ed10d5c4	Various fixes and improvements.	2016-08-24 22:05:26 -07:00
Kingdon Barrett	c903b0d6f6	update fingerprint for new crypto ... please accept my proof of identity as ~del	2016-08-22 20:26:45 -04:00
C. Guy Yarvin	db68a77424	Wake stuff compiles.	2016-08-22 12:17:30 -07:00
C. Guy Yarvin	65879eab58	Compiles; still missing ++doze.	2016-08-21 21:44:06 -07:00
Joseph Bryan	98d9dc3625	allows a moon to link to its parent's talk	2016-08-21 17:15:58 -04:00
C. Guy Yarvin	f12af8f4ba	Various fixes and improvements.	2016-08-21 13:09:26 -04:00
C. Guy Yarvin	f6306ce3fd	Compiles; top level still stubbed.	2016-08-21 02:18:57 -04:00
Raymond Pasco	4c8e014e68	Make helm compile by using only faces that exist	2016-08-19 20:38:59 -04:00
Raymond Pasco	50c75229fe	Merge remote-tracking branches 'ohaitch/fix-womb-bonus', 'ohaitch/womb-ticket-recycle' and 'ohaitch/better-ask' ... Generalize |bonus ship-granter Re-enable womb ticketing and recycling Update :ask to work with womb	2016-08-19 20:30:36 -04:00
Anton Dyudin	b26ee30990	add :ask|admins dynamic permissions	2016-08-19 17:00:24 -07:00
Anton Dyudin	98fe86fb49	print "~" on empty list, add [i]gnored listing	2016-08-19 16:49:42 -07:00
Anton Dyudin	ba73031c94	send invites to womb	2016-08-19 16:41:32 -07:00