Merge pull request #358 from viralsolani/develop
Merge Develop branch
Showing
access.log
0 → 100644
This diff is collapsed.
| ... | ... | @@ -16,7 +16,7 @@ |
| "arcanedev/no-captcha": "^5.0", | ||
| "creativeorange/gravatar": "~1.0", | ||
| "davejamesmiller/laravel-breadcrumbs": "^5.0", | ||
| "doctrine/dbal": "^2.6", | ||
| "doctrine/dbal": "^2.9", | ||
| "fideloper/proxy": "^4.0", | ||
| "hieu-le/active": "^3.5", | ||
| "laravel/framework": "5.7.*", | ||
| ... | ... | @@ -24,18 +24,20 @@ |
| "laravel/tinker": "~1.0", | ||
| "laravelcollective/html": "^5.4.0", | ||
| "spatie/laravel-cors": "^1.2", | ||
| "tymon/jwt-auth":"1.0.0-rc.3", | ||
| "tymon/jwt-auth": "1.0.0-rc.3", | ||
| "unisharp/laravel-filemanager": "~1.8", | ||
| "yajra/laravel-datatables-oracle": "~8.0" | ||
| }, | ||
| "require-dev": { | ||
| "laravel/telescope": "^1.0", | ||
| "barryvdh/laravel-debugbar": "^3.0", | ||
| "codedungeon/phpunit-result-printer": "^0.19.10", | ||
| "bvipul/generator": "^5.6", | ||
| "codedungeon/phpunit-result-printer": "^0.19.10", | ||
| "filp/whoops": "~2.0", | ||
| "fzaninotto/faker": "~1.4", | ||
| "laravel/browser-kit-testing": "^4.0.0", | ||
| "mockery/mockery": "0.9.*", | ||
| "nunomaduro/larastan": "^0.3.8", | ||
| "phpunit/phpunit": "~7.0", | ||
| "xethron/migrations-generator": "2.0.2" | ||
| }, | ||
| ... | ... |
This source diff could not be displayed because it is too large. You can view the blob instead.
config/telescope.php
0 → 100644
This diff is collapsed.
| ... | ... | @@ -17,19 +17,19 @@ |
| "jquery": "^3.1.1", | ||
| "laravel-mix": "^2.1.14", | ||
| "lodash": "^4.17.4", | ||
| "vue": "^2.5.17", | ||
| "webpack-rtl-plugin": "^1.5.0" | ||
| "vue": "^2.6.8", | ||
| "webpack-rtl-plugin": "^1.8.1" | ||
| }, | ||
| "dependencies": { | ||
| "bootstrap": "^3.3.7", | ||
| "bootstrap": "^3.4.1", | ||
| "bootstrap-datetimepicker-npm": "^4.17.37-npm", | ||
| "datatables.net": "^1.10.15", | ||
| "datatables.net-buttons": "^1.3.1", | ||
| "moment": "^2.18.1", | ||
| "moment": "^2.24.0", | ||
| "nestable2": "^1.5.0", | ||
| "node-sass": "^4.9.0", | ||
| "node-sass": "^4.11.0", | ||
| "pluralize": "^7.0.0", | ||
| "select2": "^4.0.4", | ||
| "tinymce": "^4.5.8" | ||
| "tinymce": "^4.9.3" | ||
| } | ||
| } |
public/js/langs/fr_FR.js
0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
resources/lang/fr/alerts.php
0 → 100644
resources/lang/fr/api.php
0 → 100644
resources/lang/fr/auth.php
0 → 100644
resources/lang/fr/http.php
0 → 100644
resources/lang/fr/labels.php
0 → 100644
This diff is collapsed.
resources/lang/fr/menus.php
0 → 100644
resources/lang/fr/navs.php
0 → 100644
resources/lang/fr/roles.php
0 → 100644
This diff is collapsed.
Please register or sign in to comment