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

292 Commits

Author SHA1 Message Date
snipe 96e40721b2 Added type to query 2015-03-13 16:50:12 -07:00
snipe 5e5b32e060 Enabled state saving (not working yet, not sure why) 2015-03-12 22:18:43 -07:00
snipe 662c3f04dd Added proper sort 2015-03-12 22:09:18 -07:00
snipe 2cdfeacc1b Get ssets page to render with ajax datatables 2015-03-12 21:42:24 -07:00
snipe b2af86230a Added fields 2015-03-12 19:52:03 -07:00
snipe b92e46180c Merge branch 'develop' of github.com:snipe/snipe-it into features/chumper-datatables 2015-03-12 13:24:22 -07:00
snipe 62d5ed48f0 Fixes #645 - added zip/rar to filetypes 2015-03-12 13:24:07 -07:00
madd15 33dd59fb81 Fix #637 - Remove Deleted Models from drop down 2015-03-12 09:09:35 +10:30
snipe 6a89728380 First shot at datatables for assets 2015-03-10 15:06:24 -07:00
snipe 7d339624b8 Handle non-date strings 2015-03-04 20:27:21 -08:00
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 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 1273c4ca87 EULA/req improvements 2015-02-26 18:20:52 -08:00
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