Chris Koeritz [Tue, 21 Nov 2017 14:22:08 +0000 (09:22 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Tue, 21 Nov 2017 14:19:05 +0000 (09:19 -0500)]
added fix for mapsdemo
Chris Koeritz [Tue, 21 Nov 2017 14:19:05 +0000 (09:19 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Tue, 21 Nov 2017 13:59:10 +0000 (08:59 -0500)]
penultimate update for v002
Chris Koeritz [Tue, 21 Nov 2017 12:56:23 +0000 (07:56 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Tue, 21 Nov 2017 08:02:20 +0000 (03:02 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Tue, 21 Nov 2017 06:14:17 +0000 (06:14 +0000)]
Merge branch 'master' of feistymeow.org:feisty_meow
Chris Koeritz [Tue, 21 Nov 2017 06:14:15 +0000 (06:14 +0000)]
Merge branch 'master' of feistymeow.org:feisty_meow
Chris Koeritz [Tue, 21 Nov 2017 06:06:12 +0000 (01:06 -0500)]
Merge branch 'master' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Tue, 21 Nov 2017 06:05:13 +0000 (01:05 -0500)]
Merge branch 'release-2.140.104'
doc updates
Chris Koeritz [Tue, 21 Nov 2017 06:04:46 +0000 (01:04 -0500)]
next version for docs update
Chris Koeritz [Tue, 21 Nov 2017 06:00:47 +0000 (01:00 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Tue, 21 Nov 2017 05:59:26 +0000 (05:59 +0000)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Tue, 21 Nov 2017 05:59:09 +0000 (00:59 -0500)]
better titles
Chris Koeritz [Tue, 21 Nov 2017 05:54:11 +0000 (00:54 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Tue, 21 Nov 2017 05:53:57 +0000 (00:53 -0500)]
updated for formatting
Chris Koeritz [Tue, 21 Nov 2017 05:32:20 +0000 (05:32 +0000)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Tue, 21 Nov 2017 05:31:26 +0000 (00:31 -0500)]
Merge branch 'master' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Tue, 21 Nov 2017 05:30:11 +0000 (00:30 -0500)]
Merge branch 'release-2.140.103' into dev
Chris Koeritz [Tue, 21 Nov 2017 05:26:59 +0000 (00:26 -0500)]
Merge branch 'release-2.140.103'
bringing in updated docs and much improved version files approach in c++
Chris Koeritz [Tue, 21 Nov 2017 05:26:29 +0000 (00:26 -0500)]
new version 2.140.103
Chris Koeritz [Tue, 21 Nov 2017 05:24:52 +0000 (00:24 -0500)]
successful editing session
now all links should launch into new window, and any useful urls that used to be just text are link launchers now.
Chris Koeritz [Tue, 21 Nov 2017 05:16:12 +0000 (00:16 -0500)]
almost done with the cleaning edits
Chris Koeritz [Tue, 21 Nov 2017 04:42:52 +0000 (23:42 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Tue, 21 Nov 2017 04:42:30 +0000 (23:42 -0500)]
updated guide to include old hello.txt steps
Chris Koeritz [Tue, 21 Nov 2017 03:50:24 +0000 (22:50 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Tue, 21 Nov 2017 03:47:10 +0000 (22:47 -0500)]
had omitted a whole category of todos
Chris Koeritz [Tue, 21 Nov 2017 03:42:41 +0000 (22:42 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Tue, 21 Nov 2017 03:33:16 +0000 (22:33 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Tue, 21 Nov 2017 03:01:00 +0000 (22:01 -0500)]
new fortune
Chris Koeritz [Tue, 21 Nov 2017 02:37:22 +0000 (21:37 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Tue, 21 Nov 2017 02:33:16 +0000 (02:33 +0000)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Tue, 21 Nov 2017 01:31:58 +0000 (20:31 -0500)]
added apt-cyg perl info, better recustomize
Chris Koeritz [Tue, 21 Nov 2017 01:31:58 +0000 (20:31 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Tue, 21 Nov 2017 00:33:31 +0000 (00:33 +0000)]
stopped writing build config into code
Chris Koeritz [Tue, 21 Nov 2017 00:15:24 +0000 (00:15 +0000)]
super tasty version fixes
getting the version headers and rc files and such to live under the
generated store folder.
Chris Koeritz [Tue, 21 Nov 2017 00:15:24 +0000 (00:15 +0000)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Mon, 20 Nov 2017 22:46:43 +0000 (17:46 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Mon, 20 Nov 2017 21:59:23 +0000 (21:59 +0000)]
trying to adapt to screen log parm
Chris Koeritz [Mon, 20 Nov 2017 21:59:23 +0000 (21:59 +0000)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Mon, 20 Nov 2017 21:01:17 +0000 (16:01 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Mon, 20 Nov 2017 17:56:11 +0000 (12:56 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Mon, 20 Nov 2017 15:34:39 +0000 (10:34 -0500)]
formatting mod
Chris Koeritz [Mon, 20 Nov 2017 15:32:28 +0000 (10:32 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Mon, 20 Nov 2017 00:04:57 +0000 (19:04 -0500)]
build version move to generated store
Chris Koeritz [Sun, 19 Nov 2017 22:30:02 +0000 (17:30 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
Chris Koeritz [Sun, 19 Nov 2017 22:00:46 +0000 (17:00 -0500)]
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
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 18:14:13 +0000 (18:14 +0000)]
Merge branch 'master' of feistymeow.org:feisty_meow
Chris Koeritz [Sun, 19 Nov 2017 14:17:12 +0000 (09:17 -0500)]
Merge branch 'master' of feistymeow.org:feisty_meow into dev
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 06:14:12 +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
projects / feisty_meow.git / log