WP-Plugins/glm-member-db.git
7 years agochanging the scss files for the glm grid to reduce the width amount for each of the...
Anthony Talarico [Mon, 11 Dec 2017 21:38:37 +0000 (16:38 -0500)]
changing the scss files for the glm grid to reduce the width amount for each of the column sizes

testing the reduction of width percentages to calculate column widths in the grid sass file

7 years agoAdded !is_admin() check where making sure a non admin and non-members manager can...
Chuck Scott [Thu, 7 Dec 2017 17:49:59 +0000 (12:49 -0500)]
Added !is_admin() check where making sure a non admin and non-members manager can access member information.

7 years agoUpdating the wp_register_script call
Steve Sutton [Thu, 7 Dec 2017 16:58:50 +0000 (11:58 -0500)]
Updating the wp_register_script call

Had an extra parameter in there that was messing things up.

7 years agoAdded some debug output to front controller and attempting to lock user down for...
Chuck Scott [Tue, 5 Dec 2017 21:32:37 +0000 (16:32 -0500)]
Added some debug output to front controller and attempting to lock user down for a certain defect.

7 years agoSet checkbox input comparison using in_array to use strict comparison.
Chuck Scott [Mon, 4 Dec 2017 20:54:15 +0000 (15:54 -0500)]
Set checkbox input comparison using in_array to use strict comparison.

7 years agoUpdating the call to the google api
Steve Sutton [Thu, 30 Nov 2017 15:18:27 +0000 (10:18 -0500)]
Updating the call to the google api

Setup the jquery ui styles sheet so it is getting the correct style
version with the loaded jquery ui version.

7 years agoRemoving extra quote in markup
Steve Sutton [Thu, 30 Nov 2017 14:51:02 +0000 (09:51 -0500)]
Removing extra quote in markup

There was an extra " in the markup for the table tag.

7 years agoAdded new mask input js add-on and noted where the old one is used in admin controller.
Chuck Scott [Mon, 27 Nov 2017 21:49:31 +0000 (16:49 -0500)]
Added new mask input js add-on and noted where the old one is used in admin controller.

This new mask input code is only used so far for registratrions.

7 years agoFixes for Data Abstract crypt password when no password supplied, source code spacing...
Chuck Scott [Thu, 16 Nov 2017 14:36:14 +0000 (09:36 -0500)]
Fixes for Data Abstract crypt password when no password supplied, source code spacing in front.php, and layout in hooks.help

7 years agoMerge tag 'v2.10.20' into develop
Steve Sutton [Thu, 9 Nov 2017 18:32:52 +0000 (13:32 -0500)]
Merge tag 'v2.10.20' into develop

Version 2.10.20

7 years agoMerge branch 'hotfix/2.10.20' v2.10.20
Steve Sutton [Thu, 9 Nov 2017 18:32:44 +0000 (13:32 -0500)]
Merge branch 'hotfix/2.10.20'

7 years agoUpdate for member search additions.
Steve Sutton [Thu, 9 Nov 2017 18:31:55 +0000 (13:31 -0500)]
Update for member search additions.

Check for the back_to_search with isset first.
Check to see if the user has correct permission to see the back to
search button.

7 years agoMerge tag 'v2.10.19' into develop
Steve Sutton [Thu, 9 Nov 2017 15:58:29 +0000 (10:58 -0500)]
Merge tag 'v2.10.19' into develop

Version 2.10.19

7 years agoMerge branch 'hotfix/2.10.19' v2.10.19
Steve Sutton [Thu, 9 Nov 2017 15:58:21 +0000 (10:58 -0500)]
Merge branch 'hotfix/2.10.19'

7 years agoIf no session then start one.
Steve Sutton [Thu, 9 Nov 2017 15:57:53 +0000 (10:57 -0500)]
If no session then start one.

This is for saving the search for member list.

7 years agoMerge tag 'v2.10.18' into develop
Steve Sutton [Thu, 9 Nov 2017 15:31:40 +0000 (10:31 -0500)]
Merge tag 'v2.10.18' into develop

Version 2.10.18

7 years agoMerge branch 'hotfix/2.10.18' v2.10.18
Steve Sutton [Thu, 9 Nov 2017 15:31:30 +0000 (10:31 -0500)]
Merge branch 'hotfix/2.10.18'

