 Vincent Sposato
|
afac18ea1b
|
Last tweak before I head to begin drinking heavily...
|
2015-08-15 20:36:18 -04:00 |
|
|
Vincent Sposato
|
da187ff07a
|
A tweak to make this work with an app environment variable
|
2015-08-15 20:33:47 -04:00 |
|
|
Vincent Sposato
|
9849bbec70
|
This is getting old...
|
2015-08-15 20:29:18 -04:00 |
|
|
Vincent Sposato
|
3aaed2600e
|
One last tweak - this may be it
|
2015-08-15 20:26:42 -04:00 |
|
|
Vincent Sposato
|
8e316611c0
|
More tweaks / changes
|
2015-08-15 20:21:51 -04:00 |
|
|
Vincent Sposato
|
0a97135578
|
Adding more debug tweaks
|
2015-08-15 20:20:46 -04:00 |
|
|
Vincent Sposato
|
1bed711f0e
|
Another tweak getting closer
|
2015-08-15 20:15:55 -04:00 |
|
|
Vincent Sposato
|
1f1c1cb546
|
Almost there...
|
2015-08-15 20:08:20 -04:00 |
|
|
Vincent Sposato
|
f2e7af498e
|
A change to my previous tweak for background serving
|
2015-08-15 20:05:47 -04:00 |
|
|
Vincent Sposato
|
afdb958955
|
A couple more tweaks to make everything work
|
2015-08-15 20:03:41 -04:00 |
|
|
Vincent Sposato
|
06966d52bf
|
Got some more tweaks, and changes to make things work
|
2015-08-15 20:00:48 -04:00 |
|
|
Vincent Sposato
|
723a6260f5
|
More tweaks for debugging
|
2015-08-15 19:40:30 -04:00 |
|
|
Vincent Sposato
|
a98a0a2f77
|
More tweaking of the travis yaml file trying to get more out of the results
|
2015-08-15 19:37:43 -04:00 |
|
|
Vincent Sposato
|
59e755c5df
|
Tweaking the configuration to work with travis - attempting hostname tweaks
|
2015-08-15 19:05:01 -04:00 |
|
|
Vincent Sposato
|
55b2fce876
|
One more stupid mistake in travis yaml file -
|
2015-08-15 19:01:03 -04:00 |
|
|
Vincent Sposato
|
1fadabaf2f
|
Fixed stupid mistake in the travis yaml file
|
2015-08-15 18:59:22 -04:00 |
|
|
Vincent Sposato
|
33178adeed
|
Fixed issue in travis yaml file
|
2015-08-15 18:57:10 -04:00 |
|
|
Vincent Sposato
|
46fb12f5dc
|
Fixed acceptance suite yaml to make it work for travis-ci as well as local testing
|
2015-08-15 18:50:46 -04:00 |
|
|
Vincent Sposato
|
12e6a721f0
|
Initial changes to allow travis-ci to run codeception tests
|
2015-08-15 18:48:20 -04:00 |
|
|
Vincent Sposato
|
0cbc9d266e
|
Adding setup for Codeception
|
2015-08-15 15:10:17 -04: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 |
|
|
Aladin Alaily
|
54d95c510b
|
Update the code to reflect a possible active flag in LDAP
|
2015-08-14 10:31:40 -04:00 |
|
|
Aladin Alaily
|
61a4b03aba
|
Added the active flag. Some LDAP instances might have this flag set.
|
2015-08-14 10:31:22 -04:00 |
|
|
Aladin Alaily
|
bebd569490
|
updated the sample config doc
|
2015-08-14 00:23:23 -04:00 |
|
|
Aladin Alaily
|
470b543910
|
Updated the view to match the controller
|
2015-08-14 00:17:50 -04:00 |
|