Skip to content

Commit

Permalink
Merge pull request #1 from lambda-platform/dev
Browse files Browse the repository at this point in the history
composer.json, package.json & config/lambda.php files updated.
  • Loading branch information
Ariunbold13 authored Mar 20, 2021
2 parents 30c6242 + 79d5a8b commit c52c546
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 9 deletions.
15 changes: 8 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,22 @@
],
"license": "MIT",
"require": {
"php": "^7.3|^8.0",
"fideloper/proxy": "^4.4",
"fruitcake/laravel-cors": "^2.0",
"guzzlehttp/guzzle": "^7.0.1",
"laravel/framework": "^8.12",
"laravel/tinker": "^2.5",
"tymon/jwt-auth": "^1.0",
"lambda-platform/dataform": "^0.0.6",
"intervention/image": "^2.5.1",
"lambda-platform/agent": "^0.0.2",
"lambda-platform/dataform": "^0.0.7",
"lambda-platform/datagrid": "^0.0.2",
"lambda-platform/datasource": "^0.0.2",
"lambda-platform/krud": "^0.0.2",
"lambda-platform/moqup": "^0.0.2",
"lambda-platform/puzzle": "^0.0.3",
"lambda-platform/template-paper": "^0.0.2"
"lambda-platform/puzzle": "^0.0.5",
"lambda-platform/template-paper": "^0.0.3",
"laravel/framework": "^8.12",
"laravel/tinker": "^2.5",
"php": "^7.3|^8.0",
"tymon/jwt-auth": "^1.0"
},
"require-dev": {
"facade/ignition": "^2.5",
Expand Down
3 changes: 3 additions & 0 deletions config/lambda.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
'super_url' => '/lambda/puzzle',
'app_url' => '/lambda',
'has_language' => false,
'img_width' => 'null', // etc: '1920', '800', 'null'
'img_thumb_width' => 'null', // etc: '350', '250', 'null'
'img_quality' => 'null', // etc: '90', '75', 'null'
'languages' => [
['label' => "Moнгол", 'code' => 'mn']
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public function up()
$table->string('phone', 80)->nullable($value = true);
$table->string('gender', 255)->nullable($value = true);
$table->string('fcm_token', 255)->nullable($value = true);
$table->string('status', 255);
$table->string('status', 255)->nullable($value = true);
$table->rememberToken();
$table->timestamp('created_at')->default(DB::raw('CURRENT_TIMESTAMP'));
$table->timestamp('updated_at')->useCurrent()->useCurrentOnUpdate();
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"dependencies": {
"@lambda-platform/agent": "^2.0.0",
"@lambda-platform/chart": "^1.0.0",
"@lambda-platform/dataform": "^2.0.1",
"@lambda-platform/dataform": "^2.0.2",
"@lambda-platform/datagrid": "^2.0.0",
"@lambda-platform/datasource": "^2.0.2",
"@lambda-platform/krud": "^1.0.0",
Expand Down

0 comments on commit c52c546

Please sign in to comment.