Commit Graph

2431 Commits

Author SHA1 Message Date
Aladin Alaily 960be7c5ae Replace hardcoded location with a user selection. 2015-08-21 10:40:18 -04:00
Aladin Alaily 0b5f83fc56 add a drop down of locations 2015-08-21 10:39:45 -04:00
snipe 89564b3d2a Merge pull request #1099 from kobie-chasehansen/fix-for-#1098
fix for #1098
2015-08-20 21:39:00 -07:00
Chase Hansen 610392777b fix 2015-08-21 00:30:55 -04:00
snipe e916fdcc89 Fixes #1092, setting LDAP_OPT_REFERRALS to 0 for Active Directory 2015-08-20 15:54:42 -07:00
snipe 70f7f65394 Fixed path for windows 2015-08-20 15:38:50 -07:00
snipe 8892feea62 Fixed typo 2015-08-20 15:38:35 -07:00
snipe c7b0ecfac8 Slack notification for requested assets v2.0-RC-1 2015-08-19 17:51:35 -07:00
snipe d47198086f Added notes search to licenses 2015-08-19 17:23:55 -07:00
snipe 89f7f50901 Merge pull request #1074 from mtucker6784/develop
Installer modified for 2.0 (develop currently)
2015-08-19 17:16:53 -07:00
snipe 8339dd3db2 Fixes #1089 - checkout button on accessory view page 2015-08-19 17:13:14 -07:00
snipe e63d62d2c8 Fixes #1083 2015-08-19 12:33:16 -07:00
snipe 45c4624d5f Fixes #1081 2015-08-19 11:14:03 -07:00
snipe a27a98f4b3 Fixes #1081- include asset name on checkout 2015-08-19 11:13:51 -07:00
snipe 70a7a11324 Switched to user list 2015-08-19 10:54:50 -07:00
snipe e8f11919f7 Fixes #1077 - ordering of dropdown menus 2015-08-19 10:43:52 -07:00
snipe 1d976ff926 Fixes #1078 2015-08-19 10:23:01 -07:00
snipe 4a086cecfd Updated composer lock 2015-08-17 11:49:19 -07:00
snipe 890ef1eb1d Fixes #1038 - clickable links in dashboard 2015-08-17 11:24:10 -07:00
snipe 94e8b5f783 Fixed bug in expected checkin 2015-08-17 11:14:01 -07:00
snipe 21bb2f8b44 Updated language string for asset request 2015-08-17 11:11:09 -07:00
snipe aae7d4523f Don't need to float left there 2015-08-17 10:11:03 -07:00
snipe f7cc9036ea Added password generator to user creation 2015-08-17 10:06:37 -07:00
snipe 7dd50eddfa Nicer error messages on validation fail for LDAP 2015-08-14 22:57:32 -07:00
snipe c1642e3fe9 Examples included in example config files, moved email and employee number out of required fields 2015-08-14 22:27:10 -07:00
snipe 2036402742 Added filter string to default config v2.0-pre-beta2 2015-08-14 22:20:22 -07:00
snipe e9e62fbfaf Updated sample LDAP config to include LDAP version number 2015-08-14 22:10:34 -07:00
snipe e49cfb4bde Fixed validation on LDAP 2015-08-14 22:10:05 -07:00
snipe db8ea88207 Updated example configs with acrive flag text 2015-08-14 21:38:42 -07:00
snipe 729795364b Merge branch 'develop' of https://github.com/aalaily/snipe-it into aalaily-develop
# Conflicts:
#	app/controllers/admin/UsersController.php
2015-08-14 21:36:09 -07:00
snipe ee46b223c9 Added LDAP options 2015-08-14 21:33:48 -07:00
snipe e7d7cc6fc2 Added space after error intro 2015-08-14 21:33:39 -07:00
Aladin Alaily 23bde13665 Corrected a typo and remove some testing code 2015-08-15 00:29:38 -04:00
Aladin Alaily 3dfbd8a4f0 Added a check for the "active" LDAP flag. Since this field is optional, it's important to check whether or not it's set, otherwise, the functionality will be unusable. 2015-08-15 00:27:56 -04:00
snipe 80fb7a4c13 Fixed author's name :P 2015-08-14 21:22:49 -07:00
Aladin Alaily b8ef6dfba4 Wrote more information about an optional field 2015-08-15 00:16:29 -04:00
snipe a57a465147 Removed port number 2015-08-14 20:58:47 -07:00
snipe e14ebd0daa Improved error messages and error handling 2015-08-14 20:50:01 -07:00
snipe 676bedc9be LDAP UI language strings 2015-08-14 20:15:24 -07:00
snipe 6b85bbfe65 Ignore the ldap config file 2015-08-14 19:41:36 -07:00
snipe b629fd36a0 Pull out LDAP config file. Derp 2015-08-14 19:41:12 -07:00
snipe 260abfc2d7 Only show LDAP stuff if the LDAP config has been set up in the config 2015-08-14 19:40:17 -07:00
snipe eb7017d5cb Example LDAP configs 2015-08-14 19:25:59 -07:00
snipe 4e86b590d4 Removed typo example script 2015-08-14 19:25:49 -07:00
snipe 95af577353 Merge pull request #1059 from aalaily/develop
User import with LDAP and LDAP authentication hook
2015-08-14 19:12:14 -07:00
snipe c4ba69b4b6 Only assign the first seat to the user 2015-08-14 15:08:18 -07:00
snipe 4b59a6cb5a License importer, small tweaks to asset importer 2015-08-14 14:08:34 -07:00
Aladin Alaily 229432af5e LDAP authentication hook 2015-08-14 14:30:38 -04:00
Aladin Alaily 43efe4e80b LDAP authentication hook 2015-08-14 14:29:32 -04:00
Aladin Alaily 286df911c0 LDAP authentication add query string 2015-08-14 14:29:14 -04:00