merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2963 from rahulcs0082/development 

Issue #2949 and #2950
This commit is contained in:
Jitendra Singh 2020-04-29 14:02:54 +05:30 committed by GitHub
parent c88ca31b94 6118cabbde
commit 4899f90f1d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/Velocity/publishable/assets/js/velocity.js vendored
View File

File diff suppressed because one or more lines are too long

2
packages/Webkul/Velocity/publishable/assets/mix-manifest.json
View File

@ -1,5 +1,5 @@
{
"/js/velocity.js": "/js/velocity.js?id=08fbd43328947b542230",
"/js/velocity.js": "/js/velocity.js?id=a0421440e72113e0ce0d",
"/css/velocity-admin.css": "/css/velocity-admin.css?id=612d35e452446366eef7",
"/css/velocity.css": "/css/velocity.css?id=494f7330df616e1ba3db"
}

3
packages/Webkul/Velocity/src/Resources/assets/js/app.js vendored
View File

@ -11,14 +11,13 @@ window.jQuery = window.$ = require("jquery");
window.BootstrapSass = require("bootstrap-sass");
Vue.use(VueToast);
Vue.use(VeeValidate);
Vue.use(VueCarousel);
Vue.use(BootstrapSass);
Vue.prototype.$http = axios;
Vue.use(VeeValidate, {
dictionary: {
ar: { messages: messagesAr }
ar: messagesAr
}
});

8
public/installer/EnvConfig.php
View File

@ -27,11 +27,11 @@ $data = array();
if (empty($_POST['host_name']))
$errors['host_name'] = 'Host Name is required.';
if (empty($_POST['database_name']))
$errors['database_name'] = 'Database Name is required.';
// if (empty($_POST['database_name']))
// $errors['database_name'] = 'Database Name is required.';
if (empty($_POST['user_name']))
$errors['user_name'] = 'User Name is required.';
// if (empty($_POST['user_name']))
// $errors['user_name'] = 'User Name is required.';
if (empty($_POST['port_name']))
$errors['port_name'] = 'Port Name is required.';