WP-Plugins/glm-member-db.git
8 years agoMerge tag 'v2.8.5' into develop
Steve Sutton [Tue, 3 Jan 2017 19:12:30 +0000 (14:12 -0500)]
Merge tag 'v2.8.5' into develop

Version 2.8.5

8 years agoMerge branch 'release/2.8.5' v2.8.5
Steve Sutton [Tue, 3 Jan 2017 19:12:19 +0000 (14:12 -0500)]
Merge branch 'release/2.8.5'

8 years agoNew release v2.8.5
Steve Sutton [Tue, 3 Jan 2017 19:10:35 +0000 (14:10 -0500)]
New release v2.8.5

Bump version number in the index.php file.
Done in this release.
Mailing Addresses are added to member info contact tab.
Mailing Addresses are added to the member export.
Pagination that Chuck has worked on is now being released.

8 years agoCheck for array $regionData
Steve Sutton [Tue, 3 Jan 2017 18:55:57 +0000 (13:55 -0500)]
Check for array $regionData

Was not checking first that $regionData was an array before it was
trying to use it.

8 years agoAdd Management for List Pagination.
Steve Sutton [Tue, 3 Jan 2017 18:24:53 +0000 (13:24 -0500)]
Add Management for List Pagination.

Adding two new management options.
list_pagination Boolean (enable/disable) pagination on member list.
list_pagination_count smallint - Number of records to display per page.

8 years agoAdd to member import option for getting mailing addresses.
Steve Sutton [Thu, 29 Dec 2016 20:46:01 +0000 (15:46 -0500)]
Add to member import option for getting mailing addresses.

Add option from the mailing addresses from their old database.

8 years agoAdding mailing fields into the export
Steve Sutton [Thu, 29 Dec 2016 18:59:16 +0000 (13:59 -0500)]
Adding mailing fields into the export

Add the 5 mailing fields into the member export.

8 years agoUpdate the member info contact part for new mailing fields.
Steve Sutton [Thu, 29 Dec 2016 18:38:52 +0000 (13:38 -0500)]
Update the member info contact part for new mailing fields.

Adding the mailing address fields into the view files and adding new
mailing city into javascript parts and the model.

8 years agoAdding mailing address fields
Steve Sutton [Thu, 29 Dec 2016 17:13:36 +0000 (12:13 -0500)]
Adding mailing address fields

Adding new fields to the member info table.

8 years agoChanged default permission so Members managers do not have access to management menu.
Chuck Scott [Fri, 30 Dec 2016 20:40:32 +0000 (15:40 -0500)]
Changed default permission so Members managers do not have access to management menu.
Added additional filter locations to member dashboard so the contact member selection can be added in via a filter.

8 years agoAdded pagenation to front-end members list
Chuck Scott [Fri, 16 Dec 2016 20:56:13 +0000 (15:56 -0500)]
Added pagenation to front-end members list
  models/front/members/list.php - added code to support the data abstract pagenation feature
  views/front/members/list.html - added next and previous buttons and display progress of pagenation "nn to nn of nnnn"
  models/admin/management/import/members.php - also pulled a couple lines of unused code unrelated to pagenation
  lib/GlmDataAbstract/DataAbstract.php - fixed one problem with pagenationm feature that would miss one per page if using PseudoRandom ordering

8 years agoRemoved invalid second parameter for delete_option() call.
Chuck Scott [Tue, 13 Dec 2016 21:45:49 +0000 (16:45 -0500)]
Removed invalid second parameter for delete_option() call.

8 years agoAdded image data options clearing to initial member import model.
Chuck Scott [Tue, 13 Dec 2016 21:38:50 +0000 (16:38 -0500)]
Added image data options clearing to initial member import model.

8 years agoUncommented two lines that are supposed to delete the image data WordPress options...
Chuck Scott [Tue, 13 Dec 2016 21:33:17 +0000 (16:33 -0500)]
Uncommented two lines that are supposed to delete the image data WordPress options when import step 2 is started.

