DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-09-21 00:07:42 -07:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity
6604 commits 89 branches 265 tags 290 MiB
Commit graph

73 commits

Author SHA1 Message Date
snipe e1229bfb0f Graceful decryption method 2016-08-25 20:58:56 -07:00
snipe d72443c335 Use trans() for custom format text 2016-08-25 16:35:31 -07:00
snipe f38912a5cf Custom fields additions 2016-08-23 18:52: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 24d2726c86 Added helper for imports 2016-08-12 16:01:45 -07:00
snipe 78fda31379 Helper method to introspect into the model level validation to see if the field is required 
(This does not yet handle form request validation)
 2016-07-22 00:29:23 -07:00
snipe 6a277a5391 Added inheritance back into users/groups 2016-06-15 20:45:45 -07:00
Daniel Meltzer 9648c6f1d3 Fix license Checkout. 
A mistake in the sqlite porting led to "Please select an asset"
disappearing.  This centralizes that code in Helper, and uses the code
in Licensescontroller and componentscontroller.

Also use the proper name on the components checkout page.

AssetMaintencesController reuses the same underlying code as
licensescontroller, but we don't want "Please select an asset" to be an
option there, so I'm not changing that code.
 2016-06-07 07:58:08 -05:00
Daniel Meltzer cd9cca9c6b Modify Helper::categoryList() to take a category type parameter. 
This allows for centralizing the category fetching code more and fixes
an error in asset model viewing (#2118).  Also add a few translated
strings and standardize on a base of 'Select a *' for the default value
in our lists.
 2016-06-05 09:47:44 -05:00
Daniel Meltzer 1c1ef951e9 Fix a regression in Helper::usersList and ::managerList() where the "Select a User" option disappeared. Also format names the way they used to be formatted. 2016-06-01 13:47:46 -05:00
Daniel Meltzer 4b98711e07 Replace the assorted concat() methods with a full_name method in the User model and adjust queries accordingly 2016-05-31 19:41:14 -05:00
snipe 37be587c39 Make regular and highlight colors the same, since we're not using highlight colors in the pie chart yet 2016-05-24 16:19:44 -07:00
snipe 3b838ca867 Added static colors for charts 2016-05-24 16:05:51 -07:00
snipe de5e1ca86b Add persedown helper 2016-05-24 10:21:33 -07:00
snipe cb91829729 Fixed division by zero error 2016-05-24 00:49:56 -07:00
snipe 15eb6df1db Add settings for alert interval threshold and inventory threshold 2016-05-19 19:33:53 -07:00
snipe a144fb77cd Fixed hodor 2016-05-09 15:38:29 -07:00
snipe 7783471cc3 Move selectedPermissionsArray to helper, since it can be used by users as well 2016-04-28 20:56:47 -07:00
snipe 7b489ad1ec Ability to suppress users from checkoutable list 2016-04-28 20:19:22 -07:00
snipe 96911b9e57 Fixes #1944 - add manufacturer to model list 2016-04-23 03:34:49 -07:00
snipe 6f9bad1005 Use lightbox for images in asset file listing 2016-03-25 20:38:27 -07:00
snipe fe00b0e401 Version 3 - hold onto your butts 2016-03-25 01:18:05 -07:00