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

..

_data

[WIP] Improvements to unit tests. (#3574)

2017-06-12 17:39:03 -07:00

_envs

Add presenters for models. (#3098)

2016-12-23 17:52:00 -08:00

_output

Version 3 - hold onto your butts

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

_support

REST API - Refactoring of routes file, more tests added (#3345)

2017-02-23 16:32:35 -08:00

acceptance

Dept tests

2017-05-23 03:03:30 -07:00

api

[WIP] Improvements to unit tests. (#3574)

2017-06-12 17:39:03 -07:00

functional

[WIP] Improvements to unit tests. (#3574)

2017-06-12 17:39:03 -07:00

unit

Importer tests + Fixes (#3733)

2017-07-11 20:37:02 -07:00

_bootstrap.php

Version 3 - hold onto your butts

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

acceptance.suite.yml

Switched configs around a little

2016-04-13 02:41:55 -07:00

api.suite.yml

Components Assets view + stubbed API tests (#3325)

2017-02-21 14:26:46 -08:00

functional.suite.yml

Cleanup controller escaping (#3084)

2016-12-19 22:00:50 -08:00

TestCase.php

Discussion: Moving to policies for controller based authorization (#3080)

2016-12-19 11:04:28 -08:00

TODO.testing

Partialize forms (#2884)

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

unit.suite.yml

[WIP] Improvements to unit tests. (#3574)

2017-06-12 17:39:03 -07:00