Merge branch 'master' of gitlab.artweb.com.ua:root/test_1

Mihail
2 parents 816a590c 85b72093
Showing 6593 changed files with 153 additions and 2954 deletions Show diff stats
.bowerrc
.gitignore
.htaccess
LICENSE.md
README.md
backend/.gitignore
backend/assets/AppAsset.php
backend/assets/MyAsset.php
backend/assets/ParserAsset.php
backend/components/DatePicker.php
backend/components/ImageSizer.php
backend/components/base/BaseActiveRecord.php
backend/components/base/BaseController.php
backend/components/base/CustomDbConnection.php
backend/components/views/_gallery_item.php
backend/components/views/date_picker.php
backend/components/views/image_sizer.php
backend/config/.gitignore
backend/config/bootstrap.php
backend/config/main.php
@@ -40,6 +40,7 @@ class MyAsset extends AssetBundle
         'js/main.js',
         'js/angular.js',
         'js/angular_js.js',
+        'js/script.js',
  
     ];
     public $depends = [
@@ -14,6 +14,8 @@ use yii\filters\VerbFilter;
  */
 class NewsController extends Controller
 {
+
+    public $layout = "/column";
     public function behaviors()
     {
         return [