Commit Graph

5774 Commits

Author SHA1 Message Date
Anton Dyudin
2113b4d6e1 show "Redirecting..." page for cross-ship redirects 2016-09-06 13:05:36 -07:00
Anton Dyudin
c82014d4be clear ship= cookie on /~/away 2016-09-06 13:04:25 -07:00
C. Guy Yarvin
7501c776bc Stash. 2016-09-06 12:53:02 -07:00
C. Guy Yarvin
6e544fc602 The bones of %jael. 2016-09-06 10:56:36 -07:00
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
Joseph Bryan
34086ebbcf removes ++drum-start 2016-09-02 15:32:54 -04:00
Joseph Bryan
c887686089 removes ++deft-pipe and ++deft-tart from drum 2016-09-02 15:32:54 -04:00
Joseph Bryan
98124bf805 removes ++master and ++deft-mast from drum 2016-09-02 15:32:54 -04: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
Philip C Monk
fff8e90c8a clay structure docs 2016-08-31 19:29:24 -04:00
C. Guy Yarvin
b8a46e2088 Cleanup; copy zuse molds into clay for doc purposes. 2016-08-31 10:20:27 -07:00
C. Guy Yarvin
a8ecdebb0f Various fixes and improvements. 2016-08-30 15:23:00 -07:00
Philip C Monk
f16caba28b more clay doc 2016-08-29 20:51:53 -04:00
Joseph Bryan
317ab1c731 removes ++se-joke from drum 2016-08-28 00:03:02 -04:00
Joseph Bryan
f07d92e52b removes ++se-plot from drum 2016-08-28 00:02:10 -04:00
Joseph Bryan
a06168f401 removes ++se-like and ++ukase from drum 2016-08-28 00:01:19 -04:00
Joseph Bryan
7ca92dd6ed serve css from the current desk 2016-08-27 00:31:28 -04:00
Philip C Monk
329a7ea127 more clay comments 2016-08-26 20:24:46 -04:00