Commit Graph

317 Commits

Author SHA1 Message Date
snipe 80d2347095 Better label layout 2015-03-20 12:38:39 -07:00
snipe fa794d7a15 Basic QR code printing 2015-03-19 18:06:50 -07:00
madd15 8af799614e Update for dataTables 2015-03-19 16:52:52 +10:30
madd15 abf91c7b29 Update for dataTables 2015-03-19 16:08:38 +10:30
madd15 61d916d94d Update for dynamic mac address field 2015-03-19 09:43:34 +10:30
madd15 161d72390b Update edit for notes field 2015-03-18 16:50:15 +10:30
snipe 139d206413 Select specific fields so Chumper has a smaller collection to parse 2015-03-17 18:05:01 -07:00
snipe a341db4cf7 Prevent delete when password lock is active 2015-03-17 17:29:48 -07:00
madd15 fdb92a2012 Change to use eager loaded userloc not assetloc 2015-03-18 10:50:52 +10:30
Madd15 c14761b9a1 Re-fix button not showing 2015-03-18 10:27:04 +10:30
madd15 9edcc39de2 Fix restore button now showing 2015-03-18 10:15:57 +10:30
snipe 94afe20c20 Removed throttle eager load, added userlocation 2015-03-17 16:36:20 -07:00
snipe c00086c740 Fix eager loading for user throttle 2015-03-17 15:36:11 -07:00
snipe c2c0196a3d Eager loading managers, licenses 2015-03-17 14:58:15 -07:00
snipe 46c1f2a28b Server side datatables for user view - needs fix for deleted users 2015-03-16 17:33:41 -07:00
snipe 77fd73bc1b Merge remote-tracking branch 'origin/features/chumper-datatables' into develop 2015-03-16 14:49:51 -07:00
snipe 6f38f76e4a Haha - TOTALLY cheated. But it works. Fixed ordering for linked names 2015-03-14 02:45:49 -07:00
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
madd15 f33844d4af move status around to match view 2015-03-13 13:01:30 +10:30
snipe cb171bcac5 Fixes #645 - adds zip and rar to filetype 2015-03-12 13:25:28 -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