Merge in develop changes
authorLaury GvR <laury@gaslightmedia.com>
Fri, 21 Dec 2018 16:10:32 +0000 (11:10 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 21 Dec 2018 16:10:32 +0000 (11:10 -0500)
commit573f4eea5cc984823cc31b3bcdb5966fb4ea692d
tree3dce2cdb24297e813f6d085c7988b0daa0e1030d
parent763a58d0f75fe43a466dfd09101903b658444e7d
Merge in develop changes
25 files changed:
classes/data/dataCities.php
classes/data/dataMemberInfo.php
classes/data/dataRegions.php
css/admin.css [changed mode: 0644->0755]
css/front.css
css/glma-foundation.min.css
index.php
js/leaflet-area-map.js
lib/smartyTemplateSupport.php
models/admin/member/memberInfo.php
models/front/members/list.php
models/front/members/newMemberForm.php [new file with mode: 0644]
readme.txt
setup/adminHooks.php [changed mode: 0644->0755]
setup/shortcodes.php
setup/validActions.php
views/admin/member/memberInfo/editMediaCamera.html
views/admin/member/memberInfo/editMediaVideo.html
views/admin/member/memberInfo/editProfileAddress.html
views/admin/member/memberInfo/editProfileDescription.html
views/front/members/cityWeather.html
views/front/members/interactivemap.html
views/front/members/list.html
views/front/members/newMemberForm.html [new file with mode: 0644]
views/front/members/thankyou.html [new file with mode: 0644]