DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-09-21 16:27:35 -07:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse source 
# Conflicts:
#	config/version.php
This commit is contained in:
snipe 2018-01-20 07:47:54 -08:00
parent 8d3a214475 a28fee1ff4
commit a3240da707
8 changed files with 12 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
config/version.php
View file

@ -1,10 +1,10 @@
<?php
return array (
'app_version' => 'v4.1.10-pre',
'full_app_version' => 'v4.1.10-pre - build 3244-g798ea75',
'build_version' => '3244',
'app_version' => 'v4.1.10',
'full_app_version' => 'v4.1.10 - build 3249-g8d3a214',
'build_version' => '3249',
'prerelease_version' => '',
'hash_version' => 'g798ea75',
'full_hash' => 'v4.1.10-pre-114-g798ea75',
'hash_version' => 'g8d3a214',
'full_hash' => 'v4.1.10-119-g8d3a214',
'branch' => 'master',
);

BIN
public/css/app.css
View file

Binary file not shown.

BIN
public/js/build/all.js
View file

Binary file not shown.

BIN
public/js/build/vue.js
View file

Binary file not shown.

BIN
public/js/build/vue.js.map
View file

Binary file not shown.

BIN
public/js/dist/all.js vendored
View file

Binary file not shown.

10
public/mix-manifest.json
View file

@ -1,14 +1,14 @@
{
"/js/build/vue.js": "/js/build/vue.js?id=7de68d09c5faff74d7b7",
"/js/build/vue.js": "/js/build/vue.js?id=25049a0c0eb736e1c883",
"/css/AdminLTE.css": "/css/AdminLTE.css?id=b8be19a285eaf44eec37",
"/css/app.css": "/css/app.css?id=c9a81f09fdea13a28c54",
"/css/app.css": "/css/app.css?id=407edb63cc6b6dc62405",
"/css/overrides.css": "/css/overrides.css?id=1bdafb06a8609780f546",
"/js/build/vue.js.map": "/js/build/vue.js.map?id=acc97065a23ea72f47ad",
"/js/build/vue.js.map": "/js/build/vue.js.map?id=6b79d08f1decca72957c",
"/css/AdminLTE.css.map": "/css/AdminLTE.css.map?id=99f5a5a03c4155cf69f6",
"/css/app.css.map": "/css/app.css.map?id=bdbe05e6ecd70ccfac72",
"/css/overrides.css.map": "/css/overrides.css.map?id=898c91d4a425b01b589b",
"/css/dist/all.css": "/css/dist/all.css?id=3a8aa974e7b09b52b18c",
"/js/dist/all.js": "/js/dist/all.js?id=1528aeec676d855a2ecd",
"/js/dist/all.js": "/js/dist/all.js?id=722d1692756a30dc1ece",
"/css/build/all.css": "/css/build/all.css?id=3a8aa974e7b09b52b18c",
"/js/build/all.js": "/js/build/all.js?id=1528aeec676d855a2ecd"
"/js/build/all.js": "/js/build/all.js?id=722d1692756a30dc1ece"
}

9
resources/assets/js/snipeit_modals.js
View file

@ -56,14 +56,12 @@
data: $('.modal-body form').serialize(),
success: function (result) {
console.dir(result);
if(result.status == "error") {
var error_message="";
for(var field in result.messages) {
error_message += "<li>Problem(s) with field <i><strong>" + field + "</strong></i>: " + result.messages[field];
console.dir(result.messages);
console.log('error_messages are: ' + error_message);
}
$('#modal_error_msg').html(error_message).show();
return false;
@ -81,14 +79,11 @@
// clicked 'add' on to add a new 'thing'
// this code adds the newly created object to that select
var selector = document.getElementById(select);
console.warn("The selector we should've selecte dis: "+select);
console.dir(selector);
if(!selector) {
return false;
}
console.warn("onChange Selector Thing should've activated? Here's the selector");
console.dir(selector);
selector.options[selector.length] = new Option(name, id);
selector.selectedIndex = selector.length - 1;
$(selector).trigger("change");