Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Translation modules titles #173

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
Open

Translation modules titles #173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
9872eee
Translation modules titles
Jul 20, 2016
a327d22
Translation modules titles
Jul 20, 2016
aa694fc
add manufacturer phrase
Sep 15, 2016
b56e1c4
add phrases
Sep 15, 2016
569bedd
add flag toolbarDisabled
Sep 22, 2016
60619e1
add situations phrase
Sep 23, 2016
3e691a4
add comments phrase
Oct 10, 2016
e88c411
update yii version
mihailo-chehivsky Apr 14, 2017
e1a23b5
update yii version
mihailo-chehivsky Apr 14, 2017
d507a37
min yii version 2.0.12
mihailo-chehivsky Apr 20, 2017
7fa72de
update yii version to 2.0.12
mihailo-chehivsky Apr 20, 2017
0418e4e
removed composer.lock
mihailo-chehivsky Jul 20, 2017
da588ec
fixed fancybox
mihailo-chehivsky Jul 20, 2017
ce17e41
fixed bower dependencies
mihailo-chehivsky Jul 20, 2017
04f093a
fixed bower dependencies
mihailo-chehivsky Jul 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion AdminModule.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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']);
});
Expand Down
23 changes: 23 additions & 0 deletions bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"name": "market",
"authors": [
"Michael Chehivskiy <[email protected]>"
],
"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"
}
}
10 changes: 5 additions & 5 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,10 @@
],
"require": {
"php": ">=5.4.0",
"yiisoft/yii2": "*",
"yiisoft/yii2": "2.0.12",
"yiisoft/yii2-bootstrap": "*",
"yiisoft/yii2-swiftmailer": "*",
"creocoder/yii2-nested-sets": "0.9.*",
"bower-asset/fancybox": "*",
"bower-asset/jquery.switcher": "*",
"bower-asset/eonasdan-bootstrap-datetimepicker": "^4.7@dev",
"2amigos/yii2-selectize-widget": "~1.0"
},
"autoload": {
Expand All @@ -40,5 +37,8 @@
"npm-asset-library": "vendor/npm",
"bower-asset-library": "vendor/bower"
}
}
},
"post-install-cmd": [
"bower install"
]
}
Loading