8 years agoMerge branch 'develop' of cvs2:WP-Plugins/glm-member-db into develop
Chuck Scott [Tue, 13 Dec 2016 18:31:10 +0000 (13:31 -0500)]
Merge branch 'develop' of cvs2:WP-Plugins/glm-member-db into develop

8 years agoAdded support for Near Me searches
Chuck Scott [Tue, 13 Dec 2016 18:26:13 +0000 (13:26 -0500)]
Added support for Near Me searches
    adminHooks has hook to return quick lat/lon and text search results
    memberDataByLatLon.php model added to do these searches
Added the following libraries to js directory
    googMapsMarkerClusterer
    js-cookie-master for cookie management from JAVAScript
    js-storage-master for browser data storage from JAVAScript
Added map icon sets to assets directory

8 years agoUpdate on the member grid template.
Steve Sutton [Mon, 12 Dec 2016 18:53:07 +0000 (13:53 -0500)]
Update on the member grid template.

Add apply_filters and style for adding a coupon ribbon in css.

8 years agoUpdate for config checks on adminHook and shortcode
Steve Sutton [Thu, 1 Dec 2016 15:31:39 +0000 (10:31 -0500)]
Update for config checks on adminHook and shortcode

Use $config instead of $this->config.
Was getting error messages about undefined indexes when activating the
member plugin.

8 years agoMerge tag 'v2.8.4' into develop
Steve Sutton [Tue, 15 Nov 2016 19:07:54 +0000 (14:07 -0500)]
Merge tag 'v2.8.4' into develop

Version 2.8.4

8 years agoMerge branch 'release/2.8.4' v2.8.4
Steve Sutton [Tue, 15 Nov 2016 19:07:46 +0000 (14:07 -0500)]
Merge branch 'release/2.8.4'

8 years agoBump version number
Steve Sutton [Tue, 15 Nov 2016 19:07:13 +0000 (14:07 -0500)]
Bump version number

New version for the release.

8 years agoSetting up yoast filters for open graph and twitter.
Steve Sutton [Tue, 15 Nov 2016 19:02:49 +0000 (14:02 -0500)]
Setting up yoast filters for open graph and twitter.

Set the title and description for open graph and twitter within the
yoast filters.

8 years agoFixed use of litteral database name to use defined prefix
Chuck Scott [Tue, 15 Nov 2016 18:47:39 +0000 (13:47 -0500)]
Fixed use of litteral database name to use defined prefix

8 years agoMerge tag 'v2.8.3' into develop
Steve Sutton [Mon, 14 Nov 2016 16:49:23 +0000 (11:49 -0500)]
Merge tag 'v2.8.3' into develop

Version 2.8.3

8 years agoMerge branch 'release/2.8.3' v2.8.3
Steve Sutton [Mon, 14 Nov 2016 16:49:15 +0000 (11:49 -0500)]
Merge branch 'release/2.8.3'

8 years agoBump version numbers
Steve Sutton [Mon, 14 Nov 2016 16:48:44 +0000 (11:48 -0500)]
Bump version numbers

Going to release vr 2.8.3

8 years agoDeal with undefined variables.
Steve Sutton [Wed, 9 Nov 2016 21:16:43 +0000 (16:16 -0500)]
Deal with undefined variables.

If these functions don't have the slug global then return false.

8 years agoCorrecting extraneous spacing in data class files.
Laury GvR [Thu, 3 Nov 2016 15:02:22 +0000 (11:02 -0400)]
Correcting extraneous spacing in data class files.

Indentation on data class files changed from 8 spaces to 4 spaces
per tab indentation.

8 years agoremoving padding from toll free numbers in the members listing page in mobile view
Anthony Talarico [Thu, 3 Nov 2016 12:53:27 +0000 (08:53 -0400)]
removing padding from toll free numbers in the members listing page in mobile view

