859c53e975
Merge remote-tracking branch 'origin/master' into develop
2016-05-23 20:56:28 -07:00
3ab828a4cd
Make licenses sortable by name, serial
2016-05-23 20:55:41 -07:00
b855f2fa2b
Merge pull request #1986 from TahsinAbrar/develop
...
on forget password, show error message if user not found with email
2016-05-20 13:51:39 -07:00
390de7ae36
Merge remote-tracking branch 'origin/develop'
2016-05-16 21:55:19 -07:00
588f0a23ba
Updated language strings
2016-05-16 21:55:05 -07:00
d40129bdae
Merge remote-tracking branch 'origin/develop'
...
# Conflicts:
# Dockerfile
2016-05-16 20:55:08 -07:00
54f3c65624
Fixes #1634 - better handling for category listings that are not asset categories
2016-05-16 20:53:51 -07:00
f0a589f150
on forget password, show error message if user not found with email
2016-04-24 17:55:32 +06:00
cf5fcdf9d7
Merge pull request #1826 from richardhofman6/ldap-import-pagination
...
Added LDAP pagination for user import.
2016-03-25 01:37:45 -07:00
6020de6321
Fix hard to exploit stored XSS possibility: code wrongly expected people to only be able to submit entries from <select>
2016-03-13 14:25:46 +01:00
23431fafd9
Added LDAP pagination for user import.
2016-03-08 19:39:39 +13:00
9bb2ffcf9a
Skip escaping on permissons array
2016-02-16 10:36:26 -08:00
a78874d986
Fixes #1768 - XSS vulnerability in user create/display
2016-02-16 10:33:25 -08:00
e5b2163ffe
Use helper for company selectlist, added missing language strings
2016-02-12 14:08:35 -08:00
98db6fe9df
Fixes #1741 - adds serial to checkout email
2016-02-09 14:23:45 -08:00
771e21d9f7
Fixes #832 - show activated status in user listing
2016-01-27 21:02:18 -08:00
3fd9df62f4
Redirect back to user listing on save
2016-01-27 20:48:34 -08:00
e70dab64a2
Fixes #1686 - added notes to model
2016-01-27 20:39:19 -08:00
0896ca6517
Fixes #1670 - first name validates for one letter
2016-01-22 10:40:16 -08:00
28b89f3ddb
Use location list helper for dropdown
2016-01-15 15:21:34 -08:00
0d3a4813ce
Fixes #1631 - delete image on asset edit
2016-01-13 18:00:06 -08:00
77632cdfb0
Allow optional status change on checkin
2016-01-13 08:04:52 -08:00
1908499379
Fixes #1626 - correctly show deleted models
2016-01-13 07:34:02 -08:00
7da0ffc325
Fixes #1623 - disallow admins to edit permissions on users
2016-01-13 06:51:56 -08:00
b30edfd9d6
Use locations dropdown
2016-01-13 04:50:55 -08:00
4c4e0ce5c5
Get assetlog with user
2016-01-13 03:58:01 -08:00
76220b7884
Fixes #1601 - bulk update now honors un-requestable
2016-01-12 20:00:51 -08:00
bb88b85a02
Removed erroneous blade that led to confusing UX
2016-01-11 18:48:49 -08:00
dad816ba25
Removed debugging echo
2016-01-11 18:48:33 -08:00
4037200fad
Additional fields for user import
2016-01-11 18:39:40 -08:00
9800786485
Fixes #1597 and allows non-numeric employee number
2016-01-11 18:16:52 -08:00
3e2fc13af5
Updated the LDAP import to get the correct email field setting.
2016-01-07 10:03:42 -06:00
962e7531a6
Fix for changing asset model from model with custom fields to one without
2016-01-06 18:04:55 -08:00
d7b91d88d6
Allow setting 'no custom fields' from having a customfieldset enabled
...
in a model.
2016-01-05 13:53:09 -08:00
6f04cf9f61
Merge pull request #1554 from snipe/final_custom_fields_tweaks
...
Final custom fields tweaks
2015-12-30 16:32:16 -08:00
4cb0e40abb
Eager-Load CustomFieldsets and CustomFields with relations
2015-12-30 16:08:40 -08:00
ad144e127c
Pertains to one of the elements in #1397 - timestamps and user_id's for Custom Fields
2015-12-30 15:58:51 -08:00
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
snipe