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
5eb506b9c3
Bumped version
2015-12-30 12:57:55 -08:00
4aa376826f
Added dashboard back as string
2015-12-30 12:57: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
1ce205a579
Fixes #1502 - load tableexport and jquery base64 locally
2015-12-29 19:45:46 -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
faf2e464fa
Fixes #1526
2015-12-29 19:32:15 -08:00
79c5d3f7d6
Fixes #1537 and #1524
2015-12-29 19:21:54 -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
f89176d500
WTF I don't even.
2015-12-29 18:48:06 -08:00
76955ec064
Merge branch 'develop' of github.com:snipe/snipe-it into develop
2015-12-29 15:46:52 -08:00
de9a15a33b
Bumped version
2015-12-29 15:46:37 -08:00
f9cf2b2558
Updated translations
2015-12-29 15:46:20 -08:00
e4627cee96
Updated language
2015-12-29 15:41:18 -08:00
36eb51d6e4
Fixed typo in string
2015-12-29 15:41:05 -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
27962d5439
Merge branch 'develop' into docker_fix_2
2015-12-29 12:36:45 -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
4b92cdf684
Use the same values/calculations in the view as the index. Should fix #1140 I believe
2015-12-23 20:32:48 -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
90b00b02cc
Merge pull request #1516 from dmeltzer/develop
...
Add Company name to Asset Importer. Tested on one set of data.
2015-12-22 13:32:24 -08:00
9eee73d2e5
I accidentallyied a bracket.
2015-12-22 16:24:21 -05:00
6639bc1300
Fix overwriting of username if no first/last name
2015-12-22 13:21:51 -08:00
e272cab82f
Add Company name to Asset Importer. Tested on one set of data.
2015-12-22 16:13:30 -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
d3b3ed0d16
Merge branch 'develop' of github.com:snipe/snipe-it into develop
2015-12-22 10:56:37 -08:00
894579314c
s/([Qq])uanitity/\1uantity/g
2015-12-22 11:11:11 -05:00
b76f014669
Better handling for invalid locations
2015-12-22 02:40:31 -08:00
f03d1cd4cc
Simplified currency display until we can fix it on a broader level
2015-12-22 00:25:30 -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
eacd4ee2b0
Fix for bad data in asset report
2015-12-17 18:59:58 -05:00
8dab50edc6
Fixes #1498 - better regex for characters in custom field name
2015-12-17 18:19:35 -05:00
ee097dd1da
Bumped version
2015-12-15 05:36:04 -08:00
775ea95458
Fix inability to edit models (unique constraint)
2015-12-15 05:35:14 -08:00
73f0a19adb
Fixes #1459 - fieldset_id error if null
2015-12-15 05:34:54 -08:00
snipe