7 years agoImproving the member search.
Steve Sutton [Thu, 9 Nov 2017 15:29:57 +0000 (10:29 -0500)]
Improving the member search.

Remember last search and add a link to 'Back to Search'.
Saving the search now in php session.
Will reset when the list page is hit again.
Resets for each search.
Now showing the name search back into the field. Fixed issue with quotes
and apostrophes.

7 years agoadding size parameter to the get_images filter
Anthony Talarico [Fri, 3 Nov 2017 20:31:32 +0000 (16:31 -0400)]
adding size parameter to the get_images filter

allowing user to pick a size to return the full image url from the filter

7 years agofixing member images filter by adding the priorty and number of args
Anthony Talarico [Fri, 3 Nov 2017 19:53:29 +0000 (15:53 -0400)]
fixing member images filter by adding the priorty and number of args

the member images filter wasn't working properly due to missing priority and
args number

7 years agoAdded glm-strong-warning class
Chuck Scott [Fri, 3 Nov 2017 14:35:12 +0000 (10:35 -0400)]
Added glm-strong-warning class

7 years agoMerge tag 'v2.10.17' into develop
Steve Sutton [Wed, 1 Nov 2017 18:51:19 +0000 (14:51 -0400)]
Merge tag 'v2.10.17' into develop

Version 2.10.17

7 years agoMerge branch 'hotfix/2.10.17' v2.10.17
Steve Sutton [Wed, 1 Nov 2017 18:51:05 +0000 (14:51 -0400)]
Merge branch 'hotfix/2.10.17'

7 years agoFix for member name slug not being generated.
Steve Sutton [Wed, 1 Nov 2017 18:50:17 +0000 (14:50 -0400)]
Fix for member name slug not being generated.

Putting back the updateSlug call for creating the member name slug.

7 years agoMerge tag 'v2.10.16' into develop
Chuck Scott [Tue, 31 Oct 2017 18:34:03 +0000 (14:34 -0400)]
Merge tag 'v2.10.16' into develop

Fixed version number

7 years agoMerge branch 'hotfix/2.10.16' v2.10.16
Chuck Scott [Tue, 31 Oct 2017 18:33:55 +0000 (14:33 -0400)]
Merge branch 'hotfix/2.10.16'

7 years agoFixed version number in index.php that wasn't updated with last hotfix.
Chuck Scott [Tue, 31 Oct 2017 18:33:22 +0000 (14:33 -0400)]
Fixed version number in index.php that wasn't updated with last hotfix.

7 years agoMerge tag 'v2.10.15' into develop
Chuck Scott [Tue, 31 Oct 2017 18:23:03 +0000 (14:23 -0400)]
Merge tag 'v2.10.15' into develop

Proper member handling after adding the member

7 years agoMerge branch 'hotfix/2.10.15' v2.10.15
Chuck Scott [Tue, 31 Oct 2017 18:21:01 +0000 (14:21 -0400)]
Merge branch 'hotfix/2.10.15'

7 years agoCommended out call to clear debug notices in plugin support class. hotfix/2.10.15
Chuck Scott [Tue, 31 Oct 2017 18:18:36 +0000 (14:18 -0400)]
Commended out call to clear debug notices in plugin support class.
Fixed adding a member so it now sends user to that members dashboard after adding it.
Updated plugin version number to 2.10.15 and documented updates in readme.txt file.

7 years agoChanged max width for Associate Admin area from 1024px to 98% to accommodate larger...
Chuck Scott [Tue, 31 Oct 2017 15:45:12 +0000 (11:45 -0400)]
Changed max width for Associate Admin area from 1024px to 98% to accommodate larger screens.
Added some front-end styles to better support appearance for some add-ons
Removed a potentially problematic word fromt he EasyPassword word list.
Fixed a minor error in a method description in Data Abstract docs.

7 years agoAdding id to restrict these styles to our plugins.
Steve Sutton [Thu, 26 Oct 2017 16:35:45 +0000 (12:35 -0400)]
Adding id to restrict these styles to our plugins.

These should only apply to our plugins and not every input field.

7 years agoCheck with isset first
Steve Sutton [Thu, 26 Oct 2017 15:08:42 +0000 (11:08 -0400)]
Check with isset first

Need to check to see if this exists.

7 years agoadding featured flag to the getGallery method from the images data class
Anthony Talarico [Thu, 26 Oct 2017 13:18:39 +0000 (09:18 -0400)]
adding featured flag to the getGallery method from the images data class

