ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,491 Commits 84 Branches 293 Tags
04735f1affd2fdff9d6cf96ed583ece895cfb341
Commit Graph

277 Commits

Author SHA1 Message Date
snipe 04735f1aff Fixed assetlog display 2015-02-26 17:04:21 -08:00
snipe d33dcbbcb1 Fixed bad method call in accessories on delete 2015-02-26 16:17:25 -08:00
snipe 74a7b304c2 Limit categories to accessory categories 2015-02-26 16:09:40 -08:00
snipe afe2eb736c Added category type 2015-02-26 15:48:44 -08:00
snipe 47f1488acc Get the accessory pivot ID 2015-02-26 15:24:41 -08:00
madd15 8e9f7965c7 Reduces Queries on Model Index View 2015-02-27 08:44:41 +10:30
snipe a20e1f6943 Fixed attach to relation 2015-02-26 14:08:31 -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
madd15 15a7e205be Force Model Restore before Asset Restore 2015-02-27 07:33:48 +10:30
snipe 1ac401f0c0 Fixed EULA mail 2015-02-26 11:54:56 -08:00
snipe acedab5587 Checkout for accessories 2015-02-26 11:42:02 -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 eb5d4983de more model functionality and icons 2015-02-27 00:53:16 +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 54bad2e4f6 More accessory relationships 2015-02-26 03:19:45 -08:00
snipe 95fd96f29a Accessory checkout/checkin methods 2015-02-26 03:08:17 -08:00
snipe 8eaa70c39b Fixes #567 - bug in depreciation report csv export 2015-02-26 00:21:48 -08:00
snipe ca1351b704 Switched to all FA 2015-02-25 18:14:51 -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
Splaer 0ff0d18351 Functionality back to url view for the time being until other code is implemented 2015-02-25 15:52:24 -05:00
Splaer b2af455523 Merge conflict resolution. Added a use at the same line as remote. Fixed 2015-02-25 14:09:58 -05:00
Splaer 6d4f4c6064 Preparation for barcode goodness. Changed out library to one that supports all barcode types and not just QR. Prep branch for much bigger barcode things 2015-02-25 14:07:23 -05: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 e04ac89c5a Added expiring warrantee alerts 2015-02-24 02:07:33 -08:00
snipe 35cf5b3d60 Fixes #423 2015-02-23 18:46:04 -08:00
madd15 083cb1b5ec Fix activate for strict db 2015-02-20 10:26:46 +10:30
snipe 8b3e22b58e Fixes #546 - only insert data if values exist 2015-02-19 15:50:53 -08:00
madd15 f85061f988 Fix #541 - Headers not being skipped if checked 2015-02-20 09:54:55 +10:30
snipe f8e12cabd4 Fixes #476 - added logo upload and header color 2015-02-19 15:14:50 -08:00
snipe 87936a58fa CSV user import 2015-02-18 02:48:16 -08:00
snipe 38961298ed Fixes #439 - loads javascript and CSS locally 2015-02-17 15:29:57 -08:00
snipe 7b331b26d3 Language string for nothing updated on bulk update 2015-02-16 18:27:27 -08:00
snipe e02bea4275 Fixes #457 - added bulk options to hardware 2015-02-16 18:21:29 -08:00
snipe 24f5cdc743 Fixes #523 - added file uploads to assets 2015-02-16 13:49:51 -08:00
snipe f57c61dd4d Possible fix for #518 - license count issue 2015-02-12 12:25:22 -08:00
snipe fbf03b225d Fixes #509 - added MAC address as model option 2015-02-11 16:37:24 -08:00
snipe e343c157c5 Fixed naming conflict for requestable 2015-02-11 12:49:21 -08:00
snipe 80e10c4c98 Fixes #387 - sortable asset view by manufacturer 2015-02-11 04:57:59 -08:00
snipe 35a133bbf9 Fixes #382 - allow admins to restore deleted assets 2015-02-11 04:44:39 -08:00
snipe 9c3873e712 Category asset view 2015-02-11 03:50:16 -08:00
snipe 2b99adba5f Do not include trashed for user view 2015-02-11 00:43:50 -08:00
snipe 11aa98d389 Removed extra comments 2015-02-11 00:43:38 -08:00
snipe 591f97f149 Mark unassigned if deleted 2015-02-11 00:43:25 -08:00
snipe ef696f8207 Update licenses to assigned to null if deleted 2015-02-11 00:29:16 -08:00
snipe ab1c921443 Requestable assets views and controllers 2015-02-10 23:55:06 -08:00
snipe 34032c73ce Fixed licenses so null instead of 0 2015-02-10 20:47:11 -08:00
snipe f72b385790 Fix licenses so null instead of 0 2015-02-10 20:46:58 -08:00
snipe 1db1819a56 Added Archived as view for filter 2015-02-10 16:06:33 -08:00
snipe d2438f9fdb Fixes #502 - normalized statuses 2015-02-10 15:57:19 -08:00