Merge branch 'select' of github.com:Man2Life/edx-platform into select

common/djangoapps/student/views.py

@@ -714,7 +714,7 @@ def create_account(request, post_override=None):
             js['field'] = a
             return HttpResponse(json.dumps(js))
 
-    numeric_post_vars = ["education_year","work_managing_experience","work_teaching_experience", "work_qualification_category_year", "contact_phone"]
+    numeric_post_vars = ["education_year","work_managing_experience","work_teaching_experience"]
 
     for a in numeric_post_vars:
         if len(post_vars[a]) > 0 and not post_vars[a].isdigit():

lms/templates/university_profile/edge.html

 <%! from django.utils.translation import ugettext as _ %>
 <%inherit file="../stripped-main.html" />
+<%namespace name='static' file='../static_content.html'/>
 <%! from django.core.urlresolvers import reverse %>
 <%block name="title"><title>${_("edX edge")}</title></%block>
 <%block name="bodyclass">no-header edge-landing</%block>
@@ -36,7 +37,7 @@
 </%block>
 
 <%block name="js_extra">
-<script type="text/javascript" src="${static.url('js/jquery.masked.input.min.js')}"></script>
+<script type="text/javascript" src="${static.url('js/jquery.maskedinput.min.js')}"></script>
 <script type="text/javascript">
 
   (function() {