DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-14 01:24:06 -08:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity
3722 commits 95 branches 267 tags 294 MiB
Commit graph

3722 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 305b0d8edb Fixed #4522 - properly check for valid target, throw error otherwise 2017-11-27 21:17:58 -08:00
snipe 05996019e5 Use asset checkout request in API 2017-11-27 21:17:16 -08:00
snipe 31a967e072 Use general order_number string to mean order number 2017-11-27 21:16:51 -08:00
snipe 0b56ebf291 Fixed radio button selector to provide correct default value in checkout 2017-11-27 21:16:25 -08:00
snipe fcc87b3219 Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2017-11-24 11:27:54 -08:00
snipe 82fca0c72d Auto-bumped hash/version 2017-11-24 11:25:57 -08:00
snipe 51661b0a21 Fixed #4190 - Added artisan command to regenerate asset tags 2017-11-24 11:25:51 -08:00
snipe e8670fe591 Merge branch 'develop' of github.com:snipe/snipe-it into develop 2017-11-24 10:53:20 -08:00
Daniel Meltzer bee1dfc4a6 More importer fixes (#4516) 
* The default locale of en does not include dollar sign in default currency.  Assume if there is no currency symbol set that the dollar sign is a good thing to look for in parsefloat.

* Fix for 4485.  Serial not serial_number

Also fix bug where updating with a csv that does not include custom field columns should not overwrite current values.

* Rename serial_number to serial in default imports to avoid needing to map weirdly.

* Add Test for 4359.  Not reproducable at current though
 2017-11-24 10:42:11 -08:00
snipe 83c8449aca Auto-bumped hash/version 2017-11-22 18:43:18 -08:00
snipe 9dba1bb3e5 Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2017-11-22 18:43:15 -08:00
snipe 76e3398d44 Auto-bumped hash/version 2017-11-22 18:42:33 -08:00
snipe a7e12931fa Check that assigned is an object in reports controller 2017-11-22 18:42:17 -08:00
snipe ba04c64567 Auto-bumped hash/version 2017-11-22 18:34:03 -08:00
snipe 8c8352ecc6 Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2017-11-22 18:33:56 -08:00
snipe 64b670033d Auto-bumped hash/version 2017-11-22 18:30:45 -08:00
snipe b9d102a5fb Truncate the fieldset table and pivot table on seed as well 2017-11-22 15:57:05 -08:00
snipe 77076e02e8 Fixed - mark supplier as requried in maintenance 2017-11-22 15:22:44 -08:00
snipe c6a761a5ad Fixed - supplier is not required on asset creation/edit 2017-11-22 15:20:46 -08:00
snipe 6f3a90c48b Check that the assigned data is valid 2017-11-22 15:07:34 -08:00
snipe 8f160a8590 Fixed CSV asset export missing checked out to info 2017-11-22 13:05:48 -08:00
snipe 2278d5bfd8 Fixed restore permission to assets API disable delete/checkin/checkout on deleted assets 2017-11-22 10:35:24 -08:00
snipe 66ac147c9e Auto-bumped hash/version 2017-11-22 07:32:40 -08:00
snipe 05e0d15ae4 Auto-bumped hash/version 2017-11-22 07:31:50 -08:00
snipe 8562f018ed Fixed - conflicting error when a user and asset were both checked out 2017-11-22 07:31:38 -08:00
snipe 0cbdcce3ea Production asset manifest 2017-11-22 07:07:33 -08:00
snipe 980be65193 Added ability to turn items on/off in checkout-selector 2017-11-22 07:07:18 -08:00
snipe 3aaaea37e4 Added - sync locations artican call after seed 2017-11-22 06:21:56 -08:00
snipe 964c594c4c Added ItemFormatter for acrtivity report 2017-11-22 06:21:06 -08:00
snipe 9430c4bf43 Added sanity checks in BS tables formatter 2017-11-22 06:20:51 -08:00
snipe 538757317b Fixed #4411 - broken activity report if purge didn’t remove relationship entries 2017-11-22 06:20:28 -08:00
snipe fe986f7c51 Auto-bumped hash/version 2017-11-21 22:45:10 -08:00
snipe 09105871d9 Auto-bumped hash/version 2017-11-21 22:43:33 -08:00
snipe e84a6059f4 Merge branch 'develop' 2017-11-21 22:43:00 -08:00
snipe 09f20873df Auto-bumped hash/version 2017-11-21 22:35:05 -08:00
snipe 2adc1e8ba9 Auto-bumped hash/version 2017-11-21 22:35:04 -08:00
snipe 4a6c18532b Auto-bumped hash/version 2017-11-21 22:35:02 -08:00
snipe 921f882680 Auto-bumped hash/version 2017-11-21 22:35:01 -08:00
snipe f79e5add58 Auto-bumped hash/version 2017-11-21 22:34:59 -08:00
snipe d98d06377e Fixed #4098 - autolink URL and email addresses in listing 2017-11-21 22:34:53 -08:00
snipe 22fdd05314 Add UTF charset 2017-11-21 22:34:07 -08:00
snipe 8c15a4e0c6 Auto-bumped hash/version 2017-11-21 21:00:07 -08:00
snipe 9250b45e6e Auto-bumped hash/version 2017-11-21 21:00:05 -08:00
snipe 3a1de3d2a5 Auto-bumped hash/version 2017-11-21 21:00:02 -08:00
snipe b59dd11304 Auto-bumped hash/version 2017-11-21 21:00:00 -08:00
snipe b6222abb7c Auto-bumped hash/version 2017-11-21 20:59:58 -08:00
snipe dcf8e4f5ef Auto-bumped hash/version 2017-11-21 20:59:54 -08:00
snipe f195073ac3 Auto-bumped hash/version 2017-11-21 20:59:52 -08:00
snipe 452a9d6725 Auto-bumped hash/version 2017-11-21 20:59:50 -08:00
snipe 1d74ddc547 Auto-bumped hash/version 2017-11-21 20:59:45 -08:00