snipe 4df53bdf8d Merge remote-tracking branch 'origin/develop' ...

# Conflicts:
#	config/version.php
#	resources/views/account/view-assets.blade.php

2016-12-01 06:10:50 -08:00

..

accessories

Merge branch 'hotfixes/accessory_model_number' into develop

2016-11-17 20:01:01 -08:00

account

More graceful error message if log doesn’t exist

2016-12-01 06:05:14 -08:00

admin

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

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

asset_maintenances

Only allow asset files to be deleted, maintenances to be added if user has assets.edit permission

2016-11-29 13:37:45 -08:00

auth

Moved CSRF token

2016-10-31 13:25:50 -07:00

categories

Partialize forms (#2884)

2016-11-16 16:56:57 -08:00

companies

Partialize forms (#2884)

2016-11-16 16:56:57 -08:00

components

Partialize forms (#2884)

2016-11-16 16:56:57 -08:00

consumables

Partialize forms (#2884)

2016-11-16 16:56:57 -08:00

custom_fields

Show encryption in fieldset list

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

depreciations

Partialize forms (#2884)

2016-11-16 16:56:57 -08:00

emails

Partialize forms (#2884)

2016-11-16 16:56:57 -08:00

errors

Version 3 - hold onto your butts

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

groups

Partialize forms (#2884)

2016-11-16 16:56:57 -08:00

hardware

Fixed supplier string in hardware view

2016-11-30 23:19:13 -08:00

layouts

Improved versioning script

2016-12-01 02:53:41 -08:00

licenses

Updated serial text to product key

2016-11-29 21:45:49 -08:00

locations

Partialize forms (#2884)

2016-11-16 16:56:57 -08:00

manufacturers

More language string fixes

2016-11-29 08:46:33 -08:00

models

Add fieldset to asset model listing

2016-11-29 06:06:52 -08:00

paginator

Version 3 - hold onto your butts

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

partials

Fix error in partializing with creating an asset maintenance. (#2987)

2016-11-29 05:02:48 -08:00

reports

Switch string to product key

2016-12-01 00:15:48 -08:00

settings

Updated version in settings

2016-12-01 02:57:47 -08:00

setup

Fix mail test script

2016-11-29 01:19:05 -08:00

statuslabels

Partialize forms (#2884)

2016-11-16 16:56:57 -08:00

suppliers

Partialize forms (#2884)

2016-11-16 16:56:57 -08:00

users

Fixed missing closing angle bracket

2016-12-01 05:53:20 -08: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