8 years agoAdding new function for getting member id by name and get rid of error
Steve Sutton [Wed, 2 Nov 2016 21:29:48 +0000 (17:29 -0400)]
Adding new function for getting member id by name and get rid of error

Error in the category data abstract when is not defined.

8 years agoFix the member import script to remove newlines.
Steve Sutton [Fri, 28 Oct 2016 18:16:29 +0000 (14:16 -0400)]
Fix the member import script to remove newlines.

Newlines were effecting the imported member records.
With them they would get extra break tags in the output.
Giving them too much spacing between their paragraphs of description.

8 years agoMerge tag 'v2.8.2' into develop
Steve Sutton [Wed, 26 Oct 2016 16:22:07 +0000 (12:22 -0400)]
Merge tag 'v2.8.2' into develop

Version 2.8.2

8 years agoMerge branch 'release/2.8.2' v2.8.2
Steve Sutton [Wed, 26 Oct 2016 16:22:00 +0000 (12:22 -0400)]
Merge branch 'release/2.8.2'

8 years agoFix for bug when members are turned off.
Steve Sutton [Wed, 26 Oct 2016 16:20:48 +0000 (12:20 -0400)]
Fix for bug when members are turned off.

With members off it was redirecting to forbidden page.
It will only redirect now if members are on.

8 years agoUpdating the adminHooks to check if enable_members is on before redirecting.
Steve Sutton [Wed, 26 Oct 2016 16:09:04 +0000 (12:09 -0400)]
Updating the adminHooks to check if enable_members is on before redirecting.

Redirection without enable members is causing an error.

8 years agoTry again on redirect
Steve Sutton [Wed, 26 Oct 2016 16:03:51 +0000 (12:03 -0400)]
Try again on redirect

Don't redirect if not using members.

8 years agoUpdate for not using member and the login redirect
Steve Sutton [Wed, 26 Oct 2016 16:00:01 +0000 (12:00 -0400)]
Update for not using member and the login redirect

Don't redirect users unless members is used.

8 years agoMerge tag 'v2.8.1' into develop
Laury GvR [Tue, 25 Oct 2016 20:30:43 +0000 (16:30 -0400)]
Merge tag 'v2.8.1' into develop

v2.8.1

8 years agoMerge branch 'release/2.8.1' v2.8.1
Laury GvR [Tue, 25 Oct 2016 20:30:38 +0000 (16:30 -0400)]
Merge branch 'release/2.8.1'

8 years agoVersion bump
Laury GvR [Tue, 25 Oct 2016 20:30:25 +0000 (16:30 -0400)]
Version bump

8 years agoMobile friendly changes for the list front view
Laury GvR [Tue, 25 Oct 2016 20:28:30 +0000 (16:28 -0400)]
Mobile friendly changes for the list front view

For mobile size, member list front view: Remove short descriptions
and social icons. Toll Free numbers no longer wrap. Option in
management to view image or not (logo).

8 years agoMerge branch 'develop' of cvs2:WP-Plugins/glm-member-db into develop
Chuck Scott [Tue, 25 Oct 2016 20:19:01 +0000 (16:19 -0400)]
Merge branch 'develop' of cvs2:WP-Plugins/glm-member-db into develop

8 years agoAdded Regions to member list filters and have that limiting categories to those with...
Chuck Scott [Tue, 25 Oct 2016 20:13:02 +0000 (16:13 -0400)]
Added Regions to member list filters and have that limiting categories to those with members matching the selected region.

Added to getListSortedParentChild() in dataCategories to also filter by region selected
  Also not returning parents of categories with matching active members.
Added getListForSearch() to dataRegions to be able to select by active members.
Added code to members/list.php to handle regiona search and filtering of categories when regions are selected.
Updated update_database_V1.1.22 to change region filter default to false.
Updated members/list.html to include region pick-list.

