Commit Graph

156 Commits

Author SHA1 Message Date
snipe 1601bdd4eb Added rtd_location_id back into selected columns 2015-07-02 16:52:08 -07:00
snipe 62f8d002e3 Temp commented out some stuff 2015-06-30 22:05:21 -07:00
snipe c3c4e9def2 Fixes #852 - localized string for file types, added zip and rar for asset upload 2015-06-16 12:54:53 -07:00
snipe c69038d3ae Fixes #836 2015-06-09 02:00:55 -07:00
snipe 1137768f84 Escape notes 2015-04-30 19:23:41 -07:00
snipe 5f6925858b Richer slack integrations 2015-04-30 18:54:34 -07:00
snipe 3c00f38a0f Slack integration for asset checkin/checkout 2015-04-29 17:38:22 -07:00
snipe a0fce2e0fb Fixes #766
Should be refactored to make the Action logger into a base class and to use polymorphic relationships for the IDs, and migrate accessory_id into asset_id in the log table. This was quick and dirty.
2015-04-29 16:14:08 -07:00
Fei Song 1c2e5ecc0f Remove space after concat to fix SQL FUNCTION CONCAT NOT EXIST error 2015-04-28 15:19:00 +08:00
snipe e88a81141f Added view link to asset tag, since some assets won't have names 2015-04-02 15:40:41 -07:00
snipe 33e7ce6761 Fixes for #722 localization 2015-04-02 14:28:11 -07:00
snipe 0a734d8502 Missing semicolons 2015-04-01 15:44:13 -07:00
madd15 46781c94cd Fix #715 - Missing $modelCheck api call 2015-04-02 09:10:07 +10:30
snipe 5d946b19cb Fixed checkmodel at route level 2015-03-27 17:44:49 -07:00
snipe 605d0ed8e1 Moved checkModel into model from controller 2015-03-27 13:45:37 -07:00
snipe 8685e90513 Merge pull request #689 from madd15/feat/more-tables
Convert to Datatables - Models, Categories and Accessories
2015-03-24 18:45:34 -07:00
madd15 7881e70afb Update Model Check in Hardware Edit and move to API 2015-03-25 12:03:45 +10:30
snipe 35bbea3052 Fixes #688 - show model if no asset name 2015-03-24 17:08:15 -07:00
madd15 2c6597c5fb Add deleted_at to select array for datatable 2015-03-23 18:17:41 +10:30
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 61d916d94d Update for dynamic mac address field 2015-03-19 09:43:34 +10:30
snipe 139d206413 Select specific fields so Chumper has a smaller collection to parse 2015-03-17 18:05:01 -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 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
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