DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-01 00:47:27 -08: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 2017-11-08 00:58:16 -08:00
parent 1123272ae8 d1022e8ff7
commit 31980c55de
4 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

Binary file not shown.

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

Binary file not shown.

4
public/mix-manifest.json
View file

@ -8,7 +8,7 @@
"/css/app.css.map": "/css/app.css.map?id=bdbe05e6ecd70ccfac72", "/css/app.css.map": "/css/app.css.map?id=bdbe05e6ecd70ccfac72",
"/css/overrides.css.map": "/css/overrides.css.map?id=898c91d4a425b01b589b", "/css/overrides.css.map": "/css/overrides.css.map?id=898c91d4a425b01b589b",
"/css/dist/all.css": "/css/dist/all.css?id=7c3842d2639193ac7e88", "/css/dist/all.css": "/css/dist/all.css?id=7c3842d2639193ac7e88",
"/js/dist/all.js": "/js/dist/all.js?id=16d568df949bf39d8ff6", "/js/dist/all.js": "/js/dist/all.js?id=991cd06c975979f6f067",
"/css/build/all.css": "/css/build/all.css?id=7c3842d2639193ac7e88", "/css/build/all.css": "/css/build/all.css?id=7c3842d2639193ac7e88",
"/js/build/all.js": "/js/build/all.js?id=16d568df949bf39d8ff6" "/js/build/all.js": "/js/build/all.js?id=991cd06c975979f6f067"
} }

4
resources/assets/js/snipeit.js
View file

@ -194,7 +194,9 @@ $(document).ready(function () {
link.select2({ link.select2({
ajax: { ajax: {
url: baseUrl + '/api/v1/' + endpoint + '/selectlist',
// the baseUrl includes a trailing slash
url: baseUrl + 'api/v1/' + endpoint + '/selectlist',
dataType: 'json', dataType: 'json',
delay: 250, delay: 250,
headers: { headers: {