Commit Graph

549 Commits

Author SHA1 Message Date
snipe 04735f1aff Fixed assetlog display 2015-02-26 17:04:21 -08:00
snipe 0ff23c422a Better language strings 2015-02-26 16:13:47 -08:00
snipe 231e465898 Added category types to view 2015-02-26 16:00:52 -08:00
snipe 68c3e88343 Few more error icons 2015-02-26 15:52:38 -08:00
snipe ef6eae63d8 Fixed error icon 2015-02-26 15:50:33 -08:00
snipe afe2eb736c Added category type 2015-02-26 15:48:44 -08:00
snipe 1552c1e917 Accessories log (not reporting correctly yet) 2015-02-26 15:25:48 -08:00
snipe 258d1cd705 Removed extra table columns 2015-02-26 15:25:33 -08:00
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 7f26f01a8f Merge pull request #573 from madd15/models
Force Model Restore before Asset Restore
2015-02-26 13:06:15 -08:00
snipe 31df29cac8 Fixed funky layout from datatables 2015-02-26 13:05:10 -08:00
madd15 15a7e205be Force Model Restore before Asset Restore 2015-02-27 07:33:48 +10:30
snipe 3e189d3502 Fixes #538 - sortable tables 2015-02-26 12:59:40 -08:00
snipe 6d16c97902 Fixed back arrow 2015-02-26 12:40:54 -08:00
snipe 528c06cf7f Reverting icon fix 2015-02-26 10:33:31 -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 88ce0abe85 more icons 2015-02-27 01:32:24 +10:30
madd15 4570efc68b Add restore to action button 2015-02-27 01:03:31 +10:30
madd15 ea28873fb0 remove edit, clone when deleted 2015-02-27 00:56:47 +10:30
madd15 eb5d4983de more model functionality and icons 2015-02-27 00:53:16 +10:30
madd15 379f6bef6c catergories lang and serveral icons 2015-02-26 23:48:17 +10:30
madd15 e090762b5a Icon changes on hardware 2015-02-26 22:41:44 +10:30
madd15 9f3edd701b Fixes #565 - Soft Delete Models and Allow Restore
Allow models to be deleted and restored which in turn allows deleted
hardware to function when model is deleted.
2015-02-26 22:35:57 +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 3de1a8f96c Pre-release version in footer 2015-02-26 01:07:34 -08:00
snipe 5d71628927 Accessories title 2015-02-26 00:22:15 -08:00
snipe 323a607130 Indenting formatting 2015-02-26 00:22:02 -08:00
snipe 29863004e2 more small mobile fixes 2015-02-25 20:01:36 -08:00
snipe c2bbc1281c Mobile fixes 2015-02-25 19:30:37 -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 69a446af97 Font awesome 2015-02-25 17:51:01 -08:00
snipe 93b11c35d0 CSS updates 2015-02-25 17:50:21 -08:00
snipe cc3d007fa6 Use font-awesome for sidenav 2015-02-25 17:12:23 -08:00
snipe 8879bff160 Fixed bug for reporting on upload in dashboard 2015-02-25 16:48:42 -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
snipe 525a9225c8 Dashboard 2015-02-25 16:30:59 -08:00
snipe d55d9f5530 Merge pull request #562 from splaer/barcode-1
Barcode - Stage 1
2015-02-25 12:32:13 -08:00
Splaer cd7461a3a8 Missed files. Composer to add new package and organized the view page label 2015-02-25 15:08:12 -05:00
snipe ad39ec1dc3 Added markdown to EULA 2015-02-25 11:25:10 -08:00
snipe 2b83b52735 Disallow delete if lock_passwords is true 2015-02-25 10:49:03 -08:00
snipe 6ab95ff387 Prevent auth changes on demo 2015-02-25 10:37:39 -08:00
snipe 097bb38a23 Fixes #163 - accept acceptance + eula
TODO: Language strings, check that the accepting user is the one that should be allowed to accept.
2015-02-24 22:15:36 -08:00
snipe 4340d50071 Stil allow new user creation 2015-02-24 12:06:00 -08:00