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

..

accessories

Merge branch 'fix-double-format' of https://github.com/dmeltzer/snipe-it into dmeltzer-fix-double-format

2016-08-16 18:53:45 -07:00

account

Use showAssetName instead of asset->name to include the asset tag (#2437)

2016-08-11 23:56:40 -07:00

asset_maintenances

Rename parseCurrencyString to formatCurrencyOutput to clarify what it does better.

2016-08-16 20:47:53 -05:00

auth

Added favicon explicit link

2016-08-02 12:39:49 -07:00

categories

Fix exports (#2338)

2016-07-27 19:45:45 -07:00

companies

Switch to use trans from Lang::get for laravel 5.2

2016-04-07 02:51:57 -07:00

components

Rename parseCurrencyString to formatCurrencyOutput to clarify what it does better.

2016-08-16 20:47:53 -05:00

consumables

Rename parseCurrencyString to formatCurrencyOutput to clarify what it does better.

2016-08-16 20:47:53 -05:00

custom_fields

Ability to remove field from fieldset

2016-07-28 08:10:15 -07:00

depreciations

Fix exports (#2338)

2016-07-27 19:45:45 -07:00

emails

Fixes #2254

2016-07-14 19:50:00 -07:00

errors

Version 3 - hold onto your butts

2016-03-25 01:18:05 -07:00

groups

Fix exports (#2338)

2016-07-27 19:45:45 -07:00

hardware

Merge branch 'fix-double-format' of https://github.com/dmeltzer/snipe-it into dmeltzer-fix-double-format

2016-08-16 18:53:45 -07:00

layouts

Tidied up some debugging code, better explanation

2016-08-12 17:10:03 -07:00

licenses

Merge branch 'fix-double-format' of https://github.com/dmeltzer/snipe-it into dmeltzer-fix-double-format

2016-08-16 18:53:45 -07:00

locations

Removed asterisks, use orange bar for req fields in locations

2016-08-02 16:40:38 -07:00

manufacturers

Add manufacturer to licenses (#2436)

2016-08-16 18:49:54 -07:00

models

Add manufacturer to licenses (#2436)

2016-08-16 18:49:54 -07:00

paginator

Version 3 - hold onto your butts

2016-03-25 01:18:05 -07:00

partials

Newer required style

2016-07-22 01:33:55 -07:00

reports

Rename parseCurrencyString to formatCurrencyOutput to clarify what it does better.

2016-08-16 20:47:53 -05:00

settings

Allow admin to turn LDAP password sync off.

2016-08-04 14:29:28 -07:00

setup

Added email domain, email format and username format to settings/setup form

2016-06-01 15:43:39 -07:00

statuslabels

Added custom color to status labels, only show status labels if there are results

2016-08-02 13:25:50 -07:00

suppliers

Fix exports (#2338)

2016-07-27 19:45:45 -07:00

users

Fix for deleted users display

2016-08-02 04:45:48 -07:00

vendor

Use custom maintenance middleware

2016-08-11 19:22:26 -07:00

dashboard.blade.php

Added custom color to status labels, only show status labels if there are results

2016-08-02 13:25:50 -07:00

notifications.blade.php

Translations and nicer formatting for login/password reset

2016-05-20 00:25:45 -07:00