adding filter in fronthooks to get member images or featured image if requested

7 years agoAdding for error logs in admin controller.
Steve Sutton [Tue, 17 Oct 2017 19:56:03 +0000 (15:56 -0400)]
Adding for error logs in admin controller.

Add the name of the model in trigger error.
Add the name of the view in trigger error.
Only shows if admin errors turned on.

7 years agoRemoved one more legacy debug window reference
Chuck Scott [Tue, 17 Oct 2017 17:28:41 +0000 (13:28 -0400)]
Removed one more legacy debug window reference

7 years agoRemoved more legacy debug window code.
Chuck Scott [Tue, 17 Oct 2017 17:27:18 +0000 (13:27 -0400)]
Removed more legacy debug window code.

7 years agoFixed mess in management Misc. Settings table.
Chuck Scott [Tue, 17 Oct 2017 17:11:56 +0000 (13:11 -0400)]
Fixed mess in management Misc. Settings table.

7 years agoRe-activated management debug flags.
Chuck Scott [Tue, 17 Oct 2017 17:00:03 +0000 (13:00 -0400)]
Re-activated management debug flags.
Added debug output for critical items in front controller.
Removed E-Mail feature that was supposed to send an error message from live sites when there was a front controller problem. Didn't work.

7 years agoUpdating the custom field integration for management.
Steve Sutton [Tue, 17 Oct 2017 16:06:47 +0000 (12:06 -0400)]
Updating the custom field integration for management.

Update the controller in admin to return output as string if needed.

7 years agoRemoved more of the legacy debug code from index.php
Chuck Scott [Tue, 17 Oct 2017 15:16:14 +0000 (11:16 -0400)]
Removed more of the legacy debug code from index.php
Fixed incorrect regerences to $m.member in list.html filters that should be using $m.member_pointer ($m.member is a name)

7 years agoMerge tag 'v2.10.14' into develop feature/revamp revampCustomFields
Steve Sutton [Tue, 10 Oct 2017 19:03:18 +0000 (15:03 -0400)]
Merge tag 'v2.10.14' into develop

Version 2.10.14

7 years agoMerge branch 'hotfix/2.10.14' v2.10.14
Steve Sutton [Tue, 10 Oct 2017 19:03:06 +0000 (15:03 -0400)]
Merge branch 'hotfix/2.10.14'

7 years agoUpdate admin member list and how the front check for valid member for 404
Steve Sutton [Tue, 10 Oct 2017 19:01:46 +0000 (15:01 -0400)]
Update admin member list and how the front check for valid member for 404

For the 404 check also check the member.access for a display member
type. For the admin side need to add the name and value to the input
fields for the filters archived pending and featured for them to get
passed to the next page buttons.

7 years agoMerge tag 'v2.10.13' into develop
Steve Sutton [Mon, 9 Oct 2017 12:48:52 +0000 (08:48 -0400)]
Merge tag 'v2.10.13' into develop

Version 2.10.13

7 years agoMerge branch 'hotfix/2.10.13' v2.10.13
Steve Sutton [Mon, 9 Oct 2017 12:48:45 +0000 (08:48 -0400)]
Merge branch 'hotfix/2.10.13'

7 years agoAdd check for status when getting member data for detail pages.
Steve Sutton [Fri, 6 Oct 2017 18:03:46 +0000 (14:03 -0400)]
Add check for status when getting member data for detail pages.

If the member data doesn't exists then send 404.
Update version number for this hotfix/2.10.13

7 years agoSingle quotes were breaking members for cities
Laury GvR [Fri, 6 Oct 2017 20:50:19 +0000 (16:50 -0400)]
Single quotes were breaking members for cities

The member names are now manually ran through str_replace to fix
single quotes which were broken due to the way the JSON string is
accessed in the viewfile of cities.html

7 years agoSettings > Cities, stop deletion if used by member
Laury GvR [Fri, 6 Oct 2017 19:38:46 +0000 (15:38 -0400)]
Settings > Cities, stop deletion if used by member

Cities are no longer allowed to be deleted when they are used by
a member, and will notify the user which members this city is in
use with, as well as prove links to said members' profile admin
page.

7 years agoAdd check for status when getting member data for detail pages.
Steve Sutton [Fri, 6 Oct 2017 18:03:46 +0000 (14:03 -0400)]
Add check for status when getting member data for detail pages.

