 snipe
|
66e9203b97
|
Save fieldset on create
|
2015-12-02 19:21:09 -08:00 |
|
|
snipe
|
b41461698d
|
Fix for error on asset create
|
2015-12-02 19:03:08 -08:00 |
|
|
snipe
|
3417d833ba
|
Save on create for custom fields
|
2015-12-02 17:12:17 -08:00 |
|
|
snipe
|
3944553bfc
|
Commented out show_mac_address field in model creation
|
2015-12-02 16:11:45 -08:00 |
|
|
snipe
|
6e78fc0a2d
|
Merge pull request #1427 from snipe/ajax_custom_fields_asset
Add new form partial and AJAX endpoint for custom fields.
|
2015-12-01 17:27:11 -08:00 |
|
|
snipe
|
e98020fa89
|
Starter UI improvements and localization for #1397
|
2015-12-01 17:26:20 -08:00 |
|
|
Brady Wetherington
|
e88f5629df
|
Add new form partial and AJAX endpoint for custom fields.
|
2015-12-01 17:17:32 -08:00 |
|
|
snipe
|
475fc4855c
|
Merge pull request #1414 from madd15/patch-6
Fix incorrect routes for update and delete in Asset Maintenance
|
2015-12-01 14:38:17 -08:00 |
|
|
madd15
|
edb2a0b1b7
|
Readd <nobr>
|
2015-12-02 07:49:47 +10:30 |
|
|
snipe
|
e81fe52aa8
|
Merge branch 'hotfixes/asset_maintenances_create' into develop
|
2015-12-01 11:59:49 -08:00 |
|
|
snipe
|
74ed75dd24
|
Fixes #1426 - use Asset class for asset maintenances
|
2015-12-01 11:59:10 -08:00 |
|
|
snipe
|
3b42738a2d
|
Custom field enhancements for UI
|
2015-12-01 04:11:01 -08:00 |
|
|
snipe
|
65feb00ea4
|
Merge pull request #1420 from snipe/delete_custom_fields
Deletion support for fields and fieldsets
|
2015-12-01 03:12:41 -08:00 |
|
|
snipe
|
82a3560f27
|
Merge branch 'hotfixes/image_fix' into develop
|
2015-11-30 22:02:32 -08:00 |
|
|
snipe
|
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 |
|
|
Brady Wetherington
|
9316af7ed8
|
Deletion support for fields and fieldsets
|
2015-11-30 17:09:57 -08:00 |
|
|
madd15
|
bb83a14707
|
Fix incorrect routes for update and delete
|
2015-11-30 12:41:37 +10:30 |
|
|
snipe
|
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 |
|
|
snipe
|
948e9c2a2b
|
Merge branch 'develop' into custom_fields_adminify
# Conflicts:
# app/routes.php
|
2015-11-29 17:24:26 -08:00 |
|
|
snipe
|
62fe4b8cd3
|
Merge branch 'hotfixes/1403' into develop
|
2015-11-29 17:20:42 -08:00 |
|
|
snipe
|
9b46a5b0f6
|
Fixes #1403 - hide checkout on asset model listing assets when nt deployable
|
2015-11-29 17:20:03 -08:00 |
|
|
snipe
|
8158c12242
|
Merge branch 'hotfixes/EOL' into develop
# Conflicts:
# app/controllers/admin/AssetsController.php
|
2015-11-29 17:11:55 -08:00 |
|
|
snipe
|
36ecf3032f
|
Fixes #1402 - remoe warranty date from EOL calc
|
2015-11-29 17:09:02 -08:00 |
|
|
snipe
|
19820db0cc
|
Fixes #1406 - Fixes link to suppliers delete
|
2015-11-29 16:55:30 -08:00 |
|
|
snipe
|
fc06caded5
|
Fixes #1406 - Fixes link to suppliers delete
|
2015-11-29 16:54:48 -08:00 |
|
|
snipe
|
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 |
|
|
snipe
|
2accfab79e
|
Fixes #1413 - wrong link for manufacturers delete
|
2015-11-29 16:45:55 -08:00 |
|
|
Brady Wetherington
|
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 |
|
|
Brady Wetherington
|
beeb28bf09
|
Fix routes for custom fields, fix admin access. Helps with #1397
|
2015-11-28 18:18:53 -08:00 |
|
|
Brady Wetherington
|
4f3cdc20f5
|
Start of moving custom fields to the /admin/ space
|
2015-11-26 13:47:09 -08:00 |
|
|
snipe
|
1efb1f7038
|
Remove MAC address fields since they are now custom fields
|
2015-11-26 13:42:13 -08:00 |
|
|
snipe
|
6708911d5d
|
Remove mac address (now custom field)
|
2015-11-26 13:33:01 -08:00 |
|
|
Brady Wetherington
|
924f61fce9
|
Cache custom field listing for assets, custom fields are sortable
|
2015-11-25 16:09:16 -08:00 |
|
|
Brady Wetherington
|
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 |
|
|
snipe
|
2195e27d61
|
Added company_list to license clone
|
2015-11-25 03:48:05 -08:00 |
|
|
snipe
|
9624388522
|
Added company_list to clone asset
|
2015-11-25 03:19:13 -08:00 |
|
|
snipe
|
dad1ffb355
|
Specify table name in select to prevent id overwriting
|
2015-11-25 02:38:13 -08:00 |
|
|
snipe
|
64eecc8df7
|
Added image to model listing view for #1370
|
2015-11-24 23:24:20 -08:00 |
|
|
snipe
|
632fa92f92
|
Fixes #1333 - hide checkout button if asset status is not deployable
|
2015-11-24 22:49:31 -08:00 |
|
|
snipe
|
99391d0179
|
Fixes #1332 - added location to accessories
|
2015-11-24 22:43:13 -08:00 |
|
|
snipe
|
d34e7178b3
|
Order consumable assignments by most recent
|
2015-11-24 22:18:28 -08:00 |
|
|
snipe
|
0428d21c5e
|
Order consumable assignments by most recent
|
2015-11-24 22:18:16 -08:00 |
|
|
snipe
|
d8b43215b0
|
Fix for missing admin ID
|
2015-11-24 22:00:29 -08:00 |
|
|
snipe
|
b39c53a5ea
|
Closes #1375 - More data in consumables detail view
|
2015-11-24 21:58:30 -08:00 |
|
|
snipe
|
67e968b032
|
Fixed attach() timestamps
|
2015-11-24 21:52:29 -08:00 |
|
|
snipe
|
535263788d
|
Fixed dumb indenting
|
2015-11-24 20:20:34 -08:00 |
|
|
snipe
|
c8c755f8c3
|
Fixed filename renaming
|
2015-11-24 19:38:13 -08:00 |
|
|
snipe
|
e910b532c7
|
Account for invalid categories
|
2015-11-24 13:31:54 -08:00 |
|
|
snipe
|
a777499c0b
|
Fixes #1376 - added new fields to consumables view
|
2015-11-24 13:30:05 -08:00 |
|
|
snipe
|
b99c138cb0
|
Fixes #1369 - fixed searching/sorting on location
|
2015-11-24 12:48:41 -08:00 |
|