Commit Graph

2818 Commits

Author SHA1 Message Date
snipe 750fc84592 Updated seeder with currency 2015-11-03 22:22:10 -08:00
snipe 2a43491792 Fixes #1291 on the asset view as well 2015-11-03 22:19:58 -08:00
snipe f4331f4498 Fixes #1291 - use location currency and fall back to defaul currency for asset maintenances 2015-11-03 22:04:57 -08:00
snipe a587b72c71 Fixed dumb indenting 2015-11-02 20:11:26 -08:00
snipe 0b0b55619b Fixes #1291 - Use current currency, or sane fallback 2015-11-02 20:06:06 -08:00
snipe a760a7575a Added user notes back in 2015-11-02 19:28:51 -08:00
snipe a86f0e6178 Bumped version 2015-11-02 19:27:23 -08:00
snipe 577c193661 Fixed bug in location import 2015-11-02 19:27:07 -08:00
snipe f147a0ff02 Fixed user table name 2015-11-02 19:26:33 -08:00
snipe 0745ec1502 Fixed scope for users 2015-11-02 19:26:10 -08:00
snipe 5bed0482b6 Bumped version 2015-11-02 19:17:33 -08:00
snipe 9731727095 Sorting for #1266 2015-11-02 19:17:20 -08:00
snipe 769fb13282 Search on manager name for #1266 2015-11-02 18:37:16 -08:00
snipe a9e1283a17 Added search on location parent for #1266 2015-11-02 18:36:49 -08:00
snipe 5bb94c4b4e Added fields to location assets display 2015-11-02 17:42:47 -08:00
snipe 67a113cbf4 Additional fields for location assets display 2015-11-02 17:41:58 -08:00
snipe d0eed67c42 Fixed relationship to return actual assets 2015-11-02 17:41:33 -08:00
snipe 9cc542aea9 Merge branch 'develop' of github.com:snipe/snipe-it into develop 2015-11-02 16:45:44 -08:00
snipe 725ca04ac8 Bumped version 2015-11-02 16:45:30 -08:00
snipe e07dcf2598 Added location detail view 2015-11-02 16:45:19 -08:00
snipe 712e415f4d Updated deleted seats language 2015-11-02 16:45:02 -08:00
snipe c8551367cb Moved sample file so people can't accidentally import it 2015-11-02 16:44:46 -08:00
snipe 5c820d49a6 Fixes #1305 2015-11-02 16:44:17 -08:00
snipe fbd79fc943 Merge pull request #1298 from MicaelRodrigues/snipeMike
Create user on the fly from sucessful LDAP authentication, if it does not already exist.
2015-10-30 16:22:12 -07:00
Micael Rodrigues b39944b2d7 Create user on the fly from sucessful LDAP authentication, if it does not already exists. 2015-10-28 23:01:45 +00:00
snipe e0fccc8fc9 Possible fix for #1296? Can't reproduce locally 2015-10-28 05:53:28 -07:00
snipe 76968f7d48 Fixes asset model table sorting 2015-10-28 03:23:55 -07:00
snipe 5436d54aa0 Fixes #1290 - datatable broken for assets in model 2015-10-28 02:10:04 -07:00
snipe b6f4080b97 Fixes consumable detail view 2015-10-26 14:36:55 -07:00
snipe 09bcb137c4 Ugly fix for preventing errors if there is an invalid model (therefore no category) 2015-10-23 21:22:42 -07:00
snipe 8ec6b7e03a Basic location ordering for #1266 2015-10-23 21:19:22 -07:00
snipe efddda8665 Fixed expected_checkin error on asset view 2015-10-23 18:28:06 -07:00
snipe 48e6ebe306 Make EOL not sortable anymore, since that sort doesn't work 2015-10-23 18:15:27 -07:00
snipe eb1335405b Order by last_checkout and expected_checkin for #1266 2015-10-23 17:59:21 -07:00
snipe 8a1ffb9014 Save de-normed values for last checkout and expected_checkin 2015-10-23 17:55:03 -07:00
snipe ec4b2f114d Merge pull request #1283 from snipe/features/checkout_time
Migration to add last_checkout and expected_checkin fields to Asset
2015-10-23 17:47:45 -07:00
Brady Wetherington 9a5edb3db7 Migration to add last_checkout and expected_checkin fields to Asset 2015-10-23 17:40:04 -07:00
snipe f0557f8e1c Added expected Checkin scope
Neither this nor the methd above actually work tho. Need to spend some time on the complex joins and sorting
2015-10-23 15:25:02 -07:00
snipe 2953b395f2 Added order number to allowed sort columns 2015-10-23 15:12:06 -07:00
snipe e9050826ec Added order number if one is being searched on 2015-10-23 14:49:58 -07:00
snipe 20e7888bd9 Fixed expected checkin on view 2015-10-23 14:36:20 -07:00
snipe e93b53ad4c Updated maintenance mode message 2015-10-23 14:35:42 -07:00
snipe 0a3843393d Addec expected_checkout, fixed language calls to use blade syntax 2015-10-23 14:35:31 -07:00
snipe 60f403f555 Expected checkin is a date, not a datetime 2015-10-23 14:29:00 -07:00
snipe cf49920564 Fixes #1235 - 24 hour format for log 2015-10-23 12:39:22 -07:00
snipe aaf2c6fbce Updated licenses and unaccepted assets to use bootstrap tables for #1266 2015-10-22 03:28:12 -07:00
snipe 9a63cbbd6c Removed download button 2015-10-22 03:22:59 -07:00
snipe 0aeab1ab7e Remove CSV export button 2015-10-22 03:13:30 -07:00
snipe 4c3a5a99df Use client-side bootstrap tables for reports 2015-10-22 03:11:34 -07:00
snipe 60370b9627 Added acceptance methods back in 2015-10-22 03:10:43 -07:00