8 years agoUpdate for member import of amenities.
Steve Sutton [Tue, 25 Oct 2016 15:46:27 +0000 (11:46 -0400)]
Update for member import of amenities.

Correcting the error reported. It was saying no cities exists.

8 years agoUpdating the glmUser and glmMembersCaps.
Steve Sutton [Tue, 25 Oct 2016 14:56:28 +0000 (10:56 -0400)]
Updating the glmUser and glmMembersCaps.

Placing these two into the function glmMembersUserCan.
Setting up the glmUser as static variable that will be created only the
first call for the function.
This fixes an issue with network sites.

8 years agoReplace incorrect litteral reference to table prefix with correct define.
Chuck Scott [Tue, 25 Oct 2016 13:57:56 +0000 (09:57 -0400)]
Replace incorrect litteral reference to table prefix with correct define.

8 years agoAdded two general list options - Show member Logo for Mobile & Reagion Search
Chuck Scott [Tue, 25 Oct 2016 13:39:17 +0000 (09:39 -0400)]
Added two general list options - Show member Logo for Mobile & Reagion Search

Added Options to dataSettingsGeneral.php
Updated database version in index.php
Added new options to create_database
Moved create_database and drop_database to V1.1.22
Updated dbVersions with new database version entry
Updated view for Member List Options to include new options

8 years agoMerge tag 'v2.8.0' into develop
Chuck Scott [Mon, 24 Oct 2016 18:17:38 +0000 (14:17 -0400)]
Merge tag 'v2.8.0' into develop

Version 2.8.0

8 years agoMerge branch 'release/2.8.0' v2.8.0
Chuck Scott [Mon, 24 Oct 2016 18:17:28 +0000 (14:17 -0400)]
Merge branch 'release/2.8.0'

8 years agoRelease 2.8.0
Chuck Scott [Mon, 24 Oct 2016 18:15:06 +0000 (14:15 -0400)]
Release 2.8.0

8 years agoAdd add_filter for getting member name and id list.
Steve Sutton [Mon, 24 Oct 2016 18:10:35 +0000 (14:10 -0400)]
Add add_filter for getting member name and id list.

Need for event plugin front end add event form.

8 years agoMerge branch 'develop' of cvs2:WP-Plugins/glm-member-db into develop
Chuck Scott [Fri, 21 Oct 2016 19:59:20 +0000 (15:59 -0400)]
Merge branch 'develop' of cvs2:WP-Plugins/glm-member-db into develop

8 years agoNow only member categories that are used by active member data are listed in the...
Chuck Scott [Fri, 21 Oct 2016 19:51:59 +0000 (15:51 -0400)]
Now only member categories that are used by active member data are listed in the category search pick-list.

Added a second parameter, $forActiveMembers,  to getListSortedParentChild() that returns an organized list of member categories.
Added a "WHERE" clause that is used to select categories when $forActiveMembers is true that limit the category list to those used in active members info records.
Added "true" as the $forActiveMembers parameter in the members "list.php" where getListSortedParentChild() is used to get categories for the filter picklist.

8 years agoremoving all console log statements
Anthony Talarico [Fri, 21 Oct 2016 19:35:44 +0000 (15:35 -0400)]
removing all console log statements

8 years agofixing shortcode builder code to recognize attributes in any order on page load so...
Anthony Talarico [Fri, 21 Oct 2016 19:32:54 +0000 (15:32 -0400)]
fixing shortcode builder code to recognize attributes in any order on page load so that the active boxes are populated with the respective attributes

8 years agoMerge branch 'develop' of cvs2:WP-Plugins/glm-member-db into develop
Chuck Scott [Fri, 21 Oct 2016 18:33:15 +0000 (14:33 -0400)]
Merge branch 'develop' of cvs2:WP-Plugins/glm-member-db into develop

8 years agoAdded enable_members test to member related warnings in dashboard widget.
Chuck Scott [Fri, 21 Oct 2016 18:31:32 +0000 (14:31 -0400)]
Added enable_members test to member related warnings in dashboard widget.

