Commit Graph

594 Commits

Author SHA1 Message Date
madd15 e9ac0a3209 update icon 2015-03-10 13:30:31 +10:30
madd15 efebfe3a13 update icon 2015-03-10 13:29:57 +10:30
madd15 472b7056c9 update icons 2015-03-10 13:28:50 +10:30
madd15 984ef44a43 update icons 2015-03-10 13:28:27 +10:30
madd15 94e8ca0c86 update icons 2015-03-10 13:27:02 +10:30
madd15 58a8d2f077 update create to correct + 2015-03-10 13:24:06 +10:30
rashivkp f62f22b4bf ref #599. showing groups in user detail view. fixes a small design bug
with group edit view
2015-03-09 02:01:02 +05:30
snipe f27fb90457 Allow override of checkin/checkout date
TODO: fix error if someone enters non-date text
2015-03-04 18:59:45 -08:00
snipe 4076b29b63 Support for DATAMATRIX and PDF417 barcodes 2015-03-04 17:43:53 -08:00
snipe 817384b761 Fixes #597 - print-friendly view on users 2015-03-04 17:06:07 -08:00
snipe 3f9d9f23d5 Fixes #280 - updated link to use config url 2015-03-04 16:10:51 -08:00
snipe 7d5ee9750f Added #596 fix for accessories 2015-03-04 15:21:31 -08:00
snipe 1c333e4a24 Fixes #596 - better routes for checking in multiple items from user 2015-03-04 15:15:38 -08:00
snipe 2540e90c37 Fixes #605 - hides user requestable view from admins 2015-03-04 14:01:47 -08:00
snipe 61b04d6e40 Fixes #579 - user cannot accept more than once 2015-03-01 16:35:32 -08:00
snipe ac23e8fd02 Removed line 2015-03-01 15:16:38 -08:00
snipe 6bb3f222ea Hash version for settings page 2015-02-28 15:21:44 -08:00
snipe d7b7a3a4a8 Better version output 2015-02-28 15:18:31 -08:00
snipe b986b3276c Dynamic version number on settings and footer 2015-02-28 14:59:03 -08:00
snipe 7047af44f6 Fixed layout for remember me button 2015-02-28 13:30:14 -08:00
snipe 2d5e9b6ea5 Removed dummy text 2015-02-28 13:11:05 -08:00
snipe 9b42d3a4fc Bumped version number 2015-02-28 12:27:22 -08:00
snipe 715fc3fa9b Bumped version for release 2015-02-26 19:17:06 -08:00
snipe 5ec91ef5fc Removed test url 2015-02-26 18:56:30 -08:00
snipe 30db9a2943 Unified asset/accessory acceptance 2015-02-26 18:42:39 -08:00
snipe 1273c4ca87 EULA/req improvements 2015-02-26 18:20:52 -08:00
snipe cb73d81d5b Smaller buttons 2015-02-26 17:23:03 -08:00
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 1ac401f0c0 Fixed EULA mail 2015-02-26 11:54:56 -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