If the member data doesn't exists then send 404.

7 years agoRemoving references to "addNotice" function in glmPluginSupport that were causing...
Chuck Scott [Thu, 5 Oct 2017 20:01:01 +0000 (16:01 -0400)]
Removing references to "addNotice" function in glmPluginSupport that were causing problems.

7 years agoMerge tag 'v2.10.12' into develop
Steve Sutton [Wed, 27 Sep 2017 13:13:35 +0000 (09:13 -0400)]
Merge tag 'v2.10.12' into develop

Version 2.10.12

7 years agoMerge branch 'release/2.10.12' v2.10.12
Steve Sutton [Wed, 27 Sep 2017 13:13:27 +0000 (09:13 -0400)]
Merge branch 'release/2.10.12'

7 years agoRelease for Laury's updates on member photos
Steve Sutton [Wed, 27 Sep 2017 13:12:50 +0000 (09:12 -0400)]
Release for Laury's updates on member photos

Laury updated photo gallery for member detail pages.

7 years agoAdding image arrows for member detail photo gallery
Laury GvR [Tue, 26 Sep 2017 14:25:54 +0000 (10:25 -0400)]
Adding image arrows for member detail photo gallery

Fancybox 3 needed a different data tag in the markup for arrows
to show up on the member detail photo gallery.

7 years agoMerge tag 'v2.10.11' into develop
Steve Sutton [Mon, 25 Sep 2017 13:51:01 +0000 (09:51 -0400)]
Merge tag 'v2.10.11' into develop

Version 2.10.11

7 years agoMerge branch 'release/2.10.11' v2.10.11
Steve Sutton [Mon, 25 Sep 2017 13:50:52 +0000 (09:50 -0400)]
Merge branch 'release/2.10.11'

7 years agoRelease for main plugin.
Steve Sutton [Mon, 25 Sep 2017 13:50:06 +0000 (09:50 -0400)]
Release for main plugin.

Adding search filter for the member types.
Adding check/uncheck option for member export fields.

7 years agoCheck the url length for csv import also.
Steve Sutton [Mon, 25 Sep 2017 13:45:11 +0000 (09:45 -0400)]
Check the url length for csv import also.

Checking the url length. If more than 255 it will fail to import member
info.

7 years agoCheck length of the member url
Steve Sutton [Tue, 19 Sep 2017 17:12:36 +0000 (13:12 -0400)]
Check length of the member url

If it is longer than 255 then shorten the url.
It will fail to insert the member profile if it is longer than 255.

7 years agoAdded highligted button classes glm-button-highlighted and glm-button-small-highlighted
Chuck Scott [Fri, 15 Sep 2017 16:01:29 +0000 (12:01 -0400)]
Added highligted button classes glm-button-highlighted and glm-button-small-highlighted

7 years agoMinor addition to admin css file for use in certain admin areas.
Chuck Scott [Thu, 14 Sep 2017 13:57:58 +0000 (09:57 -0400)]
Minor addition to admin css file for use in certain admin areas.
Added check for "setup/commonHooks.php" to provide hooks that are used by both admin and front processes. Sample file in main plugin.
Removed check for "setup/mapHooks.php" which didn't seem to be in use. Can't find any "mapHooks.php" files in any of our plugins.

7 years agoAdding option to the member export for check and uncheck all.
Steve Sutton [Wed, 13 Sep 2017 19:59:37 +0000 (15:59 -0400)]
Adding option to the member export for check and uncheck all.

This may help clients who want only member name and reporting like click
through and detail reports.

7 years agoAdd member type filter to list search.
Steve Sutton [Wed, 13 Sep 2017 19:42:10 +0000 (15:42 -0400)]
Add member type filter to list search.

Adding a filter when searching by member types.

7 years agoMerge tag 'v2.10.10' into develop
Steve Sutton [Tue, 12 Sep 2017 20:35:03 +0000 (16:35 -0400)]
Merge tag 'v2.10.10' into develop

Version 2.10.10

7 years agoMerge branch 'release/2.10.10' v2.10.10
Steve Sutton [Tue, 12 Sep 2017 20:34:57 +0000 (16:34 -0400)]
Merge branch 'release/2.10.10'

7 years agoFor new release
Steve Sutton [Tue, 12 Sep 2017 20:33:54 +0000 (16:33 -0400)]
For new release