Change is near "Critical Warnings" in views/admin/dashboardWidget/index.html

8 years agofixing shortcode builder's intial check for shortcodes in the page editor so that...
Anthony Talarico [Fri, 21 Oct 2016 17:38:59 +0000 (13:38 -0400)]
fixing shortcode builder's intial check for shortcodes in the page editor so that it doesn't matter which sc attribute is already added

8 years agoAdded code to enable/dissable member related data in GLM Associate widget in the...
Chuck Scott [Fri, 21 Oct 2016 17:11:19 +0000 (13:11 -0400)]
Added code to enable/dissable member related data in GLM Associate widget in the WorkPress dashboard.

Added test for $settings.enable_members in conditional at top of page.

8 years agoSetting up the admin menus and dashboard for member enable flag.
Steve Sutton [Fri, 21 Oct 2016 14:22:13 +0000 (10:22 -0400)]
Setting up the admin menus and dashboard for member enable flag.

Hiding member items if enable_member is not set.
This effects the settings and main dashboard and list pages.

8 years agoMerge branch 'develop' of cvs2:WP-Plugins/glm-member-db into develop
Chuck Scott [Thu, 20 Oct 2016 20:50:30 +0000 (16:50 -0400)]
Merge branch 'develop' of cvs2:WP-Plugins/glm-member-db into develop

Conflicts:
index.php
setup/databaseScripts/dbVersions.php
setup/databaseScripts/update_database_V1.1.20.sql

8 years agoMerge branch 'feature/PseudoRandom' into develop
Chuck Scott [Thu, 20 Oct 2016 20:29:29 +0000 (16:29 -0400)]
Merge branch 'feature/PseudoRandom' into develop

8 years agoAdded Pseudo-Random Sort odering for members and an option to dissable members in...
Chuck Scott [Thu, 20 Oct 2016 20:28:00 +0000 (16:28 -0400)]
Added Pseudo-Random Sort odering for members and an option to dissable members in the main plugin.

Added List Sort Order arrays to glm-member-db plugin.ini.
Added Member List Order selection to Member list Options in Management (list_order_list).
Added "Enable Members" option to Misc Settings in Management (enable_members).
Added list_order_list and "enable_members" fields to settings_general table in create_database.sql.
Created update_database_V1.1.20.sql file to add list_order_list and enable_members to settings_general.
Updated create_database and drop_database in databaseScripts to the new database version 1.1.20.
Added list_order_list and enable_members fields to dataSettingsGeneral.php Data Class.
Added "Mmeber List Order" option to Member List options tab in Management - General Settings.
Added "Enable Member" option to Misc Settings tab in Management - General Settings.
Updated front-end members list model front/members/list.php to check the list_order_list setting to determine sort order.

8 years agoRemove test echo
Laury GvR [Wed, 19 Oct 2016 16:58:45 +0000 (12:58 -0400)]
Remove test echo

8 years agoAdd 'view member' link to the member list
Laury GvR [Wed, 19 Oct 2016 16:58:04 +0000 (12:58 -0400)]
Add 'view member' link to the member list

8 years agoMerge tag 'v2.7.0' into develop
Steve Sutton [Wed, 19 Oct 2016 13:39:42 +0000 (09:39 -0400)]
Merge tag 'v2.7.0' into develop

Version 2.7.0

8 years agoMerge branch 'release/2.7.0' v2.7.0
Steve Sutton [Wed, 19 Oct 2016 13:39:32 +0000 (09:39 -0400)]
Merge branch 'release/2.7.0'

8 years agoBump version number
Steve Sutton [Wed, 19 Oct 2016 13:38:28 +0000 (09:38 -0400)]
Bump version number

Going to version 1.7.0
New features
Dashboard
Shortcode builder now has regions
new option for web cam in list view

