Merge branch 'dev' into feature/profile

apps/course/templates/course/_items.html

@@ -7,7 +7,11 @@
     {% if course.is_deferred_start %}data-future-course data-future-course-time={{ course.deferred_start_at.timestamp }}{% endif %}
 >
 <a class="courses__preview" href="{% url 'course' course.id %}?next={{ request.get_full_path }}">
+  {% if course.cover %}
   <img class="courses__pic" src="{{ course.cover.url }}"/>
+  {% else %}
+  <img class="courses__pic" src="{% static 'img/no_cover.png' %}"/>
+  {% endif %}
   <div class="courses__view">Подробнее</div>
   {% if course.is_featured %}
   <div class="courses__label courses__label_fav"></div>

project/templates/lilcity/index.html

@@ -33,7 +33,7 @@
   <meta property="fb:admins" content="Facebook numeric ID">
   <meta name="csrf-token" content="{{ csrf_token }}">
   <link rel="stylesheet" media="all" href={% static "css/app.css" %}>
-  <link rel="shortcut icon" type="image/png" href="{% static 'favicon.ico' %}"/>
+  <link rel="shortcut icon" type="image/png" href="{% static 'img/favicon.ico' %}"/>
   <script>
       var viewportmeta = document.querySelector('meta[name="viewport"]');
       if (viewportmeta) {

web/gulp/tasks/copy.js

@@ -22,7 +22,7 @@ gulp.task('copy:rootfiles', function() {
 gulp.task('copy:img', function() {
     return gulp
         .src([
-            config.src.img + '/**/*.{jpg,png,jpeg,svg,gif}',
+            config.src.img + '/**/*.{jpg,png,jpeg,svg,gif,ico}',
             '!' + config.src.img + '/svgo/**/*.*'
         ])
         .pipe(gulp.dest(config.dest.img));