Commit Graph

15 Commits

Author SHA1 Message Date
snipe dfca1386ac Accessories bootstrap tables for #1266 2015-10-21 13:05:14 -07:00
snipe b492ac4950 Merge branch 'bootstrap-table-experiment' into develop-bootstrap-tables-integration
# Conflicts:
#	.gitignore
#	app/controllers/admin/AccessoriesController.php
#	app/controllers/admin/AssetsController.php
#	app/controllers/admin/LicensesController.php
#	app/models/Accessory.php
#	app/models/Asset.php
#	app/routes.php
#	app/views/backend/accessories/index.blade.php
#	app/views/backend/accessories/view.blade.php
#	app/views/backend/hardware/index.blade.php
#	app/views/backend/licenses/index.blade.php
2015-10-20 17:52:02 -07:00
snipe 66fd0c2315 Fixes #1232 - adds category to accessory listing view 2015-10-09 13:22:36 -07:00
madd15 5aff3d9380 remove search explode 2015-08-18 16:17:46 +09:30
madd15 5568f7fc5f Add name text search 2015-08-18 14:15:03 +09:30
snipe 481b905331 Fixes #1045 - allow 0 value for accessories 2015-08-11 14:01:13 -07:00
madd15 60d05e1ae1 Add checkin_email() 2015-07-24 11:58:09 +09:30
snipe 1273c4ca87 EULA/req improvements 2015-02-26 18:20:52 -08:00
snipe 430b8233ed Fixed user relationship 2015-02-26 15:24:51 -08:00
snipe efaf067b94 Fixed user relationship 2015-02-26 14:07:39 -08:00
snipe 6efd268004 Disable checkouts if there are none left 2015-02-26 13:28:08 -08:00
snipe ad30aebcbc Methods to extend the category EULA to the accessory 2015-02-26 11:41:47 -08:00
snipe 54bad2e4f6 More accessory relationships 2015-02-26 03:19:45 -08:00
snipe e41621def0 Fixed relation between accessory and category 2015-02-26 03:08:27 -08:00
snipe 3ba6e45011 Added Accessories scaffolding 2015-02-25 16:31:22 -08:00