 Daniel Dreier
|
0c27717c20
|
Added check and error message for trying to accept an asset that was not
checked out to that user.
|
2015-12-18 14:51:51 -06:00 |
|
|
snipe
|
ce1565a545
|
Re-commented mac address - bad merge :-/
|
2015-12-18 12:08:08 -05:00 |
|
|
snipe
|
ac5527e7d3
|
Merge branch 'hotfixes/custom_reports_fix' into develop
|
2015-12-18 12:06:35 -05:00 |
|
|
snipe
|
865468d091
|
Fix for location error
|
2015-12-18 12:06:11 -05:00 |
|
|
snipe
|
b20f4d245e
|
Fixes #1494 - uncommented mac_address fields
|
2015-12-17 20:09:47 -05:00 |
|
|
snipe
|
927c368235
|
Fix for weird location info in asset report
|
2015-12-17 19:37:20 -05:00 |
|
|
snipe
|
73f0a19adb
|
Fixes #1459 - fieldset_id error if null
|
2015-12-15 05:34:54 -08:00 |
|
|
snipe
|
e217d354dc
|
Fixed bug in strict mode for fieldsets
|
2015-12-15 04:14:19 -08:00 |
|
|
snipe
|
e1837069da
|
Allow bulk model update for #1462, fixes #1442
|
2015-12-09 20:35:24 -08:00 |
|
|
snipe
|
25338c00e5
|
Fixes #1456 - email notification when asset requested
|
2015-12-09 01:40:13 -08:00 |
|
|
snipe
|
599ea20d65
|
Fixes #1449 - full link to order number
|
2015-12-09 01:06:25 -08:00 |
|
|
snipe
|
72f3b459c5
|
Merge branch 'hotfixes/user_import_company_id' into develop
Conflicts:
app/config/version.php
|
2015-12-08 23:00:27 -08:00 |
|
|
snipe
|
3d8733c612
|
Comment out company ID for now until we can handle it more smartly
|
2015-12-08 22:59:22 -08:00 |
|
|
snipe
|
cab1642ead
|
Small extra logging for LDAP
|
2015-12-08 21:06:54 -08:00 |
|
|
snipe
|
b1e48b7054
|
More debugging
|
2015-12-03 13:33:28 -08:00 |
|
|
snipe
|
2686dd640c
|
Additional debugging info
|
2015-12-03 13:30:56 -08:00 |
|
|
snipe
|
bb7b8f3964
|
Show error if LDAP failed and local auth failed because user doesn't exist
|
2015-12-03 04:14:05 -08:00 |
|
|
snipe
|
5bed0bd7ed
|
Fixes #1437 - set expected checkout correctly
|
2015-12-03 03:14:29 -08:00 |
|
|
snipe
|
be3c8e4515
|
Fixes #1440 - make employee number searchable/sortable
|
2015-12-03 02:07:20 -08:00 |
|
|
snipe
|
784d1995d8
|
Added auth login log note
|
2015-12-03 02:06:34 -08:00 |
|
|
snipe
|
7802af837b
|
One more fix for LDAP and local users working together
|
2015-12-02 22:47:22 -08:00 |
|
|
snipe
|
6f8a76246e
|
LDAP fix for local users
|
2015-12-02 21:22:56 -08:00 |
|
|
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
|
3dc79197c3
|
Fix for LDAP error if username is wrong
|
2015-12-02 15:59:01 -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 |
|