From 9872eee323edf9b6f2bf2951169b466c6d5e47dd Mon Sep 17 00:00:00 2001 From: Mich Date: Wed, 20 Jul 2016 15:10:21 +0300 Subject: [PATCH 01/15] Translation modules titles --- messages/ru/admin.php | 14 +++++++++++++- views/layouts/main.php | 2 +- views/modules/index.php | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/messages/ru/admin.php b/messages/ru/admin.php index 5aeebb0..583037d 100644 --- a/messages/ru/admin.php +++ b/messages/ru/admin.php @@ -124,5 +124,17 @@ 'Clear image' => 'Очистить изображение', 'Image cleared' => 'Изображение очищено', - + 'Orders' => 'Заказы', + 'Catalog' => 'Каталог', + 'Photo Gallery' => 'Фото-галерея', + 'Guestbook' => 'Гостевая книга', + 'News' => 'Новости', + 'Articles' => 'Статьи', + 'Feedback' => 'Обратная связь', + 'Pages' => 'Страницы', + 'FAQ' => 'Вопросы-Ответы', + 'Carousel' => 'Карусель', + 'Files' => 'Файлы', + 'Text blocks' => 'Текстовые блоки', + 'E-mail subscribe' => 'Емейл подписка', ]; \ No newline at end of file diff --git a/views/layouts/main.php b/views/layouts/main.php index f04d52a..be2ab73 100644 --- a/views/layouts/main.php +++ b/views/layouts/main.php @@ -39,7 +39,7 @@ icon != '') : ?> - title ?> + title) ?> notice > 0) : ?> notice ?> diff --git a/views/modules/index.php b/views/modules/index.php index fa71486..c4160bb 100644 --- a/views/modules/index.php +++ b/views/modules/index.php @@ -25,7 +25,7 @@ primaryKey ?> name ?> - title ?> + title) ?> icon) : ?> icon ?> From a327d22f5b6039cdffd0da0e2048ee1bc3ca0305 Mon Sep 17 00:00:00 2001 From: Mich Date: Wed, 20 Jul 2016 15:13:48 +0300 Subject: [PATCH 02/15] Translation modules titles --- messages/ru/admin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/messages/ru/admin.php b/messages/ru/admin.php index 583037d..adfb2c6 100644 --- a/messages/ru/admin.php +++ b/messages/ru/admin.php @@ -136,5 +136,5 @@ 'Carousel' => 'Карусель', 'Files' => 'Файлы', 'Text blocks' => 'Текстовые блоки', - 'E-mail subscribe' => 'Емейл подписка', + 'E-mail subscribe' => 'Емейл-подписка', ]; \ No newline at end of file From aa694fc9d6283ca86c5293e41773eb8f98d206ec Mon Sep 17 00:00:00 2001 From: Mich Date: Thu, 15 Sep 2016 17:34:04 +0300 Subject: [PATCH 03/15] add manufacturer phrase --- messages/ru/admin.php | 1 + 1 file changed, 1 insertion(+) diff --git a/messages/ru/admin.php b/messages/ru/admin.php index adfb2c6..993335e 100644 --- a/messages/ru/admin.php +++ b/messages/ru/admin.php @@ -126,6 +126,7 @@ 'Orders' => 'Заказы', 'Catalog' => 'Каталог', + 'Manufacturers' => 'Производители', 'Photo Gallery' => 'Фото-галерея', 'Guestbook' => 'Гостевая книга', 'News' => 'Новости', From b56e1c43a1137c4bbadfe03c259ebd6da683340e Mon Sep 17 00:00:00 2001 From: Mich Date: Fri, 16 Sep 2016 00:12:22 +0300 Subject: [PATCH 04/15] add phrases --- messages/ru/admin.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/messages/ru/admin.php b/messages/ru/admin.php index 993335e..aad80e3 100644 --- a/messages/ru/admin.php +++ b/messages/ru/admin.php @@ -127,6 +127,8 @@ 'Orders' => 'Заказы', 'Catalog' => 'Каталог', 'Manufacturers' => 'Производители', + 'Currencies' => 'Валюты', + 'Import' => 'Импорт', 'Photo Gallery' => 'Фото-галерея', 'Guestbook' => 'Гостевая книга', 'News' => 'Новости', From 569bedde9acd1524ae7900cca5f51507603eb277 Mon Sep 17 00:00:00 2001 From: Mich Date: Thu, 22 Sep 2016 23:02:57 +0300 Subject: [PATCH 05/15] add flag toolbarDisabled --- AdminModule.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/AdminModule.php b/AdminModule.php index 349fa47..92c702b 100644 --- a/AdminModule.php +++ b/AdminModule.php @@ -50,7 +50,8 @@ public function bootstrap($app) { Yii::setAlias('easyii', '@vendor/noumo/easyii'); - if (!$app->user->isGuest && strpos($app->request->pathInfo, 'admin') === false) { + $toolbarDisabled = isset(Yii::$app->params['toolbarDisabled']) ? Yii::$app->params['toolbarDisabled'] : false; + if (!$toolbarDisabled && !$app->user->isGuest && strpos($app->request->pathInfo, 'admin') === false) { $app->on(Application::EVENT_BEFORE_REQUEST, function () use ($app) { $app->getView()->on(View::EVENT_BEGIN_BODY, [$this, 'renderToolbar']); }); From 60619e187b58cdf1c1e9ddf57a1555ed7403d9aa Mon Sep 17 00:00:00 2001 From: Mich Date: Sat, 24 Sep 2016 02:44:31 +0300 Subject: [PATCH 06/15] add situations phrase --- messages/ru/admin.php | 1 + 1 file changed, 1 insertion(+) diff --git a/messages/ru/admin.php b/messages/ru/admin.php index aad80e3..4a4567e 100644 --- a/messages/ru/admin.php +++ b/messages/ru/admin.php @@ -140,4 +140,5 @@ 'Files' => 'Файлы', 'Text blocks' => 'Текстовые блоки', 'E-mail subscribe' => 'Емейл-подписка', + 'Situations' => 'Ситуации', ]; \ No newline at end of file From 3e691a4eb4ffe0f59ee474d66ff5180d382f8425 Mon Sep 17 00:00:00 2001 From: Mich Date: Mon, 10 Oct 2016 14:53:25 +0300 Subject: [PATCH 07/15] add comments phrase --- messages/ru/admin.php | 1 + 1 file changed, 1 insertion(+) diff --git a/messages/ru/admin.php b/messages/ru/admin.php index 4a4567e..7b8f579 100644 --- a/messages/ru/admin.php +++ b/messages/ru/admin.php @@ -141,4 +141,5 @@ 'Text blocks' => 'Текстовые блоки', 'E-mail subscribe' => 'Емейл-подписка', 'Situations' => 'Ситуации', + 'Comments' => 'Комментарии', ]; \ No newline at end of file From e88c411851ebd5d5eda060f0d7c72eddf402bf95 Mon Sep 17 00:00:00 2001 From: Mihailo Chehivsky Date: Fri, 14 Apr 2017 23:15:00 +0300 Subject: [PATCH 08/15] update yii version --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index af37ae9..51d67b5 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ ], "require": { "php": ">=5.4.0", - "yiisoft/yii2": "*", + "yiisoft/yii2": "~2.0.6", "yiisoft/yii2-bootstrap": "*", "yiisoft/yii2-swiftmailer": "*", "creocoder/yii2-nested-sets": "0.9.*", From e1a23b584db8c81ce4a9b7673cfa1e347ca3e769 Mon Sep 17 00:00:00 2001 From: Mihailo Chehivsky Date: Fri, 14 Apr 2017 23:19:51 +0300 Subject: [PATCH 09/15] update yii version --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 51d67b5..09cb063 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ ], "require": { "php": ">=5.4.0", - "yiisoft/yii2": "~2.0.6", + "yiisoft/yii2": "2.0.11", "yiisoft/yii2-bootstrap": "*", "yiisoft/yii2-swiftmailer": "*", "creocoder/yii2-nested-sets": "0.9.*", From d507a378b808476ea2622cf346954c5817226103 Mon Sep 17 00:00:00 2001 From: Mihailo Chehivsky Date: Thu, 20 Apr 2017 19:15:22 +0300 Subject: [PATCH 10/15] min yii version 2.0.12 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 09cb063..d3643e9 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ ], "require": { "php": ">=5.4.0", - "yiisoft/yii2": "2.0.11", + "yiisoft/yii2": "^2.0.12", "yiisoft/yii2-bootstrap": "*", "yiisoft/yii2-swiftmailer": "*", "creocoder/yii2-nested-sets": "0.9.*", From 7fa72dec53530dac46b74f95ad290d7df0de5691 Mon Sep 17 00:00:00 2001 From: Mihailo Chehivsky Date: Thu, 20 Apr 2017 19:26:09 +0300 Subject: [PATCH 11/15] update yii version to 2.0.12 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index d3643e9..3ff8846 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ ], "require": { "php": ">=5.4.0", - "yiisoft/yii2": "^2.0.12", + "yiisoft/yii2": "2.0.12", "yiisoft/yii2-bootstrap": "*", "yiisoft/yii2-swiftmailer": "*", "creocoder/yii2-nested-sets": "0.9.*", From 0418e4e65b2640ccf804f6ab7006f4ad58e55480 Mon Sep 17 00:00:00 2001 From: Mihailo Chehivsky Date: Thu, 20 Jul 2017 12:43:14 +0300 Subject: [PATCH 12/15] removed composer.lock --- composer.lock | 879 -------------------------------------------------- 1 file changed, 879 deletions(-) delete mode 100644 composer.lock diff --git a/composer.lock b/composer.lock deleted file mode 100644 index 9425490..0000000 --- a/composer.lock +++ /dev/null @@ -1,879 +0,0 @@ -{ - "_readme": [ - "This file locks the dependencies of your project to a known state", - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", - "This file is @generated automatically" - ], - "hash": "890cdd77d5d76aa3ed25cbf85ee41765", - "packages": [ - { - "name": "bower-asset/bootstrap", - "version": "v3.3.4", - "source": { - "type": "git", - "url": "https://github.com/twbs/bootstrap.git", - "reference": "a10eb60bc0b07b747fa0c4ebd8821eb7307bd07f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/twbs/bootstrap/zipball/a10eb60bc0b07b747fa0c4ebd8821eb7307bd07f", - "reference": "a10eb60bc0b07b747fa0c4ebd8821eb7307bd07f", - "shasum": "" - }, - "require": { - "bower-asset/jquery": ">=1.9.1" - }, - "type": "bower-asset-library", - "extra": { - "bower-asset-main": [ - "less/bootstrap.less", - "dist/css/bootstrap.css", - "dist/js/bootstrap.js", - "dist/fonts/glyphicons-halflings-regular.eot", - "dist/fonts/glyphicons-halflings-regular.svg", - "dist/fonts/glyphicons-halflings-regular.ttf", - "dist/fonts/glyphicons-halflings-regular.woff", - "dist/fonts/glyphicons-halflings-regular.woff2" - ], - "bower-asset-ignore": [ - "/.*", - "_config.yml", - "CNAME", - "composer.json", - "CONTRIBUTING.md", - "docs", - "js/tests", - "test-infra" - ] - }, - "description": "The most popular front-end framework for developing responsive, mobile first projects on the web.", - "keywords": [ - "css", - "framework", - "front-end", - "js", - "less", - "mobile-first", - "responsive", - "web" - ] - }, - { - "name": "bower-asset/eonasdan-bootstrap-datetimepicker", - "version": "4.7.14", - "source": { - "type": "git", - "url": "https://github.com/Eonasdan/bootstrap-datetimepicker.git", - "reference": "d004434a5ff76e7b97c8b07c01f34ca69e635d97" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Eonasdan/bootstrap-datetimepicker/zipball/d004434a5ff76e7b97c8b07c01f34ca69e635d97", - "reference": "d004434a5ff76e7b97c8b07c01f34ca69e635d97", - "shasum": "" - }, - "require": { - "bower-asset/jquery": ">=1.8.3", - "bower-asset/moment": ">=2.8.0" - }, - "type": "bower-asset-library", - "extra": { - "bower-asset-main": [ - "build/css/bootstrap-datetimepicker.min.css", - "build/js/bootstrap-datetimepicker.min.js", - "src/less/_bootstrap-datetimepicker.less", - "src/less/bootstrap-datetimepicker-build.less", - "src/js/bootstrap-datetimepicker.js" - ], - "bower-asset-ignore": [ - "**/.*", - "node_modules", - "bower_components", - "test", - "tests" - ], - "bower-asset-private": false - }, - "license": [ - "MIT" - ], - "description": "bootstrap3 datetimepicker", - "keywords": [ - "bootstrap", - "datepicker", - "datetimepicker", - "moment", - "timepicker", - "twitter-bootstrap" - ] - }, - { - "name": "bower-asset/fancybox", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/fancyapps/fancyBox.git", - "reference": "ec9c465470b7856fcbb107a49fa4c25968702b99" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/fancyapps/fancyBox/zipball/ec9c465470b7856fcbb107a49fa4c25968702b99", - "reference": "ec9c465470b7856fcbb107a49fa4c25968702b99", - "shasum": "" - }, - "require": { - "bower-asset/jquery": ">=1.10", - "bower-asset/jquery-mousewheel": "~3.1.3" - }, - "type": "bower-asset-library", - "extra": { - "bower-asset-main": [ - "source/jquery.fancybox.css", - "source/jquery.fancybox.js", - "source/blank.gif", - "source/fancybox_loading.gif", - "source/fancybox_loading@2x.gif", - "source/fancybox_overlay.png", - "source/fancybox_sprite.png", - "source/fancybox_sprite@2x.png", - "source/jquery.fancybox.pack.js" - ], - "bower-asset-ignore": [ - "**/.*", - "fancybox.jquery.json", - "demo" - ], - "branch-alias": { - "dev-master": "2.1.5-dev" - } - }, - "time": "2014-11-21 08:00:26" - }, - { - "name": "bower-asset/jquery", - "version": "2.1.4", - "source": { - "type": "git", - "url": "https://github.com/jquery/jquery.git", - "reference": "7751e69b615c6eca6f783a81e292a55725af6b85" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/jquery/jquery/zipball/7751e69b615c6eca6f783a81e292a55725af6b85", - "reference": "7751e69b615c6eca6f783a81e292a55725af6b85", - "shasum": "" - }, - "require-dev": { - "bower-asset/qunit": "1.14.0", - "bower-asset/requirejs": "2.1.10", - "bower-asset/sinon": "1.8.1", - "bower-asset/sizzle": "2.1.1-patch2" - }, - "type": "bower-asset-library", - "extra": { - "bower-asset-main": "dist/jquery.js", - "bower-asset-ignore": [ - "**/.*", - "build", - "dist/cdn", - "speed", - "test", - "*.md", - "AUTHORS.txt", - "Gruntfile.js", - "package.json" - ] - }, - "license": [ - "MIT" - ], - "keywords": [ - "javascript", - "jquery", - "library" - ] - }, - { - "name": "bower-asset/jquery-mousewheel", - "version": "3.1.x-dev", - "source": { - "type": "git", - "url": "https://github.com/jquery/jquery-mousewheel.git", - "reference": "c559933f485ae34fed561b042e87abd245858c24" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/jquery/jquery-mousewheel/zipball/c559933f485ae34fed561b042e87abd245858c24", - "reference": "c559933f485ae34fed561b042e87abd245858c24", - "shasum": "" - }, - "require": { - "bower-asset/jquery": ">=1.2.2" - }, - "type": "bower-asset-library", - "extra": { - "bower-asset-main": "./jquery.mousewheel.js", - "bower-asset-ignore": [ - "*.json", - "*.markdown", - "*.txt", - ".*", - "!LICENSE.txt", - "Gruntfile.js", - "test" - ] - }, - "time": "2014-09-06 14:29:29" - }, - { - "name": "bower-asset/jquery.inputmask", - "version": "3.1.63", - "source": { - "type": "git", - "url": "https://github.com/RobinHerbots/jquery.inputmask.git", - "reference": "c40c7287eadc31e341ebbf0c02352eb55b9cbc48" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/RobinHerbots/jquery.inputmask/zipball/c40c7287eadc31e341ebbf0c02352eb55b9cbc48", - "reference": "c40c7287eadc31e341ebbf0c02352eb55b9cbc48", - "shasum": "" - }, - "require": { - "bower-asset/jquery": ">=1.7" - }, - "type": "bower-asset-library", - "extra": { - "bower-asset-main": [ - "./dist/inputmask/jquery.inputmask.js", - "./dist/inputmask/jquery.inputmask.extensions.js", - "./dist/inputmask/jquery.inputmask.date.extensions.js", - "./dist/inputmask/jquery.inputmask.numeric.extensions.js", - "./dist/inputmask/jquery.inputmask.phone.extensions.js", - "./dist/inputmask/jquery.inputmask.regex.extensions.js" - ], - "bower-asset-ignore": [ - "**/.*", - "qunit/", - "nuget/", - "tools/", - "js/", - "*.md", - "build.properties", - "build.xml", - "jquery.inputmask.jquery.json" - ] - }, - "license": [ - "http://opensource.org/licenses/mit-license.php" - ], - "description": "jquery.inputmask is a jquery plugin which create an input mask.", - "keywords": [ - "form", - "input", - "inputmask", - "jquery", - "mask", - "plugins" - ] - }, - { - "name": "bower-asset/jquery.switcher", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/djanix/jquery.switcher.git", - "reference": "dceb41468a99a404afebc4601ffed50c8fe70297" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/djanix/jquery.switcher/zipball/dceb41468a99a404afebc4601ffed50c8fe70297", - "reference": "dceb41468a99a404afebc4601ffed50c8fe70297", - "shasum": "" - }, - "require": { - "bower-asset/jquery": ">=1.6" - }, - "require-dev": { - "bower-asset/grunt": ">=0.4.5,<0.5.0", - "bower-asset/grunt-autoprefixer": ">=0.7.3,<0.8.0", - "bower-asset/grunt-contrib-copy": "~0.5.0", - "bower-asset/grunt-contrib-jshint": ">=0.10.0,<0.11.0", - "bower-asset/grunt-contrib-sass": "~0.7.3", - "bower-asset/grunt-contrib-uglify": ">=0.5.0,<0.6.0", - "bower-asset/grunt-contrib-watch": ">=0.6.1,<0.7.0", - "bower-asset/matchdep": ">=0.3.0,<0.4.0" - }, - "type": "bower-asset-library", - "extra": { - "bower-asset-main": "dist/switcher.js", - "bower-asset-ignore": [ - "*.md", - "node_modules", - ".sass-cache" - ], - "branch-alias": { - "dev-master": "1.2.4-dev" - } - }, - "license": [ - "no" - ], - "description": "Custom checkbox in jquery", - "keywords": [ - "checkbox", - "custom", - "input", - "switch", - "switcher" - ], - "time": "2014-11-04 05:50:52" - }, - { - "name": "bower-asset/moment", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/moment/moment.git", - "reference": "25cc720fbaab7323a1016cd0beb6a36e349c41be" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/moment/moment/zipball/25cc720fbaab7323a1016cd0beb6a36e349c41be", - "reference": "25cc720fbaab7323a1016cd0beb6a36e349c41be", - "shasum": "" - }, - "type": "bower-asset-library", - "extra": { - "bower-asset-main": "moment.js", - "bower-asset-ignore": [ - "**/.*", - "benchmarks", - "bower_components", - "meteor", - "node_modules", - "scripts", - "tasks", - "test", - "component.json", - "composer.json", - "CONTRIBUTING.md", - "ender.js", - "Gruntfile.js", - "Moment.js.nuspec", - "package.js", - "package.json" - ] - }, - "time": "2015-05-13 07:42:12" - }, - { - "name": "bower-asset/punycode", - "version": "v1.3.2", - "source": { - "type": "git", - "url": "https://github.com/bestiejs/punycode.js.git", - "reference": "38c8d3131a82567bfef18da09f7f4db68c84f8a3" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/bestiejs/punycode.js/zipball/38c8d3131a82567bfef18da09f7f4db68c84f8a3", - "reference": "38c8d3131a82567bfef18da09f7f4db68c84f8a3", - "shasum": "" - }, - "type": "bower-asset-library", - "extra": { - "bower-asset-main": "punycode.js", - "bower-asset-ignore": [ - "coverage", - "tests", - ".*", - "component.json", - "Gruntfile.js", - "node_modules", - "package.json" - ] - } - }, - { - "name": "bower-asset/yii2-pjax", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/yiisoft/jquery-pjax.git", - "reference": "3f20897307cca046fca5323b318475ae9dac0ca0" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/yiisoft/jquery-pjax/zipball/3f20897307cca046fca5323b318475ae9dac0ca0", - "reference": "3f20897307cca046fca5323b318475ae9dac0ca0", - "shasum": "" - }, - "require": { - "bower-asset/jquery": ">=1.8" - }, - "type": "bower-asset-library", - "extra": { - "bower-asset-main": "./jquery.pjax.js", - "bower-asset-ignore": [ - ".travis.yml", - "Gemfile", - "Gemfile.lock", - "vendor/", - "script/", - "test/" - ], - "branch-alias": { - "dev-master": "2.0.3-dev" - } - }, - "license": [ - "MIT" - ], - "time": "2015-03-08 21:03:11" - }, - { - "name": "cebe/markdown", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/cebe/markdown.git", - "reference": "e14d3da8f84eefa3792fd22b5b5ecba9c98d2e18" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/cebe/markdown/zipball/e14d3da8f84eefa3792fd22b5b5ecba9c98d2e18", - "reference": "e14d3da8f84eefa3792fd22b5b5ecba9c98d2e18", - "shasum": "" - }, - "require": { - "lib-pcre": "*", - "php": ">=5.4.0" - }, - "require-dev": { - "cebe/indent": "*", - "facebook/xhprof": "*@dev", - "phpunit/phpunit": "4.1.*" - }, - "bin": [ - "bin/markdown" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.1.x-dev" - } - }, - "autoload": { - "psr-4": { - "cebe\\markdown\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Carsten Brandt", - "email": "mail@cebe.cc", - "homepage": "http://cebe.cc/", - "role": "Creator" - } - ], - "description": "A super fast, highly extensible markdown parser for PHP", - "homepage": "https://github.com/cebe/markdown#readme", - "keywords": [ - "extensible", - "fast", - "gfm", - "markdown", - "markdown-extra" - ], - "time": "2015-03-20 11:07:08" - }, - { - "name": "creocoder/yii2-nested-sets", - "version": "0.9.0", - "source": { - "type": "git", - "url": "https://github.com/creocoder/yii2-nested-sets.git", - "reference": "cb8635a459b6246e5a144f096b992dcc30cf9954" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/creocoder/yii2-nested-sets/zipball/cb8635a459b6246e5a144f096b992dcc30cf9954", - "reference": "cb8635a459b6246e5a144f096b992dcc30cf9954", - "shasum": "" - }, - "require": { - "yiisoft/yii2": "*" - }, - "type": "yii2-extension", - "autoload": { - "psr-4": { - "creocoder\\nestedsets\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Alexander Kochetov", - "email": "creocoder@gmail.com" - } - ], - "description": "The nested sets behavior for the Yii framework", - "keywords": [ - "nested sets", - "yii2" - ], - "time": "2015-01-27 10:53:51" - }, - { - "name": "ezyang/htmlpurifier", - "version": "v4.6.0", - "source": { - "type": "git", - "url": "https://github.com/ezyang/htmlpurifier.git", - "reference": "6f389f0f25b90d0b495308efcfa073981177f0fd" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/6f389f0f25b90d0b495308efcfa073981177f0fd", - "reference": "6f389f0f25b90d0b495308efcfa073981177f0fd", - "shasum": "" - }, - "require": { - "php": ">=5.2" - }, - "type": "library", - "autoload": { - "psr-0": { - "HTMLPurifier": "library/" - }, - "files": [ - "library/HTMLPurifier.composer.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "LGPL" - ], - "authors": [ - { - "name": "Edward Z. Yang", - "email": "admin@htmlpurifier.org", - "homepage": "http://ezyang.com" - } - ], - "description": "Standards compliant HTML filter written in PHP", - "homepage": "http://htmlpurifier.org/", - "keywords": [ - "html" - ], - "time": "2013-11-30 08:25:19" - }, - { - "name": "swiftmailer/swiftmailer", - "version": "5.x-dev", - "source": { - "type": "git", - "url": "https://github.com/swiftmailer/swiftmailer.git", - "reference": "ac8b475454c120bfb31f5bef475233dd4fb6b626" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/ac8b475454c120bfb31f5bef475233dd4fb6b626", - "reference": "ac8b475454c120bfb31f5bef475233dd4fb6b626", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "require-dev": { - "mockery/mockery": "~0.9.1,<0.9.4" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "5.4-dev" - } - }, - "autoload": { - "files": [ - "lib/swift_required.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Chris Corbyn" - }, - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - } - ], - "description": "Swiftmailer, free feature-rich PHP mailer", - "homepage": "http://swiftmailer.org", - "keywords": [ - "mail", - "mailer" - ], - "time": "2015-05-06 16:40:00" - }, - { - "name": "yiisoft/yii2", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/yiisoft/yii2-framework.git", - "reference": "9a685bbf8eedd5007b4dd4d2e8cf9d33f92b3d8e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/yiisoft/yii2-framework/zipball/9a685bbf8eedd5007b4dd4d2e8cf9d33f92b3d8e", - "reference": "9a685bbf8eedd5007b4dd4d2e8cf9d33f92b3d8e", - "shasum": "" - }, - "require": { - "bower-asset/jquery": "2.1.*@stable | 1.11.*@stable", - "bower-asset/jquery.inputmask": "3.1.*", - "bower-asset/punycode": "1.3.*", - "bower-asset/yii2-pjax": ">=2.0.1", - "cebe/markdown": "~1.0.0 | ~1.1.0", - "ext-mbstring": "*", - "ezyang/htmlpurifier": "4.6.*", - "lib-pcre": "*", - "php": ">=5.4.0", - "yiisoft/yii2-composer": "*" - }, - "bin": [ - "yii" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "yii\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Qiang Xue", - "email": "qiang.xue@gmail.com", - "homepage": "http://www.yiiframework.com/", - "role": "Founder and project lead" - }, - { - "name": "Alexander Makarov", - "email": "sam@rmcreative.ru", - "homepage": "http://rmcreative.ru/", - "role": "Core framework development" - }, - { - "name": "Maurizio Domba", - "homepage": "http://mdomba.info/", - "role": "Core framework development" - }, - { - "name": "Carsten Brandt", - "email": "mail@cebe.cc", - "homepage": "http://cebe.cc/", - "role": "Core framework development" - }, - { - "name": "Timur Ruziev", - "email": "resurtm@gmail.com", - "homepage": "http://resurtm.com/", - "role": "Core framework development" - }, - { - "name": "Paul Klimov", - "email": "klimov.paul@gmail.com", - "role": "Core framework development" - } - ], - "description": "Yii PHP Framework Version 2", - "homepage": "http://www.yiiframework.com/", - "keywords": [ - "framework", - "yii2" - ], - "time": "2015-05-21 20:42:34" - }, - { - "name": "yiisoft/yii2-bootstrap", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/yiisoft/yii2-bootstrap.git", - "reference": "96203b935936e85fc6368a8ca528ce43c824c4df" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/yiisoft/yii2-bootstrap/zipball/96203b935936e85fc6368a8ca528ce43c824c4df", - "reference": "96203b935936e85fc6368a8ca528ce43c824c4df", - "shasum": "" - }, - "require": { - "bower-asset/bootstrap": "3.3.* | 3.2.* | 3.1.*", - "yiisoft/yii2": ">=2.0.4" - }, - "type": "yii2-extension", - "extra": { - "branch-alias": { - "dev-master": "2.0.x-dev" - }, - "asset-installer-paths": { - "npm-asset-library": "vendor/npm", - "bower-asset-library": "vendor/bower" - } - }, - "autoload": { - "psr-4": { - "yii\\bootstrap\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Qiang Xue", - "email": "qiang.xue@gmail.com" - } - ], - "description": "The Twitter Bootstrap extension for the Yii framework", - "keywords": [ - "bootstrap", - "yii2" - ], - "time": "2015-05-20 10:18:35" - }, - { - "name": "yiisoft/yii2-composer", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/yiisoft/yii2-composer.git", - "reference": "c7f59a6db76ae12aef4ddd244b0d02ab76b8a0b8" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/yiisoft/yii2-composer/zipball/c7f59a6db76ae12aef4ddd244b0d02ab76b8a0b8", - "reference": "c7f59a6db76ae12aef4ddd244b0d02ab76b8a0b8", - "shasum": "" - }, - "require": { - "composer-plugin-api": "1.0.0" - }, - "type": "composer-plugin", - "extra": { - "class": "yii\\composer\\Plugin", - "branch-alias": { - "dev-master": "2.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "yii\\composer\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Qiang Xue", - "email": "qiang.xue@gmail.com" - } - ], - "description": "The composer plugin for Yii extension installer", - "keywords": [ - "composer", - "extension installer", - "yii2" - ], - "time": "2015-04-29 09:00:02" - }, - { - "name": "yiisoft/yii2-swiftmailer", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/yiisoft/yii2-swiftmailer.git", - "reference": "a6bef7f792543832701e73889b4b7b7704302967" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/yiisoft/yii2-swiftmailer/zipball/a6bef7f792543832701e73889b4b7b7704302967", - "reference": "a6bef7f792543832701e73889b4b7b7704302967", - "shasum": "" - }, - "require": { - "swiftmailer/swiftmailer": "~5.0", - "yiisoft/yii2": ">=2.0.4" - }, - "type": "yii2-extension", - "extra": { - "branch-alias": { - "dev-master": "2.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "yii\\swiftmailer\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Paul Klimov", - "email": "klimov.paul@gmail.com" - } - ], - "description": "The SwiftMailer integration for the Yii framework", - "keywords": [ - "email", - "mail", - "mailer", - "swift", - "swiftmailer", - "yii2" - ], - "time": "2015-05-10 22:31:28" - } - ], - "packages-dev": [], - "aliases": [], - "minimum-stability": "dev", - "stability-flags": { - "bower-asset/eonasdan-bootstrap-datetimepicker": 20 - }, - "prefer-stable": false, - "prefer-lowest": false, - "platform": { - "php": ">=5.4.0" - }, - "platform-dev": [] -} From da588ec39572572a0f073130898f6d6e8540c050 Mon Sep 17 00:00:00 2001 From: Mihailo Chehivsky Date: Thu, 20 Jul 2017 12:49:04 +0300 Subject: [PATCH 13/15] fixed fancybox --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 3ff8846..d46c618 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ "yiisoft/yii2-bootstrap": "*", "yiisoft/yii2-swiftmailer": "*", "creocoder/yii2-nested-sets": "0.9.*", - "bower-asset/fancybox": "*", + "fancyapps/fancybox": "*", "bower-asset/jquery.switcher": "*", "bower-asset/eonasdan-bootstrap-datetimepicker": "^4.7@dev", "2amigos/yii2-selectize-widget": "~1.0" From ce17e412712578807aa202dc5f6ecf8f181d9b17 Mon Sep 17 00:00:00 2001 From: Mihailo Chehivsky Date: Thu, 20 Jul 2017 13:00:11 +0300 Subject: [PATCH 14/15] fixed bower dependencies --- bower.json | 23 +++++++++++++++++++++++ composer.json | 9 +++++---- 2 files changed, 28 insertions(+), 4 deletions(-) create mode 100644 bower.json diff --git a/bower.json b/bower.json new file mode 100644 index 0000000..02d37d1 --- /dev/null +++ b/bower.json @@ -0,0 +1,23 @@ +{ + "name": "market", + "authors": [ + "Michael Chehivskiy " + ], + "description": "", + "main": "", + "license": "MIT", + "homepage": "", + "ignore": [ + "**/.*", + "node_modules", + "bower_components", + "vendor/bower", + "test", + "tests" + ], + "dependencies": { + "fancybox": "2.1.5", + "jquery.switcher": "*", + "eonasdan-bootstrap-datetimepicker": "^4.7@dev" + } +} diff --git a/composer.json b/composer.json index d46c618..2a556e0 100644 --- a/composer.json +++ b/composer.json @@ -21,13 +21,11 @@ ], "require": { "php": ">=5.4.0", + "bower": ">=1.0.0", "yiisoft/yii2": "2.0.12", "yiisoft/yii2-bootstrap": "*", "yiisoft/yii2-swiftmailer": "*", "creocoder/yii2-nested-sets": "0.9.*", - "fancyapps/fancybox": "*", - "bower-asset/jquery.switcher": "*", - "bower-asset/eonasdan-bootstrap-datetimepicker": "^4.7@dev", "2amigos/yii2-selectize-widget": "~1.0" }, "autoload": { @@ -40,5 +38,8 @@ "npm-asset-library": "vendor/npm", "bower-asset-library": "vendor/bower" } - } + }, + "post-install-cmd": [ + "bower install" + ] } From 04f093a91505d5a8120d15fe0a3b6757c2374923 Mon Sep 17 00:00:00 2001 From: Mihailo Chehivsky Date: Thu, 20 Jul 2017 13:02:11 +0300 Subject: [PATCH 15/15] fixed bower dependencies --- composer.json | 1 - 1 file changed, 1 deletion(-) diff --git a/composer.json b/composer.json index 2a556e0..b534cff 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,6 @@ ], "require": { "php": ">=5.4.0", - "bower": ">=1.0.0", "yiisoft/yii2": "2.0.12", "yiisoft/yii2-bootstrap": "*", "yiisoft/yii2-swiftmailer": "*",