Commit Graph

670 Commits

Author SHA1 Message Date
Wahlstedt, Walter 50ea6c66f9 LDAP Settings update
update ldap field names
add ldap fields to controllers
add ldap fields to migration
add lang fields
update edit page
2015-11-16 11:30:51 -05:00
Walter 30e8555148 updating users controller to work with database fields 2015-11-15 22:48:56 -05:00
Walter d9cd4a4da0 setting up views for ldap 2015-11-11 23:03:46 -05:00
Walter ecae451ebf form validation 2015-11-09 22:34:18 -05:00
Walter 9627f15412 update settings controller to add ldap field validation 2015-11-09 22:32:00 -05:00
Walter 464f11c398 setting up bones for ldap settings
add migration
add ldap settings to settings controller
add ldap fields edit settings views
2015-11-09 22:09:09 -05:00
snipe 306d8ebaf7 Fixes #1317 - regression issue in bulk delete 2015-11-07 15:40:25 -08:00
Michael T 11c2fcd094 Remove new window target 2015-11-04 16:10:27 -07:00
Michael T b856e7f2c6 Make Model column a hyperlink to access the model page. 2015-11-04 15:55:41 -07:00
snipe feb74806a8 Removed models override 2015-11-04 01:08:17 -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 130b1b4f4a Converted category asset listing to bootstrap tables for #1266 2015-11-03 23:57:31 -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 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 0745ec1502 Fixed scope for users 2015-11-02 19:26:10 -08:00
snipe 9731727095 Sorting for #1266 2015-11-02 19:17:20 -08:00
snipe 67a113cbf4 Additional fields for location assets display 2015-11-02 17:41:58 -08:00
snipe e07dcf2598 Added location detail view 2015-11-02 16:45:19 -08:00
snipe 5c820d49a6 Fixes #1305 2015-11-02 16:44:17 -08:00
snipe 76968f7d48 Fixes asset model table sorting 2015-10-28 03:23: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 eb1335405b Order by last_checkout and expected_checkin for #1266 2015-10-23 17:59:21 -07:00
snipe 2953b395f2 Added order number to allowed sort columns 2015-10-23 15:12:06 -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 a3f5dc331d Fixes #1007 and #1053 2015-10-22 02:11:39 -07:00
snipe 1bdd5886e6 Select * because reasons 2015-10-21 23:58:07 -07:00
madd15 79a69d7633 return getEdit to correct method 2015-10-22 17:10:02 +10:30
snipe 4cb19d1aae More eager loading, pass $statuslabel_types to view 2015-10-21 23:31:28 -07:00
snipe c91113ac95 Eager load accessories 2015-10-21 23:25:33 -07:00
snipe eb5649d0b3 Eager load assets 2015-10-21 23:25:23 -07:00
snipe f06af97364 Account for no limit or offset passed 2015-10-21 23:23:22 -07:00
snipe bd418d1422 Eager load some models 2015-10-21 23:17:22 -07:00
snipe 440bc1a4b4 Fixes bug in people display 2015-10-21 23:15:35 -07:00
snipe dba7983189 Added new fields to index view 2015-10-21 23:07:23 -07:00
snipe 5ff75e7f42 Merge remote-tracking branch 'origin/develop-bootstrap-tables-integration' into develop
# Conflicts:
#	app/controllers/admin/CategoriesController.php
#	app/views/backend/accessories/view.blade.php
#	app/views/backend/categories/index.blade.php
#	app/views/backend/settings/edit.blade.php
2015-10-21 23:06:43 -07:00
snipe 69c95f1f73 Merge pull request #1225 from ddreier/1088-acc-prices
Accessory and Consumable Price info #1088
2015-10-21 22:44:14 -07:00
snipe 30bbc9ad46 Merge pull request #1238 from Miliamber/develop
Added fixed icon width in navbar and new branding options
2015-10-21 22:43:30 -07:00
snipe 9d6608c8f1 Asset maintenances for #1266 2015-10-21 22:19:02 -07:00