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
2356 commits 96 branches 267 tags 295 MiB
Commit graph

2356 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
snipe b726d131a4 More helpful message for LDAP TLS issue 2016-08-23 11:32:11 -07:00
snipe 014167699d Fixes #2441 - use showAssetName to avoid blank entries in link name which makes Slack do weird things 2016-08-18 13:10:31 -07:00
snipe d9f2e7bf58 If custom field is type URL, display it as a link 2016-08-18 12:44:55 -07:00
snipe 4c8c58d453 Clean up divs for gates in list view 2016-08-18 12:31:45 -07:00
snipe 923352537c Moved column for in/out 2016-08-18 07:06:55 -07:00
snipe be8049b41a Include asset maintenances in purge 2016-08-18 07:06:15 -07:00
snipe 4419dc7434 Merge branch 'fix-double-format' of https://github.com/dmeltzer/snipe-it into dmeltzer-fix-double-format 
# Conflicts:
#	app/Http/Controllers/ConsumablesController.php
#	app/Http/Controllers/LicensesController.php
#	resources/views/hardware/view.blade.php
 2016-08-16 18:53:45 -07:00
Daniel Meltzer ac63642224 Add manufacturer to licenses (#2436) 
* Add manufacturer to licenses.  Shows in table and edit.  Need to improve manufacturer view to show lists beyond assets still.

* Remove extra closing tags, formatting

* Work on making the manufacturer view show more options. Need to figure out how to change the table dynamically.

* Cleanup formatting and fix a few weirdities in hardware/view.blade.php

* Standardize on two-space tabs in this file, as it seems the most
* common.

* Fix a few places where we call number_format without guaranteeing the
* item is a number and not a string.

* Show a "No Results" message on components page if there are no
* components.

* Show table of licenses on manufacturer view page.

This reworks the ManufacturersController::getDataView method to delegate
the view to a sub method (currently assets or licenses, but plan to
extend to consumables/accessories/components as well).  We then put tabs
at the top of the view to show multiple tables.  This just duplicates
the table layout from licenses/index.blade, but I wonder if theres a way
to centralize that code, maybe through partials, over time..

The only known missing part of manufacturers for licenses would be adding it
to the importer, but the license importer should probably migrate to
object importer before doing too much more...

* Add manufacturer to accessory.

* Add consumables to the manufacturer view page.
 2016-08-16 18:49:54 -07:00
Daniel Meltzer 5959f83de3 Rename parseCurrencyString to formatCurrencyOutput to clarify what it does better. 2016-08-16 20:47:53 -05:00