DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-18 03:24:07 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
11762 commits 96 branches 267 tags 296 MiB
Commit graph

283 commits

Author SHA1 Message Date
snipe 96eb832fd3 Only decrypt if the user is an admin 2016-08-25 21:03:24 -07:00
snipe 90d2d0c7e1 Fixes #2469 - corrected config app.url 2016-08-23 16:04:22 -07:00
snipe d9f2e7bf58 If custom field is type URL, display it as a link 2016-08-18 12:44:55 -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
Daniel Meltzer 0c912bcf49 Fix more number_format madness. 
This does two main things:
1) The importer now imports as numbers, not parsed strings.  This allows
is to format values on output instead of input, which is what was
happening in most places.

2) Add a Helper::parseCurrencyString method and port everything to use
this.  This checks to see if the value is numeric or empty, and returns
the appropriate value in all cases.  Should fix all known occurances of
number_format expections.
 2016-08-16 20:41:28 -05:00
snipe 869da1da78 Add maintenance notes to maintenances tab in hardware view 2016-08-11 15:40:41 -07:00
snipe 29eadb10ae Fixes #2387 2016-08-02 17:03:15 -07:00
snipe 098e7e4feb Hide email address if there is no value 2016-08-02 15:03:45 -07:00
snipe ef6fb69cee Fix translation 2016-08-02 04:26:07 -07:00
snipe 39929c7d89 Better handling for deleted users 2016-08-02 04:23:13 -07:00
snipe 8246a319a2 Fixes #2363 and #1097 2016-08-02 00:54:38 -07:00
snipe 1f30bdee99 Fixes #2361 2016-07-30 17:27:08 -07:00
snipe fd94c76874 Fixes asset created_at 2016-07-29 12:15:09 -07:00
snipe 3fd5fb836f Restore linebreaks in notes 2016-07-27 20:24:09 -07:00
snipe 0cf563ae5b Show admin in maintenances 2016-06-22 17:04:47 -07:00
snipe dd1241f964 Fix in case crated_at is blank 2016-06-21 17:19:46 -07:00
snipe e9227f77b6 Fixes #2163 - put model image in view if no asset image 2016-06-21 12:20:22 -07:00
snipe 412756b651 Fix link to view manufacturer in hardware view 2016-06-15 21:14:26 -07:00
snipe 87352470c0 Added sortable created_at to assets and users 2016-06-15 21:06:17 -07:00
snipe 1efa69e51f Fixes #2158 2016-06-15 11:50:57 -07:00
snipe 3ca81f4d73 Fixes #2140 2016-06-13 12:07:01 -07:00
snipe 485fb26393 Fixes #1985 - disallow checkin/checkout if the asset is not in a deployable status 2016-06-02 14:04:54 -07:00
snipe 9bb258bb99 Updated alt tag 2016-05-31 14:27:33 -07:00
snipe c89f357e4a Fixes #2082 
LOL whoops
 2016-05-25 13:32:33 -07:00
snipe 66beeeb26d Added notes back to asset file uploads 2016-05-19 23:12:27 -07:00
snipe c1c7fa143d Components display on assets page 2016-05-18 19:26:50 -07:00
snipe a726934cde Fixed bulk delete+checkin for users 2016-05-12 21:01:31 -07:00
snipe 0e6b8a8358 Switch to use trans from Lang::get for laravel 5.2 2016-04-07 02:51:57 -07:00
snipe 6f9bad1005 Use lightbox for images in asset file listing 2016-03-25 20:38:27 -07:00
snipe 82d6a4e025 Fixed Asset namespace 2016-03-25 04:16:32 -07:00
snipe fe00b0e401 Version 3 - hold onto your butts 2016-03-25 01:18:05 -07:00