projects / WP-Plugins / glm-member-db-events.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: ecacbda) | patch
Cleaned up another merge conflict with dataTimes.php
authorChuck Scott <cscott@gaslightmedia.com>
Thu, 2 Nov 2017 16:06:00 +0000 (12:06 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Thu, 2 Nov 2017 16:06:00 +0000 (12:06 -0400)
commit8baeae086d45fde89266093b500064308f48af3d
treeb2386f120d1dc7f15357bf2f2e2dfa174b2815c5tree | snapshot
parentecacbda2d7a7237085984cae78b3e2ce439a99abcommit | diff
Cleaned up another merge conflict with dataTimes.php
Removed duplicate add_filter() calls in adminHooks.php and cleaned up conflicts in commonHooks.php
Added registrations filter to event edit page to show notices when editing and updating an event with registrations.
classes/data/dataTimes.php diff | blob | history
setup/adminHooks.php diff | blob | history
setup/commonHooks.php diff | blob | history
views/admin/events/edit.html diff | blob | history