Commit Graph

127 Commits

Author SHA1 Message Date
snipe ab0a8b3b61 Added bulk edit back in (it looks like ass right now) 2015-03-14 02:09:21 -07:00
snipe 4243710378 Added location to new assets view 2015-03-14 01:30:12 -07:00
madd15 1f0625cfa1 Better way for locations that works 2015-03-14 15:38:19 +10:30
madd15 5e4175723c Make Location work 2015-03-14 15:22:42 +10:30
madd15 5db853dbdd Move Model And Add Location 2015-03-14 15:19:57 +10:30
snipe 2244c60499 Added category to output 2015-03-13 20:32:47 -07:00
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
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 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
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 35cf5b3d60 Fixes #423 2015-02-23 18:46:04 -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 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 35a133bbf9 Fixes #382 - allow admins to restore deleted assets 2015-02-11 04:44:39 -08:00
snipe 591f97f149 Mark unassigned if deleted 2015-02-11 00:43:25 -08:00
snipe ab1c921443 Requestable assets views and controllers 2015-02-10 23:55:06 -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
snipe 614396a15b Utilize query scopes for cleaner controllers 2015-02-08 16:02:35 -08:00
snipe 950567e9d6 Fixes issue related to #471 - assigning to user ID 0 causes erro 2015-01-23 15:38:39 -08:00
snipe 4a77dee79c Fixes #447 - added asset log entry on save 2015-01-22 14:16:09 -08:00
Svpernova09 80d8432c35 Check the optional parameter and if there is a value, grab that model and pass along to the view. Refactored the view return to be easier to read and able to interject if our parameter was set. 2014-12-03 14:05:42 -06:00
snipe 89a2b87e42 Fixes #367 - added model number to dropdown 2014-11-21 05:20:08 -05:00
snipe d6a0249c60 Fixed #373 - added ability to auto-increment asset tags 2014-11-20 18:28:45 -05:00
madd15 1024816313 Fix #377 - Checkout users last_name, first_name 2014-11-21 08:47:19 +10:30
Madd15 432e348e56 Add Report Controller and License Report 2014-11-12 12:02:55 +10:30
madd15 b2d5dc9ec5 Fix #342 2014-11-07 07:52:44 +10:30
snipe cff24309a1 Possibly fixes #343 2014-11-06 15:21:54 -05:00
snipe 122b3d89d9 Added assetlog to other status types 2014-11-05 16:11:07 -05:00
madd15 ac5fa1641e Add assetlog to Deployed Loading 2014-11-06 07:35:49 +10:30
snipe 7c16dd8c92 Eager loading on other status types 2014-11-05 15:57:10 -05:00
snipe e04cc806d9 Fixes #327 2014-11-05 15:16:22 -05:00
snipe 2bee522a7c Included defaultLoc to assets view 2014-11-04 19:23:11 -05:00