snipe 08f3e78d26 Merge branch 'checkout-to-location-v2' of https://github.com/dmeltzer/snipe-it into dmeltzer-checkout-to-location-v2 ... # Conflicts: # app/Http/Controllers/Api/UsersController.php # app/Http/Transformers/LocationsTransformer.php # resources/views/locations/view.blade.php # routes/api.php # tests/_data/dump.sql		2017-08-25 06:04:22 -07:00
..
admin	Merge branch 'checkout-to-location-v2' of https://github.com/dmeltzer/snipe-it into dmeltzer-checkout-to-location-v2	2017-08-25 06:04:22 -07:00
auth	Updated language strings	2017-07-07 13:14:51 -07:00
button.php	Update user(view) for support multilanguage (#3383)	2017-03-10 16:58:29 -08:00
general.php	Fixes #3644 - broken datepicker	2017-06-09 18:53:19 -07:00
mail.php	Updated translations	2016-12-03 17:10:05 -08:00
pagination.php	Updated translation strings with new purge text	2016-04-19 12:26:49 -07:00
passwords.php	Translations and nicer formatting for login/password reset	2016-05-20 00:25:45 -07:00
reminders.php	Updated translation strings with new purge text	2016-04-19 12:26:49 -07:00
table.php	Updated translation strings with new purge text	2016-04-19 12:26:49 -07:00
validation.php	ADDED: Password rules for complexity, min length, rejecting common passwords	2017-08-22 20:32:39 -07:00