DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-16 02:24:09 -08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity
4065 commits 96 branches 267 tags 295 MiB
Commit graph

4065 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
snipe d473432436 Show encryption in fieldset list 2016-08-25 21:04:25 -07:00
snipe 4dff58ec26 Fix array generation for select 2016-08-25 21:04:10 -07:00
snipe 537ad28a67 Don’t make required encrypted custom fields required if user is not an admin 2016-08-25 21:03:52 -07:00
snipe 96eb832fd3 Only decrypt if the user is an admin 2016-08-25 21:03:24 -07:00
snipe 130c798c90 Only accept a new value for encrypted fields if the user is an admin 2016-08-25 20:59:54 -07:00
snipe e1229bfb0f Graceful decryption method 2016-08-25 20:58:56 -07:00
snipe f185c2e0de Hide radio and checkboxes for now 2016-08-25 19:48:11 -07:00
snipe 122f0b9cba Custom fields form in asset edit view 2016-08-25 18:35:28 -07:00
snipe c49f10c9bb Removed line break 2016-08-25 18:35:16 -07:00
snipe 97a938f119 Method helper to translate piped field_values into a useable array 2016-08-25 18:35:01 -07:00
snipe 308fcf96de Updated language strings 2016-08-25 17:43:07 -07:00
snipe f1fab8b164 Added Indonesian to dropdown locale list 2016-08-25 17:22:08 -07:00
snipe 0e8502a323 Removed newline 2016-08-25 17:12:50 -07:00
snipe 3171d9230b Better language 2016-08-25 17:12:34 -07:00
snipe 11b9df4b48 Use updated L5 request method 2016-08-25 17:11:52 -07:00
snipe 0c2524954f Removed unusued status_id variable 2016-08-25 17:10:09 -07:00
snipe b76ad5ea88 Reverted name of form field 2016-08-25 17:08:39 -07:00
snipe 43fbd54a12 Store new fields in the database 2016-08-25 17:08:08 -07:00
snipe 406d270c01 Use L5 Request method for input 2016-08-25 17:07:58 -07:00
snipe 98eb26a2bd Merge branch 'features/cusom_field_types' into develop 2016-08-25 16:36:21 -07:00
snipe 61aa9beddb Added new fields to custom fields views 2016-08-25 16:36:00 -07:00
snipe e89fd9b3a2 Additional strings 2016-08-25 16:35:45 -07:00
snipe d72443c335 Use trans() for custom format text 2016-08-25 16:35:31 -07:00
snipe f38593b530 Merge remote-tracking branch 'origin/develop' 2016-08-23 19:01:53 -07:00
snipe 4cf2d16c7a Temp fix for number import on cost 2016-08-23 19:01:40 -07:00
snipe f38912a5cf Custom fields additions 2016-08-23 18:52:54 -07:00
snipe ad22293f4b Added show in nav for status label views and controller 2016-08-23 18:52:42 -07:00
snipe fb402e138d Smaller dashboard number 2016-08-23 18:52:12 -07:00
snipe 90d2d0c7e1 Fixes #2469 - corrected config app.url 2016-08-23 16:04:22 -07:00
snipe 9d730af50f Added single quotes to env for mail sender 2016-08-23 16:03:57 -07:00
snipe 9407b4e28c Removed console warning 2016-08-23 15:53:18 -07:00
snipe ec19924bea Custom field types 2016-08-23 15:52:34 -07:00
snipe 7b8403cdb9 Pass status ID to ajax 2016-08-23 15:52:10 -07:00
snipe 85f3e7e3d4 Added filter by status type 2016-08-23 15:51:59 -07:00
snipe 11dc20de61 Show in nav language option 2016-08-23 15:51:45 -07:00
snipe 14fa7ed965 Fixed indenting 2016-08-23 15:51:14 -07:00
snipe 5cf1c8dfa3 Added DB DUMP PATH to docker.env 2016-08-23 15:51:05 -07:00
snipe f04cfb3e7f Allow admins to show status labels in nav 2016-08-23 15:50:52 -07:00
snipe d970daa666 Add new fields to custom fields table 2016-08-23 15:50:43 -07:00
snipe 0b0c81a110 Merge remote-tracking branch 'origin/develop' 2016-08-23 11:38:03 -07:00
snipe b1324c2e64 Removed beta from version 2016-08-23 11:37:49 -07:00
snipe 3c28be33c5 Bumped version 2016-08-23 11:37:00 -07:00
snipe e52a0f65bb Update asset report to show deployed if asset is checked out 2016-08-23 11:36:34 -07:00