Commit Graph

15 Commits

Author SHA1 Message Date
snipe d7b4e8a8de Removed cruft from checkin form 2015-02-26 15:25:21 -08:00
snipe 19ad8970d7 Fixed arrow icon 2015-02-26 14:08:42 -08:00
snipe 6efd268004 Disable checkouts if there are none left 2015-02-26 13:28:08 -08:00
snipe 97d97fc4df Merge branch 'develop' of github.com:snipe/snipe-it into develop
Conflicts:
	app/views/backend/categories/edit.blade.php
	app/views/backend/depreciations/edit.blade.php
	app/views/backend/groups/create.blade.php
	app/views/backend/groups/edit.blade.php
	app/views/backend/hardware/bulk.blade.php
	app/views/backend/hardware/checkin.blade.php
	app/views/backend/hardware/checkout.blade.php
	app/views/backend/hardware/edit.blade.php
	app/views/backend/licenses/checkin.blade.php
	app/views/backend/licenses/checkout.blade.php
	app/views/backend/licenses/edit.blade.php
	app/views/backend/locations/edit.blade.php
	app/views/backend/manufacturers/edit.blade.php
	app/views/backend/models/edit.blade.php
	app/views/backend/statuslabels/edit.blade.php
	app/views/backend/suppliers/edit.blade.php
	app/views/frontend/account/change-email.blade.php
	app/views/frontend/account/change-password.blade.php
	app/views/frontend/account/profile.blade.php
	app/views/frontend/auth/forgot-password-confirm.blade.php
	app/views/frontend/auth/signin.blade.php
2015-02-26 10:26:04 -08:00
madd15 379f6bef6c catergories lang and serveral icons 2015-02-26 23:48:17 +10:30
snipe 59ea144b28 Minor UX tweaks 2015-02-26 03:07:19 -08:00
snipe f9f3b5b4f9 Smaller buttons 2015-02-26 02:42:25 -08:00
snipe 5d71628927 Accessories title 2015-02-26 00:22:15 -08:00
snipe a6232cbfd8 Fix language string for create accessory 2015-02-25 19:19:23 -08:00
snipe 734dc49564 Fixed icon 2015-02-25 18:35:07 -08:00
snipe a5a1c4223b Fixed chevrons 2015-02-25 18:33:22 -08:00
snipe ca1351b704 Switched to all FA 2015-02-25 18:14:51 -08:00
snipe 93b11c35d0 CSS updates 2015-02-25 17:50:21 -08:00
snipe fae70bb485 Updated table strings 2015-02-25 16:38:15 -08:00
snipe 3ba6e45011 Added Accessories scaffolding 2015-02-25 16:31:22 -08:00