From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Tue, 12 Dec 2017 21:52:19 +0000 (-0500)
Subject: Merge branch 'develop' into feature/reorganize
X-Git-Tag: v1.0.0^2~223^2
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=69bf24ab76aa4f3bd64972e6cc5aa5a95a4ff13a;p=WP-Plugins%2Fglm-member-db-registrations.git

Merge branch 'develop' into feature/reorganize
---

69bf24ab76aa4f3bd64972e6cc5aa5a95a4ff13a
diff --cc views/front/registrations/registration.html
index 2257967,0beb2ba..52bfc32
--- a/views/front/registrations/registration.html
+++ b/views/front/registrations/registration.html
@@@ -301,7 -245,6 +301,9 @@@ var app = 
      Models: { Front: {}, Admin: {} },
      Collections: { Front: {}, Admin: {} },
      Views: { Front: {}, Admin: {} },
++
 +    //Times: {$regTimesJSON},
++
      isValidEmail: function( email ){
          var regex = {literal}/^([a-zA-Z0-9_.+-])+\@(([a-zA-Z0-9-])+\.)+([a-zA-Z0-9]{2,4})+$/;{/literal}
          return regex.test(email);