Commit Graph

2833 Commits

Author SHA1 Message Date
snipe af5c221385 Updated language strings v2.0.5-pre 2015-11-04 03:42:37 -08:00
snipe feb74806a8 Removed models override 2015-11-04 01:08:17 -08:00
snipe 14ba5a3b77 Fixes #1310 - adds version hash to table name to prevent cookie issues for folks who pull from dev 2015-11-04 01:08:05 -08:00
snipe bc8c8e4225 Fixes #1012 - more consistency in manufacturer view 2015-11-04 00:48:53 -08:00
snipe dc64ad55ee Fixed link to manufacturers view 2015-11-04 00:37:43 -08:00
snipe 7e2b4183f6 Added in/out to categories 2015-11-04 00:37:27 -08:00
snipe 0a843fa856 OMFG really? 2015-11-04 00:18:22 -08:00
snipe 5a687f280f One more currency tweak 2015-11-04 00:15:35 -08:00
snipe 4b2e7b9b06 Fixes #1013 - show location name on asset view page 2015-11-04 00:13:48 -08:00
snipe 1ac41a72ec Link to asset in asset maintenance screen 2015-11-04 00:07:00 -08:00
snipe 6e117efebd Fixed dumb indenting 2015-11-03 23:58:12 -08:00
snipe 17207ddea1 Fixed table cookie name 2015-11-03 23:57:58 -08:00
snipe 130b1b4f4a Converted category asset listing to bootstrap tables for #1266 2015-11-03 23:57:31 -08:00
snipe 8a7981a4ae Updated currency array 2015-11-03 22:49:34 -08:00
snipe 90513b06f5 Removed duplicate UK/GB 2015-11-03 22:23:33 -08:00
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