Bump version number and update readme file.

7 years agoFix for member id
Steve Sutton [Tue, 12 Sep 2017 20:30:16 +0000 (16:30 -0400)]
Fix for member id

Need to look at the member_pointer id instead of the member info id.

7 years agoStarted depreciating front and admin debug features.
Chuck Scott [Wed, 6 Sep 2017 16:19:33 +0000 (12:19 -0400)]
Started depreciating front and admin debug features.
Removed debug settings from Management Menu
Commented out code used to add content to debug data from plugin support.
Keeping code for now to purge any remainting data from WordPress options where it stored.
If no issues come up, will do a final purge of this code and all calls to save debug information form all other code.
All changes are marked as "Depreciating Debug..."

7 years agoUpdating the import for members short_descr
Steve Sutton [Wed, 30 Aug 2017 19:46:15 +0000 (15:46 -0400)]
Updating the import for members short_descr

Updating how it is getting short_descr. Removing part where it explodes
and implodes based on space.

7 years agoAdded option to include Clicks and Views when esporting a members list.
Chuck Scott [Tue, 29 Aug 2017 19:28:49 +0000 (15:28 -0400)]
Added option to include Clicks and Views when esporting a members list.

7 years agoDeleted view files used with old layout for editing profiles. No longer needed.
Chuck Scott [Thu, 24 Aug 2017 16:42:25 +0000 (12:42 -0400)]
Deleted view files used with old layout for editing profiles. No longer needed.

7 years agoMerge tag 'v2.10.9' into develop
Steve Sutton [Fri, 25 Aug 2017 14:38:35 +0000 (10:38 -0400)]
Merge tag 'v2.10.9' into develop

Version 2.10.9

7 years agoMerge branch 'hotfix/2.10.9' v2.10.9
Steve Sutton [Fri, 25 Aug 2017 14:38:27 +0000 (10:38 -0400)]
Merge branch 'hotfix/2.10.9'

7 years agoRelease
Steve Sutton [Fri, 25 Aug 2017 14:37:46 +0000 (10:37 -0400)]
Release

Fix for member photo upload with location turned off.

7 years agoMerge tag 'v2.10.8' into develop
Steve Sutton [Thu, 24 Aug 2017 16:31:03 +0000 (12:31 -0400)]
Merge tag 'v2.10.8' into develop

Version 2.10.8

7 years agoMerge branch 'release/2.10.8' v2.10.8
Steve Sutton [Thu, 24 Aug 2017 16:30:55 +0000 (12:30 -0400)]
Merge branch 'release/2.10.8'

7 years agoUpdate for new release v2.10.8
Steve Sutton [Thu, 24 Aug 2017 16:30:17 +0000 (12:30 -0400)]
Update for new release v2.10.8

Recording changes for release in readme file.

7 years agoFixed problem with map reverting to address location each time member profile loads.
Chuck Scott [Thu, 24 Aug 2017 16:22:28 +0000 (12:22 -0400)]
Fixed problem with map reverting to address location each time member profile loads.
Made map show all of the time, removed map show/hide button, and fixed some minor possitioning issues with map related elements.

7 years agoFixed undefined references in "File Download" area.
Chuck Scott [Mon, 21 Aug 2017 18:59:12 +0000 (14:59 -0400)]
Fixed undefined references in "File Download" area.

7 years agoAdded code to save member ID when selecing to display active member info record from...
Chuck Scott [Mon, 21 Aug 2017 18:18:14 +0000 (14:18 -0400)]
Added code to save member ID when selecing to display active member info record from member List.

7 years agoAdded a css class for "required with no wrap" to use in admin forms for prompt column.
Chuck Scott [Mon, 21 Aug 2017 18:10:04 +0000 (14:10 -0400)]
Added a css class for "required with no wrap" to use in admin forms for prompt column.
Fixed an error with parameter type in GLM Data Abstract documentation for getList() function.
Cleaned up some extra spaces in adminHooks.php.

7 years agoUpdated check for all common plugin PHP files being called directly and now sending...
Chuck Scott [Fri, 11 Aug 2017 20:20:18 +0000 (16:20 -0400)]
Updated check for all common plugin PHP files being called directly and now sending user to /assets/404.html

7 years agoUpdate to get edit city cancel button to work.
Steve Sutton [Fri, 11 Aug 2017 20:19:23 +0000 (16:19 -0400)]
Update to get edit city cancel button to work.

