Chuck Scott [Sat, 3 Oct 2015 16:14:27 +0000 (12:14 -0400)]
Merge tag 'v1.0.28' into develop
Updated to 1.0.28
Chuck Scott [Sat, 3 Oct 2015 16:14:13 +0000 (12:14 -0400)]
Merge branch 'release/1.0.28'
Chuck Scott [Sat, 3 Oct 2015 16:11:38 +0000 (12:11 -0400)]
Updated tag to 1.0.28
Chuck Scott [Sat, 3 Oct 2015 16:08:44 +0000 (12:08 -0400)]
Merge branch 'develop' of cvs2.gaslightmedia.com:WP-Plugins/glm-member-db into develop
Conflicts:
views/front/members/detail.html
Chuck Scott [Sat, 3 Oct 2015 16:04:54 +0000 (12:04 -0400)]
Merge branch 'feature/NewSettings' into develop
Chuck Scott [Sat, 3 Oct 2015 15:58:40 +0000 (11:58 -0400)]
Migrating settings from .ini file to admin Management pages
Laury GvR [Fri, 2 Oct 2015 15:10:24 +0000 (11:10 -0400)]
Merge tag 'v1.0.27' into develop
v1.0.27
Laury GvR [Fri, 2 Oct 2015 15:10:14 +0000 (11:10 -0400)]
Merge branch 'hotfix/1.0.27'
Laury GvR [Fri, 2 Oct 2015 15:10:02 +0000 (11:10 -0400)]
Larget logo in detail view, with phone view
Chuck Scott [Fri, 2 Oct 2015 11:31:51 +0000 (07:31 -0400)]
Merge branch 'develop' into feature/NewSettings
Conflicts:
glm-member-db.php
Chuck Scott [Fri, 2 Oct 2015 00:59:56 +0000 (20:59 -0400)]
Merge tag 'v1.0.26' into develop
Fixed issues caused by Data Abstract updates.
Chuck Scott [Fri, 2 Oct 2015 00:58:48 +0000 (20:58 -0400)]
Merge branch 'hotfix/1.0.26'
Chuck Scott [Fri, 2 Oct 2015 00:57:38 +0000 (20:57 -0400)]
Fixed problems caused by updates to the Data Abstract.
Laury GvR [Thu, 1 Oct 2015 20:59:00 +0000 (16:59 -0400)]
Merge tag 'v1.0.25' into develop
v1.0.25
Laury GvR [Thu, 1 Oct 2015 20:58:56 +0000 (16:58 -0400)]
Merge branch 'hotfix/1.0.25'
Laury GvR [Thu, 1 Oct 2015 20:58:49 +0000 (16:58 -0400)]
Leaving space on list when no image, expanding map in detail when no image
Laury GvR [Thu, 1 Oct 2015 20:33:13 +0000 (16:33 -0400)]
Merge tag 'v1.0.24' into develop
v1.0.24
Laury GvR [Thu, 1 Oct 2015 20:33:05 +0000 (16:33 -0400)]
Merge branch 'hotfix/1.0.24'
Laury GvR [Thu, 1 Oct 2015 20:32:59 +0000 (16:32 -0400)]
removing placeholder images!
Laury GvR [Thu, 1 Oct 2015 20:30:25 +0000 (16:30 -0400)]
Merge tag 'v1.0.23' into develop
v1.0.23
Laury GvR [Thu, 1 Oct 2015 20:30:20 +0000 (16:30 -0400)]
Merge branch 'hotfix/1.0.23'
Laury GvR [Thu, 1 Oct 2015 20:30:12 +0000 (16:30 -0400)]
New structure for list and detail pages. New styles, too.
Chuck Scott [Thu, 1 Oct 2015 14:44:09 +0000 (10:44 -0400)]
Working on Settigns
Laury GvR [Mon, 28 Sep 2015 16:56:22 +0000 (12:56 -0400)]
Merge tag 'v1.0.22' into develop
v1.0.22
Laury GvR [Mon, 28 Sep 2015 16:55:36 +0000 (12:55 -0400)]
Merge branch 'release/1.0.22'
Conflicts:
views/front/members/detail.html
Laury GvR [Mon, 28 Sep 2015 16:53:46 +0000 (12:53 -0400)]
New version number
Laury GvR [Mon, 28 Sep 2015 16:47:49 +0000 (12:47 -0400)]
Further attempt to resolve merge conflicts
Laury GvR [Mon, 28 Sep 2015 13:37:32 +0000 (09:37 -0400)]
Closing image border tag on detail page.
Laury GvR [Mon, 28 Sep 2015 12:55:36 +0000 (08:55 -0400)]
Image gallery variable reference fixed, wasn't camelcased
Laury GvR [Mon, 28 Sep 2015 12:50:09 +0000 (08:50 -0400)]
Disable packages for now.
Laury GvR [Mon, 28 Sep 2015 16:11:59 +0000 (12:11 -0400)]
More strict detail show checks. Closed div around logo
Laury GvR [Mon, 28 Sep 2015 13:37:32 +0000 (09:37 -0400)]
Closing image border tag on detail page.
Laury GvR [Mon, 28 Sep 2015 12:57:42 +0000 (08:57 -0400)]
No more (annoying?) placeholder image to make up for lack of local image support
Laury GvR [Mon, 28 Sep 2015 12:55:36 +0000 (08:55 -0400)]
Image gallery variable reference fixed, wasn't camelcased
Laury GvR [Mon, 28 Sep 2015 12:50:09 +0000 (08:50 -0400)]
Disable packages for now.
Chuck Scott [Sun, 27 Sep 2015 21:06:51 +0000 (17:06 -0400)]
Merge tag 'v10.0.20' into develop
Version 1.0.20 (hotfix was marked wrong as 10.0.20)
Chuck Scott [Sun, 27 Sep 2015 21:06:29 +0000 (17:06 -0400)]
Merge branch 'hotfix/10.0.20'
Chuck Scott [Sun, 27 Sep 2015 21:05:26 +0000 (17:05 -0400)]
And update version to 1.0.20
Chuck Scott [Sun, 27 Sep 2015 21:04:19 +0000 (17:04 -0400)]
Hotfix for short-code category selection in member lists and other assorted problems.
Laury GvR [Fri, 25 Sep 2015 19:19:32 +0000 (15:19 -0400)]
Merge tag 'v1.0.19' into develop
v1.0.19
Laury GvR [Fri, 25 Sep 2015 19:19:25 +0000 (15:19 -0400)]
Merge branch 'hotfix/1.0.19'
Laury GvR [Fri, 25 Sep 2015 19:19:14 +0000 (15:19 -0400)]
Smaller descr field when no sibling (amenities)
Laury GvR [Fri, 25 Sep 2015 19:15:43 +0000 (15:15 -0400)]
Merge tag 'v1.0.18' into develop
v1.0.18
Laury GvR [Fri, 25 Sep 2015 19:15:38 +0000 (15:15 -0400)]
Merge branch 'hotfix/1.0.18'
Laury GvR [Fri, 25 Sep 2015 19:15:28 +0000 (15:15 -0400)]
More rigorous smarty conditionals for displaying amenities box
Laury GvR [Fri, 25 Sep 2015 18:57:01 +0000 (14:57 -0400)]
Merge tag 'v1.0.17' into develop
v1.0.17
Laury GvR [Fri, 25 Sep 2015 18:56:56 +0000 (14:56 -0400)]
Merge branch 'hotfix/1.0.17'
Laury GvR [Fri, 25 Sep 2015 18:54:50 +0000 (14:54 -0400)]
More dynamic amenities/cc output
Laury GvR [Fri, 25 Sep 2015 18:26:39 +0000 (14:26 -0400)]
Merge tag 'v1.0.16' into develop
v1.0.16
Laury GvR [Fri, 25 Sep 2015 18:26:31 +0000 (14:26 -0400)]
Merge branch 'hotfix/1.0.16'
Laury GvR [Fri, 25 Sep 2015 18:26:25 +0000 (14:26 -0400)]
Photo gallery styling edit
Laury GvR [Fri, 25 Sep 2015 18:19:11 +0000 (14:19 -0400)]
Merge tag 'v1.0.15' into develop
v1.0.15
Laury GvR [Fri, 25 Sep 2015 18:19:07 +0000 (14:19 -0400)]
Merge branch 'hotfix/1.0.15'
Laury GvR [Fri, 25 Sep 2015 18:18:19 +0000 (14:18 -0400)]
Still trying to fix member listing display errors, seems to nest divs in other divs
Laury GvR [Fri, 25 Sep 2015 18:02:43 +0000 (14:02 -0400)]
Merge tag 'v1.0.14' into develop
v1.0.14
Laury GvR [Fri, 25 Sep 2015 18:02:39 +0000 (14:02 -0400)]
Merge branch 'hotfix/1.0.14'
Laury GvR [Fri, 25 Sep 2015 18:02:31 +0000 (14:02 -0400)]
Fixing some more markup issues.. maybe.
Laury GvR [Fri, 25 Sep 2015 16:29:30 +0000 (12:29 -0400)]
Merge tag 'v1.0.13' into develop
v1.0.13
Laury GvR [Fri, 25 Sep 2015 16:29:26 +0000 (12:29 -0400)]
Merge branch 'hotfix/1.0.13'
Laury GvR [Fri, 25 Sep 2015 16:29:21 +0000 (12:29 -0400)]
Broke some markup on last commit, this fixes it.
Laury GvR [Fri, 25 Sep 2015 15:57:07 +0000 (11:57 -0400)]
Merge tag 'v1.0.12' into develop
v1.0.12
Laury GvR [Fri, 25 Sep 2015 15:56:57 +0000 (11:56 -0400)]
Merge branch 'release/1.0.12'
Laury GvR [Fri, 25 Sep 2015 14:51:52 +0000 (10:51 -0400)]
Adding a minor un-edit to list.php: Whitespace
Laury GvR [Fri, 25 Sep 2015 14:49:50 +0000 (10:49 -0400)]
Many changes to styling & markup, some config, front.css
Laury GvR [Fri, 25 Sep 2015 15:56:20 +0000 (11:56 -0400)]
Release develop changes and bump version number
Laury GvR [Fri, 25 Sep 2015 14:51:52 +0000 (10:51 -0400)]
Adding a minor un-edit to list.php: Whitespace
Laury GvR [Fri, 25 Sep 2015 14:49:50 +0000 (10:49 -0400)]
Many changes to styling & markup, some config, front.css
Chuck Scott [Fri, 25 Sep 2015 15:32:20 +0000 (11:32 -0400)]
Merge tag 'v1.0.11' into develop
Hotfix 1.0.11
Chuck Scott [Fri, 25 Sep 2015 15:32:07 +0000 (11:32 -0400)]
Merge branch 'hotfix/1.0.11'
Chuck Scott [Fri, 25 Sep 2015 15:31:17 +0000 (11:31 -0400)]
Fixed problem with imported images going to wrong member info record.
Chuck Scott [Fri, 25 Sep 2015 13:27:47 +0000 (09:27 -0400)]
Committing initial work on Settings to do other hotfix.
Chuck Scott [Wed, 23 Sep 2015 18:02:51 +0000 (14:02 -0400)]
Merge tag 'v1.0.10' into develop
Version 1.0.10
Chuck Scott [Wed, 23 Sep 2015 18:02:36 +0000 (14:02 -0400)]
Merge branch 'release/1.0.10'
Chuck Scott [Wed, 23 Sep 2015 17:43:48 +0000 (13:43 -0400)]
Updated version number
Chuck Scott [Wed, 23 Sep 2015 17:41:45 +0000 (13:41 -0400)]
Merge branch 'develop' of cvs2.gaslightmedia.com:WP-Plugins/glm-member-db into develop
Chuck Scott [Wed, 23 Sep 2015 17:40:51 +0000 (13:40 -0400)]
Added image import
Laury GvR [Wed, 23 Sep 2015 14:42:12 +0000 (10:42 -0400)]
Merge tag 'v1.0.9' into develop
v1.0.9
Laury GvR [Wed, 23 Sep 2015 14:42:04 +0000 (10:42 -0400)]
Merge branch 'release/1.0.9'
Laury GvR [Wed, 23 Sep 2015 14:41:53 +0000 (10:41 -0400)]
Gave front-end fields divs and span tags for better formatting
Laury GvR [Wed, 23 Sep 2015 14:41:09 +0000 (10:41 -0400)]
Removed google map key as it would break it locally and was unnecessary
Chuck Scott [Mon, 21 Sep 2015 00:31:02 +0000 (20:31 -0400)]
Merge tag 'v1.0.8' into develop
Settings is now Managment
Chuck Scott [Mon, 21 Sep 2015 00:30:49 +0000 (20:30 -0400)]
Merge branch 'release/1.0.8'
Chuck Scott [Mon, 21 Sep 2015 00:30:21 +0000 (20:30 -0400)]
Changed to Management Menu
Chuck Scott [Mon, 21 Sep 2015 00:26:14 +0000 (20:26 -0400)]
Changed settings menu to management menu and added capability "Management"
Chuck Scott [Fri, 18 Sep 2015 19:57:45 +0000 (15:57 -0400)]
Merge tag 'v1.0.7' into develop
Old Member DB Import
Chuck Scott [Fri, 18 Sep 2015 19:57:31 +0000 (15:57 -0400)]
Merge branch 'release/1.0.7'
Chuck Scott [Fri, 18 Sep 2015 19:57:07 +0000 (15:57 -0400)]
Updated to release 1.0.7
Chuck Scott [Fri, 18 Sep 2015 19:54:28 +0000 (15:54 -0400)]
Added Old Member DB import
Chuck Scott [Wed, 16 Sep 2015 16:35:50 +0000 (12:35 -0400)]
Merge tag 'v1.0.6' into develop
Fixes to member info categories and amenities
Chuck Scott [Wed, 16 Sep 2015 16:35:33 +0000 (12:35 -0400)]
Merge branch 'hotfix/1.0.6'
Chuck Scott [Wed, 16 Sep 2015 16:34:58 +0000 (12:34 -0400)]
Various fixes and updates to handling of member info categories and amenities
Chuck Scott [Fri, 4 Sep 2015 16:36:42 +0000 (12:36 -0400)]
Merge tag 'v1.0.5' into develop
Fix for member updates
Chuck Scott [Fri, 4 Sep 2015 16:36:29 +0000 (12:36 -0400)]
Merge branch 'hotfix/1.0.5'
Chuck Scott [Fri, 4 Sep 2015 16:36:01 +0000 (12:36 -0400)]
Needed to get updated member info after submission
Chuck Scott [Fri, 4 Sep 2015 16:15:18 +0000 (12:15 -0400)]
Merge tag 'v1.0.4' into develop
Release with Amenities working
Chuck Scott [Fri, 4 Sep 2015 16:14:52 +0000 (12:14 -0400)]
Merge branch 'release/1.0.4'
Chuck Scott [Fri, 4 Sep 2015 16:14:22 +0000 (12:14 -0400)]
Updted to version 1.0.4
Chuck Scott [Fri, 4 Sep 2015 16:12:18 +0000 (12:12 -0400)]
Added member info amenities mangement, selection, and display
Chuck Scott [Wed, 2 Sep 2015 20:32:20 +0000 (16:32 -0400)]
Merge tag 'v1.0.3' into develop
Fixes related to install and new settings
Chuck Scott [Wed, 2 Sep 2015 20:32:05 +0000 (16:32 -0400)]
Merge branch 'hotfix/1.0.3'
projects / WP-Plugins / glm-member-db.git / log