Merge branch 'master' of git.gmu.edu:srct/go

go/go/templates/layouts/base.html

@@ -16,6 +16,7 @@
     <meta name="description" content="University branded URL shortener.">
     <meta name="author" content="Mason SRCT">
     <meta name="robots" content="all">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
 
     <link href="http://fonts.googleapis.com/css?family=Carrois+Gothic" rel="stylesheet" type="text/css">
     <link href="//maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css" rel="stylesheet">

go/go/views.py

@@ -173,7 +173,7 @@ def signup(request):
 
             # Only send mail if we've defined the mailserver
             if settings.EMAIL_HOST and settings.EMAIL_PORT:
-                user_mail = request.user.registereduser.user + settings.EMAIL_DOMAIN
+                user_mail = request.user.username + settings.EMAIL_DOMAIN
                 # Email sent to notify Admins
                 to_admin = EmailMessage(
                     'Signup from %s' % (request.user.registereduser.user),
@@ -285,7 +285,7 @@ def useradmin(request):
                 toapprove.approved = True
                 toapprove.save()
                 if settings.EMAIL_HOST and settings.EMAIL_PORT:
-                    user_mail = toapprove.user + settings.EMAIL_DOMAIN
+                    user_mail = toapprove.user.username + settings.EMAIL_DOMAIN
                     send_mail(
                         'Your Account has been Approved!',
                         ######################