DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-10 15:44:11 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity
858 commits 97 branches 266 tags 291 MiB
Commit graph

858 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 67f199b09d Added customfields to asset CSV export 2016-09-27 15:09:47 -07:00
snipe f1c458185d Client-side pagination on asset report for faster loading 2016-09-27 14:56:05 -07:00
snipe ed22ec4b36 Bumped hash 2016-09-27 08:42:55 -07:00
snipe fa72e64b98 Add checkout date to asset report 2016-09-27 08:42:48 -07:00
snipe 2a8ab06ca3 Remove escaping for CSV to prevent weird encoding 2016-09-27 07:25:28 -07:00
snipe 61d07bdc7c Sigh. 2016-09-27 07:24:26 -07:00
snipe 3061ce2983 Missed delimiter for CSV 2016-09-27 07:23:30 -07:00
snipe e9f3d622f5 Add company name to custom asset report 2016-09-27 07:19:52 -07:00
snipe a92bfe8ade Default EOL to null, not 0, if no value entered 2016-09-27 06:53:59 -07:00
snipe 0a391de09f Fixes #2682 - search on purchase_order 2016-09-27 01:29:31 -07:00
snipe 819ca2921b Fixes bug where 12-hour format was used for hours 2016-09-26 22:34:09 -07:00
snipe 3208522dd1 Fixes #2672 - model_no field updated to be string 2016-09-23 14:10:08 -07:00
snipe d3d36315d3 Hotfixes adding company name to custom report 2016-09-20 00:49:08 -07:00
snipe 04898c49b2 Fixed wrong translation from PR 2016-09-15 20:03:47 -07:00
Karol eeff305b02 Update dashboard.blade.php (#2593) 2016-09-15 19:59:01 -07:00
snipe f384593e19 Fix license cloning 2016-09-14 19:04:52 -07:00
snipe 5e2dbaffc4 Use streaming to handle large exports 2016-09-12 14:06:55 -07:00
snipe 0a506120b7 Hotfix for dumb enum issue 2016-09-06 20:01:10 -07:00
snipe e7fba08f92 Merge remote-tracking branch 'origin/develop' 2016-09-06 10:38:31 -07:00
snipe 35f3f1432f Bumped version 2016-09-06 10:38:07 -07:00
snipe 934b39268d Merge remote-tracking branch 'origin/develop' 2016-09-06 10:35:33 -07:00
snipe 67315d81d6 Fixes #2134 - hide archived assets from list all 2016-09-01 13:28:15 -07:00
snipe eee64d5509 Set the public path for users who can’t use public as a directory (shared hosting) 2016-09-01 12:53:38 -07:00
snipe b450ef3534 Cast group permissions as array for older, wonky installs 2016-08-30 13:25:14 -07:00
snipe d4dc1830ec Fixes #2527 - honor the setting for whether Snpie-IT can access the outside world 2016-08-30 12:58:08 -07:00
snipe 04e9ca0942 Fixes #2399 2016-08-30 12:34:23 -07:00
snipe 06021d79c1 Fixed typo 2016-08-30 12:25:46 -07:00
snipe 7ecb8d7bc1 Patches PR#2526 to develop 2016-08-30 12:13:29 -07:00
Ryan Stafford efe95d9ad0 Syntax error on VOLUME instruction (#2526) 
Added quotes to volume path.
 2016-08-30 12:11:42 -07:00
snipe 6f89699f1a Make purchase cost default to null 
I don’t know why I need to do this?
 2016-08-30 08:52:33 -07:00
snipe 2c18bc24a7 Check if username is userprincipalname 
If it is, skip building the UPN for AD
 2016-08-30 08:34:17 -07:00
snipe f81b21208b Bumped version for v3.4.0-beta 2016-08-30 07:39:55 -07:00
snipe ba70e5b053 A little demo-proofing of the maintenances page 2016-08-30 07:34:33 -07:00
snipe 5090468357 Fixes #2510 and #2488 - CSS class added to images in views 2016-08-30 07:20:07 -07:00
snipe 213cda8cf4 Fixes #2525 2016-08-30 07:03:22 -07:00
snipe 421cbf11fc Patches PR#2500 for dev because @dmeltzer forgot that we commit to the develop branch :P 2016-08-30 06:54:04 -07:00
snipe 8816c481af Added HTML for generating passwords in asset user creation modal 2016-08-30 06:48:23 -07:00
snipe 3ed0cf2be8 Moved import errors up higher on the screen, fixed some weird formatting bugaboos 2016-08-30 06:48:00 -07:00
snipe cd28b012b3 Remove last name requirement in save user request 2016-08-30 06:47:38 -07:00
snipe 25902db659 Generate password from modal 2016-08-30 06:47:18 -07:00
snipe 35a67ab18a Fixes #2516 - listbox error on new asset 2016-08-29 23:49:23 -07:00
snipe 2cfb015b1a Removed extra debugging info 2016-08-29 23:13:30 -07:00
snipe e4dcd47d6c Fix UTF-8 issues in imports 2016-08-29 22:57:48 -07:00
snipe 64cd4fb1c9 Allow X-Frame-Options to be disabled via env if necessary 2016-08-29 22:57:29 -07:00
Daniel Meltzer 276e0a7114 Importer: Implement item update and interface improvments (#2507) 
* Add support for updating assets to the importer.

If an asset with a matching asset tag is found, and the --update flag is
passed to the importer, we edit the matching asset with any
asset-specific values, and persist to the database.  Any missing/blank
values are skipped.

TODO: Add to web interface, add support in consumables/accessories

* Allow deleting of files on the import page.

* Extend web interface to allow updating of imported items.

This adds a modal dialog to the import process.  Currently the dialog
allows the choice of update vs ignore, and choosing the item type to
import (Accessory, Asset, Consumable).

Also use Helper::ParseFloat() for purchase_cost processing.  It exists,
and fixes issues on my end at least.

* Implement editing of consumables and accessories.

* Rename getProcessImportFile to postProcessImportFile to reflect how it's now used

* Fix copy-pasta error.
 2016-08-29 15:49:32 -07:00
Daniel Meltzer 9bf3403f31 Fix #2499 (#2500) 
Missed this instance when renaming the method. Sorry!
 2016-08-26 06:01:58 -07:00
snipe 0d088f3031 Fixes #2491 - show asset tag on dashboard 2016-08-25 21:28:46 -07:00
snipe a92ed97b4e Definitely not beta ;) 2016-08-25 21:06:43 -07:00
snipe fcdea4825e Bumped version 2016-08-25 21:04:43 -07:00
snipe 35439f9976 Additional strings 2016-08-25 21:04:36 -07:00