e81fe52aa8
Merge branch 'hotfixes/asset_maintenances_create' into develop
2015-12-01 11:59:49 -08:00
74ed75dd24
Fixes #1426 - use Asset class for asset maintenances
2015-12-01 11:59:10 -08:00
3b42738a2d
Custom field enhancements for UI
2015-12-01 04:11:01 -08:00
65feb00ea4
Merge pull request #1420 from snipe/delete_custom_fields
...
Deletion support for fields and fieldsets
2015-12-01 03:12:41 -08:00
82a3560f27
Merge branch 'hotfixes/image_fix' into develop
2015-11-30 22:02:32 -08:00
e8ca98a37d
Fixes issue with assets without a model (which should never happen, but can occur from imports)
2015-11-30 22:01:42 -08:00
9316af7ed8
Deletion support for fields and fieldsets
2015-11-30 17:09:57 -08:00
fffc8ed644
Merge pull request #1412 from snipe/same_field_twice
...
Custom Fields - shouldn't be able to add the same field twice to the same fieldset
2015-11-29 17:25:11 -08:00
948e9c2a2b
Merge branch 'develop' into custom_fields_adminify
...
# Conflicts:
# app/routes.php
2015-11-29 17:24:26 -08:00
62fe4b8cd3
Merge branch 'hotfixes/1403' into develop
2015-11-29 17:20:42 -08:00
9b46a5b0f6
Fixes #1403 - hide checkout on asset model listing assets when nt deployable
2015-11-29 17:20:03 -08:00
8158c12242
Merge branch 'hotfixes/EOL' into develop
...
# Conflicts:
# app/controllers/admin/AssetsController.php
2015-11-29 17:11:55 -08:00
36ecf3032f
Fixes #1402 - remoe warranty date from EOL calc
2015-11-29 17:09:02 -08:00
19820db0cc
Fixes #1406 - Fixes link to suppliers delete
2015-11-29 16:55:30 -08:00
fc06caded5
Fixes #1406 - Fixes link to suppliers delete
2015-11-29 16:54:48 -08:00
a44c56c937
Merge branch 'hotfixes/fix_1413' into develop
...
# Conflicts:
# app/config/version.php
# app/models/Company.php
2015-11-29 16:49:34 -08:00
2accfab79e
Fixes #1413 - wrong link for manufacturers delete
2015-11-29 16:45:55 -08:00
418be7f5de
Fix to adding same custom field twice. Helps with #1397 . Requires
...
PR #1408 to be merged first.
2015-11-29 13:16:03 -08:00
beeb28bf09
Fix routes for custom fields, fix admin access. Helps with #1397
2015-11-28 18:18:53 -08:00
4f3cdc20f5
Start of moving custom fields to the /admin/ space
2015-11-26 13:47:09 -08:00
1efb1f7038
Remove MAC address fields since they are now custom fields
2015-11-26 13:42:13 -08:00
6708911d5d
Remove mac address (now custom field)
2015-11-26 13:33:01 -08:00
924f61fce9
Cache custom field listing for assets, custom fields are sortable
2015-11-25 16:09:16 -08:00
d653126a2a
Merge branch 'develop' into custom_fields
...
Conflicts:
app/controllers/admin/AssetsController.php
app/views/backend/hardware/index.blade.php
app/views/backend/hardware/view.blade.php
2015-11-25 14:22:22 -08:00
2195e27d61
Added company_list to license clone
2015-11-25 03:48:05 -08:00
9624388522
Added company_list to clone asset
2015-11-25 03:19:13 -08:00
dad1ffb355
Specify table name in select to prevent id overwriting
2015-11-25 02:38:13 -08:00
64eecc8df7
Added image to model listing view for #1370
2015-11-24 23:24:20 -08:00
632fa92f92
Fixes #1333 - hide checkout button if asset status is not deployable
2015-11-24 22:49:31 -08:00
99391d0179
Fixes #1332 - added location to accessories
2015-11-24 22:43:13 -08:00
d34e7178b3
Order consumable assignments by most recent
2015-11-24 22:18:28 -08:00
0428d21c5e
Order consumable assignments by most recent
2015-11-24 22:18:16 -08:00
d8b43215b0
Fix for missing admin ID
2015-11-24 22:00:29 -08:00
b39c53a5ea
Closes #1375 - More data in consumables detail view
2015-11-24 21:58:30 -08:00
67e968b032
Fixed attach() timestamps
2015-11-24 21:52:29 -08:00
535263788d
Fixed dumb indenting
2015-11-24 20:20:34 -08:00
c8c755f8c3
Fixed filename renaming
2015-11-24 19:38:13 -08:00
e910b532c7
Account for invalid categories
2015-11-24 13:31:54 -08:00
a777499c0b
Fixes #1376 - added new fields to consumables view
2015-11-24 13:30:05 -08:00
b99c138cb0
Fixes #1369 - fixed searching/sorting on location
2015-11-24 12:48:41 -08:00
cbb2151f1a
Allow re-use of usernames
2015-11-24 12:29:25 -08:00
256f33e6b4
Company/category search on accessories
2015-11-24 12:08:49 -08:00
f6e2654609
Added searching on company name, ordering on company name for PR #1321
2015-11-24 11:47:34 -08:00
120c8394bb
Fixes #1380 - groups pagination
2015-11-23 19:18:00 -08:00
61107769e8
Add user ID and make company name hidden by default
2015-11-23 15:18:10 -08:00
4ae02c1fb3
Merge pull request #1321 from Ahimta/multiple-companies
...
Add support for multiple companies
2015-11-23 14:40:37 -08:00
9ec132acde
Small fixed for LDAP in settings table
2015-11-23 14:33:00 -08:00
840e5b1523
Revert "begin work on idap import button"
...
This reverts commit 3942fd1869
2015-11-22 11:10:36 -05:00
1ee3f29d2e
Revert "working on ldap import button"
...
This reverts commit 113dfc9c24
2015-11-22 11:02:19 -05:00
5445a7d16b
Scope users like other companyables
...
Note that the User model doesn't use global scope,
global models can have unexpected results that
would very likely break many parts of the application
2015-11-21 11:23:42 +03:00
snipe