Chris Koeritz [Sun, 17 Dec 2017 13:16:01 +0000 (08:16 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sun, 17 Dec 2017 13:15:36 +0000 (08:15 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
oops, somehow was hosing this up. should be best of both versions now.
Chris Koeritz [Sun, 17 Dec 2017 13:13:03 +0000 (13:13 +0000)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sun, 17 Dec 2017 13:11:30 +0000 (08:11 -0500)]
fixed error in vm guide, added fixes in revamp
revamp *should* now properly take strict transport security out of apache headers, and it should also add the wildcard domain names for cakelampvm.com (on anything other than www and the base name).
Chris Koeritz [Sun, 17 Dec 2017 13:04:28 +0000 (13:04 +0000)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sun, 17 Dec 2017 12:13:46 +0000 (12:13 +0000)]
added code to fix bind on vm
now has the wildcard domain name, which probably matters more on vm.
Chris Koeritz [Sun, 17 Dec 2017 12:00:48 +0000 (12:00 +0000)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sun, 17 Dec 2017 11:56:40 +0000 (06:56 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sun, 17 Dec 2017 11:36:43 +0000 (11:36 +0000)]
fixed pattern replace for hsts
Chris Koeritz [Sun, 17 Dec 2017 11:30:03 +0000 (11:30 +0000)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sun, 17 Dec 2017 11:29:09 +0000 (06:29 -0500)]
fixing strict hsts for cakelamp sites
not ready yet; still in progress.
Chris Koeritz [Sat, 16 Dec 2017 23:31:00 +0000 (18:31 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sat, 16 Dec 2017 23:16:14 +0000 (23:16 +0000)]
increased size for mounted swap
Chris Koeritz [Sat, 16 Dec 2017 23:16:14 +0000 (23:16 +0000)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sat, 16 Dec 2017 22:07:43 +0000 (17:07 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sat, 16 Dec 2017 21:39:09 +0000 (21:39 +0000)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sat, 16 Dec 2017 21:33:51 +0000 (16:33 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sat, 16 Dec 2017 18:40:20 +0000 (18:40 +0000)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sat, 16 Dec 2017 02:24:26 +0000 (21:24 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sat, 16 Dec 2017 01:37:52 +0000 (20:37 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sat, 16 Dec 2017 00:17:56 +0000 (19:17 -0500)]
added back burner to trivia category
Chris Koeritz [Fri, 15 Dec 2017 23:55:43 +0000 (18:55 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Fri, 15 Dec 2017 23:35:58 +0000 (18:35 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Fri, 15 Dec 2017 23:20:42 +0000 (18:20 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Fri, 15 Dec 2017 21:59:20 +0000 (16:59 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Fri, 15 Dec 2017 14:36:26 +0000 (09:36 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Fri, 15 Dec 2017 14:35:22 +0000 (09:35 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Thu, 14 Dec 2017 18:37:36 +0000 (13:37 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Thu, 14 Dec 2017 17:50:02 +0000 (12:50 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Thu, 14 Dec 2017 17:49:33 +0000 (12:49 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Thu, 14 Dec 2017 17:34:32 +0000 (12:34 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Thu, 14 Dec 2017 17:08:46 +0000 (12:08 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Thu, 14 Dec 2017 17:07:57 +0000 (12:07 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Thu, 14 Dec 2017 17:07:21 +0000 (17:07 +0000)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Thu, 14 Dec 2017 17:07:09 +0000 (12:07 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Thu, 14 Dec 2017 17:06:59 +0000 (12:06 -0500)]
oops, incomplete fix; need log file too
Chris Koeritz [Thu, 14 Dec 2017 17:05:52 +0000 (17:05 +0000)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Thu, 14 Dec 2017 17:05:06 +0000 (12:05 -0500)]
argh, keeps flipping
this -L flag has really hosed things up for me.
Chris Koeritz [Thu, 14 Dec 2017 15:38:28 +0000 (10:38 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Thu, 14 Dec 2017 15:31:32 +0000 (10:31 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Thu, 14 Dec 2017 13:24:44 +0000 (08:24 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Thu, 14 Dec 2017 06:54:56 +0000 (01:54 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Thu, 14 Dec 2017 06:33:33 +0000 (01:33 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Thu, 14 Dec 2017 06:32:52 +0000 (01:32 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Thu, 14 Dec 2017 05:10:10 +0000 (00:10 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Wed, 13 Dec 2017 23:41:42 +0000 (18:41 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Wed, 13 Dec 2017 23:24:12 +0000 (18:24 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Wed, 13 Dec 2017 20:47:27 +0000 (15:47 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Wed, 13 Dec 2017 19:33:25 +0000 (14:33 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Wed, 13 Dec 2017 16:03:24 +0000 (11:03 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Wed, 13 Dec 2017 15:49:40 +0000 (10:49 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Wed, 13 Dec 2017 14:24:13 +0000 (09:24 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Wed, 13 Dec 2017 11:39:40 +0000 (06:39 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Tue, 12 Dec 2017 14:31:07 +0000 (09:31 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Tue, 12 Dec 2017 14:12:51 +0000 (14:12 +0000)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Tue, 12 Dec 2017 13:09:27 +0000 (08:09 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Tue, 12 Dec 2017 13:07:10 +0000 (08:07 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Tue, 12 Dec 2017 12:27:15 +0000 (07:27 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Tue, 12 Dec 2017 11:25:01 +0000 (06:25 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Tue, 12 Dec 2017 10:38:16 +0000 (05:38 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Tue, 12 Dec 2017 10:34:23 +0000 (05:34 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Tue, 12 Dec 2017 05:23:16 +0000 (05:23 +0000)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Tue, 12 Dec 2017 04:57:08 +0000 (23:57 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Mon, 11 Dec 2017 22:10:29 +0000 (17:10 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Mon, 11 Dec 2017 20:05:22 +0000 (15:05 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Mon, 11 Dec 2017 17:49:32 +0000 (12:49 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Mon, 11 Dec 2017 17:49:29 +0000 (12:49 -0500)]
Merge branch 'master' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Mon, 11 Dec 2017 17:31:36 +0000 (12:31 -0500)]
Merge branch 'master' of feistymeow.org:feisty_meow
Chris Koeritz [Mon, 11 Dec 2017 14:24:38 +0000 (09:24 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Fri, 8 Dec 2017 18:05:51 +0000 (13:05 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Fri, 8 Dec 2017 18:05:49 +0000 (13:05 -0500)]
Merge branch 'master' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Fri, 8 Dec 2017 06:41:17 +0000 (01:41 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sun, 3 Dec 2017 06:02:43 +0000 (01:02 -0500)]
Merge branch 'master' of feistymeow.org:feisty_meow
Chris Koeritz [Sun, 26 Nov 2017 18:15:31 +0000 (13:15 -0500)]
Merge branch 'master' of feistymeow.org:feisty_meow
Fred T. Hamster [Sun, 26 Nov 2017 17:38:33 +0000 (12:38 -0500)]
mod for screen, still not universal
Fred T. Hamster [Sun, 26 Nov 2017 17:38:33 +0000 (12:38 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sun, 26 Nov 2017 17:24:49 +0000 (12:24 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sun, 26 Nov 2017 17:23:24 +0000 (12:23 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sun, 26 Nov 2017 17:20:24 +0000 (12:20 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sun, 26 Nov 2017 02:31:44 +0000 (21:31 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sat, 25 Nov 2017 22:50:46 +0000 (17:50 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sat, 25 Nov 2017 21:08:09 +0000 (16:08 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sat, 25 Nov 2017 12:20:20 +0000 (07:20 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sat, 25 Nov 2017 12:18:42 +0000 (07:18 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Fri, 24 Nov 2017 22:43:13 +0000 (17:43 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Fri, 24 Nov 2017 16:59:38 +0000 (11:59 -0500)]
fix customize process not having alias sometimes
Chris Koeritz [Thu, 23 Nov 2017 07:24:34 +0000 (02:24 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Thu, 23 Nov 2017 07:24:22 +0000 (02:24 -0500)]
new fortune
Chris Koeritz [Thu, 23 Nov 2017 07:24:21 +0000 (02:24 -0500)]
Merge branch 'master' of feistymeow.org:feisty_meow into dev
Fred T. Hamster [Thu, 23 Nov 2017 07:20:01 +0000 (02:20 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Thu, 23 Nov 2017 07:10:02 +0000 (02:10 -0500)]
renamed
Chris Koeritz [Thu, 23 Nov 2017 07:06:07 +0000 (02:06 -0500)]
script has gotten jenkins going again
Chris Koeritz [Thu, 23 Nov 2017 07:02:02 +0000 (02:02 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Fred T. Hamster [Thu, 23 Nov 2017 07:01:48 +0000 (02:01 -0500)]
added check for parm
Fred T. Hamster [Thu, 23 Nov 2017 07:01:48 +0000 (02:01 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Thu, 23 Nov 2017 06:59:10 +0000 (01:59 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Fred T. Hamster [Thu, 23 Nov 2017 06:58:47 +0000 (01:58 -0500)]
new script to run the jenkins build of feisty meow
Fred T. Hamster [Thu, 23 Nov 2017 06:35:17 +0000 (01:35 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Thu, 23 Nov 2017 06:16:49 +0000 (06:16 +0000)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Thu, 23 Nov 2017 05:10:30 +0000 (00:10 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
projects / feisty_meow.git / log