8 years agoAdded pseudo-random sort order to member list results. Still need to consider impleme...
Chuck Scott [Tue, 18 Oct 2016 21:03:54 +0000 (17:03 -0400)]
Added pseudo-random sort order to member list results. Still need to consider implementing paging.

8 years agoMerge branch 'feature/memberDashboard' into develop feature/lauryViewDetail
Steve Sutton [Tue, 18 Oct 2016 16:22:54 +0000 (12:22 -0400)]
Merge branch 'feature/memberDashboard' into develop

8 years agoMerge branch 'develop' into feature/memberDashboard
Steve Sutton [Tue, 18 Oct 2016 16:22:15 +0000 (12:22 -0400)]
Merge branch 'develop' into feature/memberDashboard

8 years agoRemoved test code
Laury GvR [Tue, 18 Oct 2016 14:15:17 +0000 (10:15 -0400)]
Removed test code

8 years agoOption for webcam on list, markup conditional fix
Laury GvR [Tue, 18 Oct 2016 14:11:48 +0000 (10:11 -0400)]
Option for webcam on list, markup conditional fix

List view and Grid view both were not checking entirely correctly
for whether the webcam had a good URL. Also added a live_cam
display option to the admin settings that is now checked against.

8 years agoMerge branch 'develop' into feature/memberDashboard feature/memberDashboard
Steve Sutton [Fri, 14 Oct 2016 19:14:23 +0000 (15:14 -0400)]
Merge branch 'develop' into feature/memberDashboard

8 years agoMinor updates to URL Click-through and Daily Page View graphs.
Chuck Scott [Fri, 14 Oct 2016 14:30:35 +0000 (10:30 -0400)]
Minor updates to URL Click-through and Daily Page View graphs.
Also removed import of daily clicks and views from legacy sites due to that data not being available.

8 years agoMerge branch 'feature/ImportClicksViews' into develop
Chuck Scott [Thu, 13 Oct 2016 20:28:31 +0000 (16:28 -0400)]
Merge branch 'feature/ImportClicksViews' into develop

Conflicts:
views/admin/member/index.html

8 years agoRemoved a test line from glmMembersUserCan()
Chuck Scott [Thu, 13 Oct 2016 20:09:54 +0000 (16:09 -0400)]
Removed a test line from glmMembersUserCan()

8 years agoAdded a function plugin support to test for existing capabilities and their setting.
Chuck Scott [Thu, 13 Oct 2016 20:05:46 +0000 (16:05 -0400)]
Added a function plugin support to test for existing capabilities and their setting.

8 years agoAdded code to support updates - Temporatily commented out code added to index.php...
Chuck Scott [Thu, 13 Oct 2016 15:37:15 +0000 (11:37 -0400)]
Added code to support updates - Temporatily commented out code added to index.php for now.

8 years agoAdded graph date selection and export to member click and view counts.
Chuck Scott [Tue, 11 Oct 2016 20:32:50 +0000 (16:32 -0400)]
Added graph date selection and export to member click and view counts.
Updated datetimepicker

8 years agoMerge branch 'develop' into feature/memberDashboard
Steve Sutton [Tue, 11 Oct 2016 14:09:39 +0000 (10:09 -0400)]
Merge branch 'develop' into feature/memberDashboard

8 years agoremoving test glm-row classes to fix content from being hidden in mobile views for...
Anthony Talarico [Thu, 6 Oct 2016 20:00:36 +0000 (16:00 -0400)]
removing test glm-row classes to fix content from being hidden in mobile views for the member detail pages

8 years agoadded regions to the shortcode builder, fixed issues between visual and text mode...
Anthony Talarico [Thu, 6 Oct 2016 18:28:21 +0000 (14:28 -0400)]
added regions to the shortcode builder, fixed issues between visual and text mode operations.

8 years agoUpdating the member admin client user dashboard widget
Steve Sutton [Wed, 5 Oct 2016 20:33:53 +0000 (16:33 -0400)]
Updating the member admin client user dashboard widget