Update the id used for the editCityCancel button.

7 years agoMerge tag 'v2.10.7' into develop
Chuck Scott [Fri, 11 Aug 2017 19:45:19 +0000 (15:45 -0400)]
Merge tag 'v2.10.7' into develop

Members Export Problems Fixed

7 years agoMerge branch 'hotfix/2.10.7' v2.10.7
Chuck Scott [Fri, 11 Aug 2017 19:45:04 +0000 (15:45 -0400)]
Merge branch 'hotfix/2.10.7'

7 years agoFixed uninitialized parameter problem for $filterFeatured in membersListExport model
Chuck Scott [Fri, 11 Aug 2017 19:41:08 +0000 (15:41 -0400)]
Fixed uninitialized parameter problem for $filterFeatured in membersListExport model
Fixed bad referencs to .value in certain output fields in the Member Profile Export views when those values didn't exist.
Updated index.php with new version
Updated readme.txt with new version notes.

7 years agoMerge tag 'v2.10.6' into develop
Steve Sutton [Fri, 11 Aug 2017 18:53:58 +0000 (14:53 -0400)]
Merge tag 'v2.10.6' into develop

Version 2.10.6

7 years agoMerge branch 'release/2.10.6' v2.10.6
Steve Sutton [Fri, 11 Aug 2017 18:53:50 +0000 (14:53 -0400)]
Merge branch 'release/2.10.6'

7 years agoRelease 2.10.6
Steve Sutton [Fri, 11 Aug 2017 18:53:09 +0000 (14:53 -0400)]
Release 2.10.6

bug fix release

7 years agoAdded GLM_MEMBERS_PLUGIN_ADMIN_MENU_URL_BASE to help with Registrations add-on
Chuck Scott [Fri, 11 Aug 2017 18:47:54 +0000 (14:47 -0400)]
Added GLM_MEMBERS_PLUGIN_ADMIN_MENU_URL_BASE to help with Registrations add-on
Changed "Export Members" to "Export Member Profiles" on the export button and on the dialog box in the member list page.
Changed the title of the HTML export output to "Member Profiles

7 years agoUpdating member list and export query.
Steve Sutton [Fri, 11 Aug 2017 18:40:56 +0000 (14:40 -0400)]
Updating member list and export query.

This is to correct the category sub query to include the status of the
member info record.

7 years agoMerge tag 'v2.10.5' into develop
Steve Sutton [Wed, 9 Aug 2017 18:30:12 +0000 (14:30 -0400)]
Merge tag 'v2.10.5' into develop

Version 2.10.5

7 years agoMerge branch 'release/2.10.5' v2.10.5
Steve Sutton [Wed, 9 Aug 2017 18:30:04 +0000 (14:30 -0400)]
Merge branch 'release/2.10.5'

7 years agoRelease for member plugin
Steve Sutton [Wed, 9 Aug 2017 18:29:39 +0000 (14:29 -0400)]
Release for member plugin

version 2.10.5

7 years agoRemove the js script for phone formating. Update phoneFormat Filter.
Steve Sutton [Wed, 9 Aug 2017 18:22:04 +0000 (14:22 -0400)]
Remove the js script for phone formating. Update phoneFormat Filter.

I updated the phone format filter so it will not mess with phone numbers
that start with + sign. I commented out the phone number format js call
so we can enter in international phone numbers.

7 years agoRename member tab for Files
Steve Sutton [Tue, 8 Aug 2017 18:43:30 +0000 (14:43 -0400)]
Rename member tab for Files

Renaming to File Downloads

7 years agoUpdating the add city button.
Steve Sutton [Tue, 8 Aug 2017 18:32:27 +0000 (14:32 -0400)]
Updating the add city button.

Now when adding the city it sorts the state list.
Also done with mailing address.
commenting out a call that was giving an error.
Think the geocode thing is done on the map button anyways.

7 years agoPut the city list in alpha order.
Steve Sutton [Tue, 8 Aug 2017 18:16:15 +0000 (14:16 -0400)]
Put the city list in alpha order.

Alpha order for the settings city list.

7 years agoMerge tag 'v2.10.4' into develop
Steve Sutton [Tue, 8 Aug 2017 13:26:53 +0000 (09:26 -0400)]
Merge tag 'v2.10.4' into develop

Version 2.10.4