Merge branch 'feature/lil-583' into 'master'

lil-583

See merge request lilcity/backend!164

apps/user/migrations/0025_merge_20180927_2353.py

@@ -0,0 +1,14 @@
+# Generated by Django 2.0.6 on 2018-09-27 23:53
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('user', '0024_referral'),
+        ('user', '0024_user_slug'),
+    ]
+
+    operations = [
+    ]

project/templates/blocks/lil_store_js.html

@@ -22,11 +22,11 @@
     urls: {
       courses: "{% url 'courses' %}",
       userProfileEdit: "{% url 'user-edit-profile' %}",
-    }
+    },
     flags: {
       referrer: '{{ referrer.id|default:'' }}',
       referrerName: '{% if referrer %}{{ referrer.get_full_name }}{% endif %}',
       isReferralUrl: {{ is_referral_url|yesno:"true,false" }},
-    }
+    },
   };
 </script>

web/src/js/modules/common.js

@@ -11,7 +11,7 @@ window.baguetteBox = baguetteBox;
 
 $(document).ready(function () {
     const $popupAuth = $('.js-popup-auth');
-    let authPopupActiveTab = 'login'
+    let authPopupActiveTab = 'login';
     baguetteBox.run('.gallery');
     // Добавляем заголовок X-CSRFToken для всех AJAX запросов JQuery.
     $.ajaxSetup({