Listing out the pending member profiles.

8 years agoMerge tag 'v2.6.6' into develop
Laury GvR [Tue, 4 Oct 2016 18:06:25 +0000 (14:06 -0400)]
Merge tag 'v2.6.6' into develop

v2.6.6

8 years agoMerge branch 'hotfix/2.6.6' v2.6.6
Laury GvR [Tue, 4 Oct 2016 18:06:20 +0000 (14:06 -0400)]
Merge branch 'hotfix/2.6.6'

8 years agoAlways filled in http on livecam submission, even when empty
Laury GvR [Tue, 4 Oct 2016 18:06:15 +0000 (14:06 -0400)]
Always filled in http on livecam submission, even when empty

8 years agoMerge tag 'v2.6.5' into develop
Laury GvR [Tue, 4 Oct 2016 18:01:41 +0000 (14:01 -0400)]
Merge tag 'v2.6.5' into develop

v2.6.5

8 years agoMerge branch 'hotfix/2.6.5' v2.6.5
Laury GvR [Tue, 4 Oct 2016 18:01:37 +0000 (14:01 -0400)]
Merge branch 'hotfix/2.6.5'

8 years agoIncorrect function call corrected.
Laury GvR [Tue, 4 Oct 2016 18:01:32 +0000 (14:01 -0400)]
Incorrect function call corrected.

8 years agoremoving all glm-grid styles until they are worked on further
Anthony Talarico [Tue, 4 Oct 2016 16:16:28 +0000 (12:16 -0400)]
removing all glm-grid styles until they are worked on further

8 years agoMerge tag 'v2.6.4' into develop
Laury GvR [Tue, 4 Oct 2016 15:09:44 +0000 (11:09 -0400)]
Merge tag 'v2.6.4' into develop

v2.6.4

8 years agoMerge branch 'hotfix/2.6.4' v2.6.4
Laury GvR [Tue, 4 Oct 2016 15:09:36 +0000 (11:09 -0400)]
Merge branch 'hotfix/2.6.4'

8 years agoProper commenting data class, version bump
Laury GvR [Tue, 4 Oct 2016 15:08:47 +0000 (11:08 -0400)]
Proper commenting data class, version bump

Some data class entries for dataMemberInfo were not properly
labeled with a comment. Also bumped the version number.

8 years agoMerge tag 'v2.6.3' into develop
Laury GvR [Tue, 4 Oct 2016 15:06:51 +0000 (11:06 -0400)]
Merge tag 'v2.6.3' into develop

v2.6.3

8 years agoMerge branch 'hotfix/2.6.3' v2.6.3
Laury GvR [Tue, 4 Oct 2016 15:06:02 +0000 (11:06 -0400)]
Merge branch 'hotfix/2.6.3'

8 years agoCommented out shortcode override function
Laury GvR [Tue, 4 Oct 2016 15:05:07 +0000 (11:05 -0400)]
Commented out shortcode override function

This function was causing the shortcode to be overridden in the
sidebar. The function itself is deprecated and has now been
disabled.

8 years agoWebcam links on member list fixed
Laury GvR [Tue, 4 Oct 2016 15:03:13 +0000 (11:03 -0400)]
Webcam links on member list fixed

The webcam links were not properly sending people to the image
(if a url was selected) or the member page (if image was selected)
It will now also check whether a link has http prefix and add it
if not.

8 years agoMerge branch 'develop' of cvs2:WP-Plugins/glm-member-db into develop
Chuck Scott [Tue, 4 Oct 2016 14:42:27 +0000 (10:42 -0400)]
Merge branch 'develop' of cvs2:WP-Plugins/glm-member-db into develop

8 years agoCleaned up shortcode attributes list and included missing options.
Chuck Scott [Tue, 4 Oct 2016 14:41:56 +0000 (10:41 -0400)]
Cleaned up shortcode attributes list and included missing options.