2f4e54c8a6
Merge remote-tracking branch 'origin/develop'
2015-12-30 15:47:00 -08:00
7c06cba647
More LDAP login fixes
2015-12-30 14:53:49 -08:00
1d9e014bfa
More auth tweaks :(
2015-12-30 12:57:41 -08:00
506af72d83
Superadmin check in bulk delete users
2015-12-29 20:03:08 -08:00
a7a82e5fbc
Fixes #1541
2015-12-29 19:41:50 -08:00
23da312fff
Put deleted_at back in users collection for restore functionality
2015-12-29 19:35:31 -08:00
2888103d1a
More updates for #1433
...
This is a paired down version of the previous auth. Rather than trying to authenticatr with Sentry at every turn, check for valid LDAP and then once all those LDAP additions/updates are set, then try to auth with the credentials the user provided.
2015-12-29 19:12:22 -08:00
689832036e
Merge pull request #1517 from dmeltzer/for-asset-maintence-and-consum
...
Fix Asset Maintenance date and consumable counts
2015-12-29 15:10:14 -08:00
90340a7111
Merge pull request #1535 from dmeltzer/fix-1531-proper
...
Clear checkout and checkin fields when returning an asset.
2015-12-29 11:38:07 -08:00
8742bf26b4
Merge pull request #1521 from twistedR/enhancement/ldap-self-signed-cert-support
...
Add option to allow ignoring SSL Cert verification.
2015-12-29 11:34:07 -08:00
aeeb273d4c
Merge pull request #1423 from thehereward/develop
...
TidyUp: Remove unreachable code.
2015-12-29 10:15:36 -08:00
5f6ba2a148
Clear the expected checkin and last checkout dates when checking an item back in. Fixes #1531
2015-12-28 12:41:24 -05:00
0cb3a9265e
Fix PHPDocs that contained incorrect params tags.
2015-12-24 11:20:05 +00:00
96a5f437f2
Add option to allow ignoring SSL Cert verification.
2015-12-24 02:17:06 -05:00
50be3eed4a
Fix Two issues with Asset Maintenance.
...
1) If a start and end date were given when creating an asset, asset_maintenance_time was not set.
2) AssetMaintenancesController::getDataTable would return 'time' instead of 'asset_maintenance_time', causing the field not to display.
2015-12-23 20:02:20 -05:00
3b7da8f379
Fix consumable count in categories. This adds new methods to Category, consumables consumablesCount and a generic count. It also refactors CatgoriesController to use the count method rather than having it determine the category type.
2015-12-23 20:02:09 -05:00
5967dbae64
Company helper, updated bulk view to show model number
2015-12-22 11:39:42 -08:00
f42a3c8918
Added company to bulk edit
2015-12-22 11:12:26 -08:00
b76f014669
Better handling for invalid locations
2015-12-22 02:40:31 -08:00
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
ce1565a545
Re-commented mac address - bad merge :-/
2015-12-18 12:08:08 -05:00
ac5527e7d3
Merge branch 'hotfixes/custom_reports_fix' into develop
2015-12-18 12:06:35 -05:00
865468d091
Fix for location error
2015-12-18 12:06:11 -05:00
b20f4d245e
Fixes #1494 - uncommented mac_address fields
2015-12-17 20:09:47 -05:00
927c368235
Fix for weird location info in asset report
2015-12-17 19:37:20 -05:00
73f0a19adb
Fixes #1459 - fieldset_id error if null
2015-12-15 05:34:54 -08:00
e217d354dc
Fixed bug in strict mode for fieldsets
2015-12-15 04:14:19 -08:00
e1837069da
Allow bulk model update for #1462 , fixes #1442
2015-12-09 20:35:24 -08:00
25338c00e5
Fixes #1456 - email notification when asset requested
2015-12-09 01:40:13 -08:00
599ea20d65
Fixes #1449 - full link to order number
2015-12-09 01:06:25 -08:00
72f3b459c5
Merge branch 'hotfixes/user_import_company_id' into develop
...
Conflicts:
app/config/version.php
2015-12-08 23:00:27 -08:00
3d8733c612
Comment out company ID for now until we can handle it more smartly
2015-12-08 22:59:22 -08:00
cab1642ead
Small extra logging for LDAP
2015-12-08 21:06:54 -08:00
6aa3e21b4c
TidyUp: Surpress errors on unreachable statements with link to discussion on github.
2015-12-04 08:09:01 +00:00
b1e48b7054
More debugging
2015-12-03 13:33:28 -08:00
2686dd640c
Additional debugging info
2015-12-03 13:30:56 -08:00
bb7b8f3964
Show error if LDAP failed and local auth failed because user doesn't exist
2015-12-03 04:14:05 -08:00
5bed0bd7ed
Fixes #1437 - set expected checkout correctly
2015-12-03 03:14:29 -08:00
be3c8e4515
Fixes #1440 - make employee number searchable/sortable
2015-12-03 02:07:20 -08:00
784d1995d8
Added auth login log note
2015-12-03 02:06:34 -08:00
7802af837b
One more fix for LDAP and local users working together
2015-12-02 22:47:22 -08:00
6f8a76246e
LDAP fix for local users
2015-12-02 21:22:56 -08:00
66e9203b97
Save fieldset on create
2015-12-02 19:21:09 -08:00
b41461698d
Fix for error on asset create
2015-12-02 19:03:08 -08:00
3417d833ba
Save on create for custom fields
2015-12-02 17:12:17 -08:00
3944553bfc
Commented out show_mac_address field in model creation
2015-12-02 16:11:45 -08:00
3dc79197c3
Fix for LDAP error if username is wrong
2015-12-02 15:59:01 -08:00
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
e98020fa89
Starter UI improvements and localization for #1397
2015-12-01 17:26:20 -08:00
e88f5629df
Add new form partial and AJAX endpoint for custom fields.
2015-12-01 17:17:32 -08:00
snipe