Chris Koeritz [Sun, 19 Nov 2017 18:14:14 +0000 (18:14 +0000)]
Merge branch 'master' of feistymeow.org:feisty_meow
Chris Koeritz [Sun, 19 Nov 2017 14:14:41 +0000 (09:14 -0500)]
Merge branch 'release-2.140.102'
bringing in recent revamp updates
Chris Koeritz [Sun, 19 Nov 2017 14:13:29 +0000 (09:13 -0500)]
new version commences
incorporates revamp updates
Chris Koeritz [Sun, 19 Nov 2017 14:12:09 +0000 (09:12 -0500)]
Merge branch 'master' of feistymeow.org:feisty_meow
Chris Koeritz [Sun, 19 Nov 2017 01:52:52 +0000 (20:52 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sun, 19 Nov 2017 01:31:35 +0000 (01:31 +0000)]
adding ignore site to not add verif files
Chris Koeritz [Sun, 19 Nov 2017 01:31:35 +0000 (01:31 +0000)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sat, 18 Nov 2017 22:25:56 +0000 (17:25 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sat, 18 Nov 2017 13:49:07 +0000 (08:49 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sat, 18 Nov 2017 13:49:03 +0000 (08:49 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sat, 18 Nov 2017 06:14:14 +0000 (06:14 +0000)]
Merge branch 'master' of feistymeow.org:feisty_meow
Chris Koeritz [Sat, 18 Nov 2017 04:13:49 +0000 (23:13 -0500)]
extraneous space removed
Chris Koeritz [Sat, 18 Nov 2017 04:11:57 +0000 (23:11 -0500)]
fixing permission problem at right place
Chris Koeritz [Sat, 18 Nov 2017 04:06:40 +0000 (23:06 -0500)]
minimized hello.txt, fixed perm for dock
Chris Koeritz [Sat, 18 Nov 2017 04:06:40 +0000 (23:06 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sat, 18 Nov 2017 03:07:49 +0000 (22:07 -0500)]
Merge branch 'master' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sat, 18 Nov 2017 02:43:53 +0000 (21:43 -0500)]
Merge branch 'release-2.140.101'
bringing in the dev branch's changes.
Chris Koeritz [Sat, 18 Nov 2017 02:42:48 +0000 (21:42 -0500)]
beginning release 2.140.101
Chris Koeritz [Sat, 18 Nov 2017 02:40:45 +0000 (21:40 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sat, 18 Nov 2017 02:40:41 +0000 (21:40 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sat, 18 Nov 2017 02:17:54 +0000 (21:17 -0500)]
helper script for fred
Chris Koeritz [Sat, 18 Nov 2017 02:12:05 +0000 (21:12 -0500)]
omitted a restart after ssl install
Chris Koeritz [Sat, 18 Nov 2017 02:02:54 +0000 (21:02 -0500)]
nicer formatting
Chris Koeritz [Sat, 18 Nov 2017 01:59:09 +0000 (20:59 -0500)]
developer cannot even do this
developer cannot even do rgetem, so it's pointless to add this type of change in there. since developer also shouldn't see any checkout problems in the fred area, just drop this code.
Chris Koeritz [Sat, 18 Nov 2017 01:56:08 +0000 (20:56 -0500)]
developer has no rpuffer access, so just rgetem
Chris Koeritz [Sat, 18 Nov 2017 01:54:32 +0000 (20:54 -0500)]
fixing permission problem obscured before
Chris Koeritz [Sat, 18 Nov 2017 01:52:13 +0000 (20:52 -0500)]
had to take an entirely different approach
git stash doesn't work on files that were previously configured in .gitignore, so we need to actually whack them. and it's possible something else is hosed, so we force a reset to the head revision. if that doesn't fix this, not sure what will.
Chris Koeritz [Sat, 18 Nov 2017 01:46:45 +0000 (20:46 -0500)]
actually was in wrong folder still
Chris Koeritz [Sat, 18 Nov 2017 01:43:44 +0000 (20:43 -0500)]
was ignoring error at wrong point
Chris Koeritz [Sat, 18 Nov 2017 01:42:06 +0000 (20:42 -0500)]
making sure latest scripts are active
Chris Koeritz [Sat, 18 Nov 2017 01:40:15 +0000 (20:40 -0500)]
catching stash fail on no changes now
Chris Koeritz [Sat, 18 Nov 2017 01:39:00 +0000 (20:39 -0500)]
omitted ssl enabling on apache
Chris Koeritz [Sat, 18 Nov 2017 01:37:00 +0000 (20:37 -0500)]
typo for link check, wrong dir for stash
Chris Koeritz [Sat, 18 Nov 2017 01:27:36 +0000 (20:27 -0500)]
updating fred mapsdemo install now
Chris Koeritz [Sat, 18 Nov 2017 01:03:16 +0000 (20:03 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Fri, 17 Nov 2017 22:57:32 +0000 (17:57 -0500)]
new production site for cakelampvm.com
this is the site that lives on the vm, and now it should properly show the local vm version (ala green checks not red X's).
Chris Koeritz [Fri, 17 Nov 2017 22:48:22 +0000 (17:48 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Fri, 17 Nov 2017 22:36:53 +0000 (17:36 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Fri, 17 Nov 2017 21:09:44 +0000 (16:09 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Fri, 17 Nov 2017 16:15:04 +0000 (11:15 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Fri, 17 Nov 2017 14:43:19 +0000 (09:43 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Fri, 17 Nov 2017 14:35:23 +0000 (14:35 +0000)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Fri, 17 Nov 2017 04:44:37 +0000 (23:44 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Fri, 17 Nov 2017 03:31:02 +0000 (03:31 +0000)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Fri, 17 Nov 2017 03:30:10 +0000 (03:30 +0000)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Fri, 17 Nov 2017 03:27:30 +0000 (03:27 +0000)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Fri, 17 Nov 2017 03:27:11 +0000 (22:27 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Fri, 17 Nov 2017 03:13:13 +0000 (03:13 +0000)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Fri, 17 Nov 2017 03:13:10 +0000 (22:13 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Fri, 17 Nov 2017 03:13:01 +0000 (22:13 -0500)]
cleanups and new revision E
Chris Koeritz [Fri, 17 Nov 2017 03:03:43 +0000 (03:03 +0000)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Fri, 17 Nov 2017 03:03:34 +0000 (22:03 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Fri, 17 Nov 2017 03:03:26 +0000 (22:03 -0500)]
rev d added for clarity on doc
Chris Koeritz [Fri, 17 Nov 2017 03:02:32 +0000 (03:02 +0000)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Fri, 17 Nov 2017 03:01:57 +0000 (22:01 -0500)]
tasty final edits from jon session
the many scribbled notes are now included in this version of the document, as well as a lot of cleanup and better formatting.
Chris Koeritz [Fri, 17 Nov 2017 02:55:13 +0000 (21:55 -0500)]
funkytown engaged; one page of edits left
Chris Koeritz [Fri, 17 Nov 2017 02:47:19 +0000 (21:47 -0500)]
fix for path in add apache site
Chris Koeritz [Fri, 17 Nov 2017 02:45:54 +0000 (21:45 -0500)]
whew, nearly done with edits from session with jon
Chris Koeritz [Fri, 17 Nov 2017 01:51:35 +0000 (20:51 -0500)]
tastier yet
Chris Koeritz [Fri, 17 Nov 2017 01:33:07 +0000 (20:33 -0500)]
more updates
Chris Koeritz [Fri, 17 Nov 2017 00:14:11 +0000 (00:14 +0000)]
Merge branch 'master' of feistymeow.org:feisty_meow
Chris Koeritz [Thu, 16 Nov 2017 23:50:50 +0000 (18:50 -0500)]
more content
Chris Koeritz [Thu, 16 Nov 2017 23:25:03 +0000 (18:25 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Thu, 16 Nov 2017 23:24:50 +0000 (18:24 -0500)]
working on vm docs
Chris Koeritz [Thu, 16 Nov 2017 23:17:28 +0000 (18:17 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Thu, 16 Nov 2017 22:54:28 +0000 (17:54 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Thu, 16 Nov 2017 22:26:22 +0000 (22:26 +0000)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Thu, 16 Nov 2017 22:25:32 +0000 (17:25 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Thu, 16 Nov 2017 21:57:42 +0000 (21:57 +0000)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Thu, 16 Nov 2017 21:56:31 +0000 (16:56 -0500)]
more doc mods
Chris Koeritz [Thu, 16 Nov 2017 21:02:03 +0000 (16:02 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Thu, 16 Nov 2017 21:01:43 +0000 (16:01 -0500)]
more docs, much better cygwin info
Chris Koeritz [Thu, 16 Nov 2017 21:01:43 +0000 (16:01 -0500)]
Merge branch 'master' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Thu, 16 Nov 2017 19:27:11 +0000 (14:27 -0500)]
Merge branch 'master' of feistymeow.org:feisty_meow
Chris Koeritz [Thu, 16 Nov 2017 18:48:38 +0000 (18:48 +0000)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Thu, 16 Nov 2017 18:40:39 +0000 (13:40 -0500)]
more docs
Chris Koeritz [Thu, 16 Nov 2017 18:31:38 +0000 (13:31 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Thu, 16 Nov 2017 18:31:26 +0000 (13:31 -0500)]
added more to command ref
Chris Koeritz [Thu, 16 Nov 2017 18:23:31 +0000 (18:23 +0000)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Thu, 16 Nov 2017 18:14:11 +0000 (18:14 +0000)]
Merge branch 'master' of feistymeow.org:feisty_meow
Chris Koeritz [Thu, 16 Nov 2017 15:06:57 +0000 (10:06 -0500)]
tweaks some more
Chris Koeritz [Thu, 16 Nov 2017 14:46:25 +0000 (09:46 -0500)]
Merge branch 'master' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Thu, 16 Nov 2017 14:44:06 +0000 (09:44 -0500)]
Merge branch 'release-2.140.100'
merging in from development branch to create 2.140.100
Chris Koeritz [Thu, 16 Nov 2017 14:43:11 +0000 (09:43 -0500)]
branch 2.140.100 begins
Chris Koeritz [Thu, 16 Nov 2017 14:41:59 +0000 (09:41 -0500)]
added tags push
Chris Koeritz [Thu, 16 Nov 2017 14:39:56 +0000 (09:39 -0500)]
tweaks
Chris Koeritz [Thu, 16 Nov 2017 14:30:39 +0000 (09:30 -0500)]
lotso good docs mods
Chris Koeritz [Thu, 16 Nov 2017 12:41:42 +0000 (07:41 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Thu, 16 Nov 2017 07:37:00 +0000 (02:37 -0500)]
upgraded calc macro to galculator
Chris Koeritz [Thu, 16 Nov 2017 02:13:00 +0000 (21:13 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Wed, 15 Nov 2017 20:25:47 +0000 (15:25 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Wed, 15 Nov 2017 20:25:41 +0000 (15:25 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Wed, 15 Nov 2017 19:31:21 +0000 (14:31 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Wed, 15 Nov 2017 19:30:28 +0000 (14:30 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Wed, 15 Nov 2017 19:27:56 +0000 (14:27 -0500)]
making bluefish as editor require X
Chris Koeritz [Wed, 15 Nov 2017 19:22:37 +0000 (14:22 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Wed, 15 Nov 2017 19:13:29 +0000 (14:13 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Wed, 15 Nov 2017 18:57:29 +0000 (13:57 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Wed, 15 Nov 2017 16:57:23 +0000 (11:57 -0500)]
needed to fix both error points
Chris Koeritz [Wed, 15 Nov 2017 16:54:52 +0000 (11:54 -0500)]
eliminating error message on cygwin
projects / feisty_meow.git / log