snipe 0728a991a8 Merge branch 'hotfixes/datepicker_for_date_custom_field' into develop ...

# Conflicts:
#	resources/views/models/custom_fields_form.blade.php

2016-10-25 05:18:55 -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

Checkout Improvements, and initial support for requesting an asset model (#2573)

2016-09-15 19:58:27 -07:00

admin

Checkout Improvements, and initial support for requesting an asset model (#2573)

2016-09-15 19:58:27 -07:00

asset_maintenances

Rename parseCurrencyString to formatCurrencyOutput to clarify what it does better.

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

auth

Translate emails (#2652)

2016-09-26 14:13:07 -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

When checking out a consumable, don't say asset (#2718)

2016-09-29 22:20:58 -07:00

custom_fields

Show encryption in fieldset list

2016-08-25 21:04:25 -07:00

depreciations

Fix exports (#2338)

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

emails

Translate emails (#2652)

2016-09-26 14:13:07 -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

Fixes #2768 and #2753

2016-10-12 12:48:37 -07:00

layouts

Merge branch 'develop' of github.com:snipe/snipe-it into develop

2016-10-12 12:50:35 -07:00

licenses

Fixes #2713 - error displayed with license checked out to asset

2016-10-12 14:32:21 -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

Merge branch 'hotfixes/datepicker_for_date_custom_field' into develop

2016-10-25 05:18:55 -07:00

paginator

Version 3 - hold onto your butts

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

partials

Added HTML for generating passwords in asset user creation modal

2016-08-30 06:48:23 -07:00

reports

Fixes #2751 - asset tag added to asset maintenance report

2016-10-12 14:18:51 -07: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 show in nav for status label views and controller

2016-08-23 18:52:42 -07:00

suppliers

Fix exports (#2338)

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

users

Merge branch 'hotfixes/export_all_users' into develop

2016-10-25 02:42:20 -07:00

vendor

Use custom maintenance middleware

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

dashboard.blade.php

Fixes #2763 - added missing translations methods for dashboard

2016-10-12 13:01:29 -07:00

notifications.blade.php

Translations and nicer formatting for login/password reset

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