cvs2.gaslightmedia.com Git - WP-Plugins/glm-member-db.git/commit

projects / WP-Plugins / glm-member-db.git / commit

author	Chuck Scott <cscott@gaslightmedia.com>
	Mon, 30 Nov 2015 21:14:20 +0000 (16:14 -0500)
committer	Chuck Scott <cscott@gaslightmedia.com>
	Mon, 30 Nov 2015 21:14:20 +0000 (16:14 -0500)
commit	99b57c374439b9101120e43d08a2bfaf67b73ee0
tree	83b35ff2361fd5c48c1721450b30c1adc966d4a4	tree \| snapshot
parent	22c7027ac8697b339198faca259570863b0508a6	commit \| diff
parent	e1e6c06fb4645b744e5c3e1b616c13fcb5bffb2a	commit \| diff

Merge branch 'develop' into feature/MemberLogin

Conflicts:
classes/data/dataMembers.php
glm-member-db.php

35 files changed:

activate.php	diff1 \|	diff2 \|	blob \| history
classes/data/dataAmenities.php	diff1 \|	diff2 \|	blob \| history
classes/data/dataImages.php	diff1 \|	diff2 \|	blob \| history
classes/data/dataMemberInfo.php	diff1 \|	diff2 \|	blob \| history
classes/data/dataMembers.php	diff1 \|	diff2 \|	blob \| history
classes/glmMemberImportFromConnections.php	diff1 \|	diff2 \|	blob \| history
config/plugin.ini	diff1 \|	diff2 \|	blob \| history
controllers/admin.php	diff1 \|	diff2 \|	blob \| history
controllers/front.php	diff1 \|	diff2 \|	blob \| history
css/admin.css	diff1 \|	diff2 \|	blob \| history
glm-member-db.php	diff1 \|	diff2 \|	blob \| history
js/imageUpload/imageUpload.js	diff1 \|	diff2 \|	blob \| history
lib/EasyPassword/EasyPassword.php	diff1 \|	diff2 \|	blob \| history
lib/GlmDataAbstract/DataAbstract.php	diff1 \|	diff2 \|	blob \| history
lib/GlmDataAbstract/documentation.odt	diff1 \|	diff2 \|	blob \| history
misc/databaseScripts/create_database_V1.0.43.sql	diff1 \|	\|	blob \| history
misc/databaseScripts/update_database_V1.0.43.sql	diff1 \|	\|	blob \| history
models/admin/management/addons.php	diff1 \|	\|	blob \| history
models/admin/management/import.php	diff1 \|	diff2 \|	blob \| history
models/admin/management/index.php	diff1 \|	diff2 \|	blob \| history
models/admin/member/index.php	diff1 \|	diff2 \|	blob \| history
models/admin/member/memberInfo.php	diff1 \|	diff2 \|	blob \| history
models/admin/members/list.php	diff1 \|	diff2 \|	blob \| history
models/front/members/detail.php	diff1 \|	diff2 \|	blob \| history
models/front/members/list.php	diff1 \|	diff2 \|	blob \| history
views/admin/dashboardWidget/index.html	diff1 \|	diff2 \|	blob \| history
views/admin/management/addons.html	diff1 \|	\|	blob \| history
views/admin/management/hooks.html	diff1 \|	\|	blob \| history
views/admin/management/index.html	diff1 \|	diff2 \|	blob \| history
views/admin/member/header.html	diff1 \|	diff2 \|	blob \| history
views/admin/member/index.html	diff1 \|	diff2 \|	blob \| history
views/admin/member/memberInfo.html	diff1 \|	diff2 \|	blob \| history
views/admin/members/header.html	diff1 \|	diff2 \|	blob \| history
views/admin/members/index.html	diff1 \|	diff2 \|	blob \| history
views/admin/members/list.html	diff1 \|	diff2 \|	blob \| history

RSS Atom

activate.php	diff1 \|	diff2 \|	blob \| history
classes/data/dataAmenities.php	diff1 \|	diff2 \|	blob \| history
classes/data/dataImages.php	diff1 \|	diff2 \|	blob \| history
classes/data/dataMemberInfo.php	diff1 \|	diff2 \|	blob \| history
classes/data/dataMembers.php	diff1 \|	diff2 \|	blob \| history
classes/glmMemberImportFromConnections.php	diff1 \|	diff2 \|	blob \| history
config/plugin.ini	diff1 \|	diff2 \|	blob \| history
controllers/admin.php	diff1 \|	diff2 \|	blob \| history
controllers/front.php	diff1 \|	diff2 \|	blob \| history
css/admin.css	diff1 \|	diff2 \|	blob \| history
glm-member-db.php	diff1 \|	diff2 \|	blob \| history
js/imageUpload/imageUpload.js	diff1 \|	diff2 \|	blob \| history
lib/EasyPassword/EasyPassword.php	diff1 \|	diff2 \|	blob \| history
lib/GlmDataAbstract/DataAbstract.php	diff1 \|	diff2 \|	blob \| history
lib/GlmDataAbstract/documentation.odt	diff1 \|	diff2 \|	blob \| history
misc/databaseScripts/create_database_V1.0.43.sql	diff1 \|	\|	blob \| history
misc/databaseScripts/update_database_V1.0.43.sql	diff1 \|	\|	blob \| history
models/admin/management/addons.php	diff1 \|	\|	blob \| history
models/admin/management/import.php	diff1 \|	diff2 \|	blob \| history
models/admin/management/index.php	diff1 \|	diff2 \|	blob \| history
models/admin/member/index.php	diff1 \|	diff2 \|	blob \| history
models/admin/member/memberInfo.php	diff1 \|	diff2 \|	blob \| history
models/admin/members/list.php	diff1 \|	diff2 \|	blob \| history
models/front/members/detail.php	diff1 \|	diff2 \|	blob \| history
models/front/members/list.php	diff1 \|	diff2 \|	blob \| history
views/admin/dashboardWidget/index.html	diff1 \|	diff2 \|	blob \| history
views/admin/management/addons.html	diff1 \|	\|	blob \| history
views/admin/management/hooks.html	diff1 \|	\|	blob \| history
views/admin/management/index.html	diff1 \|	diff2 \|	blob \| history
views/admin/member/header.html	diff1 \|	diff2 \|	blob \| history
views/admin/member/index.html	diff1 \|	diff2 \|	blob \| history
views/admin/member/memberInfo.html	diff1 \|	diff2 \|	blob \| history
views/admin/members/header.html	diff1 \|	diff2 \|	blob \| history
views/admin/members/index.html	diff1 \|	diff2 \|	blob \| history
views/admin/members/list.html	diff1 \|	diff2 \|	blob \| history