 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 |
|
|
Aladin Alaily
|
07171498a9
|
Modified the code so that the LDAP field names can now be defined and fetched from the configuration file
|
2015-08-14 00:17:26 -04:00 |
|
|
Aladin Alaily
|
2dbeb1aeb5
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2015-08-13 16:34:20 -04:00 |
|
|
snipe
|
4fcf70872f
|
Fixes #1054
|
2015-08-13 13:24:38 -07:00 |
|
|
snipe
|
ac7b5da711
|
Removed comments
|
2015-08-13 13:24:33 -07:00 |
|
|
Aladin Alaily
|
1fc83443db
|
Check if the variables coming in from LDAP are set.
|
2015-08-13 15:48:03 -04:00 |
|
|
Aladin Alaily
|
c17bbe9dfe
|
Commented out the loop break.
|
2015-08-13 15:10:40 -04:00 |
|
|
Aladin Alaily
|
59617083c9
|
Fixed the break portion
|
2015-08-13 15:07:15 -04:00 |
|
|
Aladin Alaily
|
d167f31af0
|
Fixed indents
|
2015-08-13 15:06:04 -04:00 |
|
|
Aladin Alaily
|
1343c09cd7
|
Made the user interface a little more neat.
|
2015-08-13 15:05:15 -04:00 |
|
|
Aladin Alaily
|
8e6621f332
|
Removed the ldap.php config file and added the example ldap config file.
|
2015-08-13 13:40:02 -04:00 |
|
|
Aladin Alaily
|
34b14f67c6
|
Fixed the formatting
|
2015-08-13 13:39:31 -04:00 |
|
|
Aladin Alaily
|
5574ea89bb
|
Removed the references to the LOG class
|
2015-08-13 13:39:20 -04:00 |
|
|
Aladin Alaily
|
d780f0f3cf
|
Added some space between the Import and LDAP buttons
|
2015-08-13 13:32:19 -04:00 |
|
|
Aladin Alaily
|
03f5af29f2
|
Ignore netbeans config files
|
2015-08-13 13:29:20 -04:00 |
|
|
Aladin Alaily
|
a531ea34bb
|
Cleaned up the code
|
2015-08-13 13:27:24 -04:00 |
|
|
Aladin Alaily
|
aa72b9c107
|
Added a button to the LDAP functionality
|
2015-08-13 13:27:05 -04:00 |
|
|
Aladin Alaily
|
176469294b
|
Added routes to LDAP
|
2015-08-13 13:20:30 -04:00 |
|
|
Aladin Alaily
|
afd94ff52a
|
Added functions for LDAP
|
2015-08-13 13:20:13 -04:00 |
|
|
Aladin Alaily
|
b2c2c1ee15
|
LDAP Sync
|
2015-08-13 13:14:11 -04:00 |
|
|
Aladin Alaily
|
b004a7448b
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2015-08-13 12:26:10 -04:00 |
|
|
snipe
|
c5e5930c1b
|
Make sure lock passwords isn't true before emailing
|
2015-08-13 00:54:57 -07:00 |
|
|
snipe
|
ed2d7310f8
|
Fixed unsuspend icon
|
2015-08-13 00:39:52 -07:00 |
|
|
snipe
|
547de2b9e3
|
Placeholder phpunit test
|
2015-08-13 00:26:26 -07:00 |
|
|
snipe
|
58abd15d93
|
Require_once (again) to try to handle local phpunit testing
|
2015-08-12 23:55:53 -07:00 |
|
|
snipe
|
dd60976d51
|
Set errors to true
|
2015-08-12 23:52:44 -07:00 |
|
|
snipe
|
07b045007b
|
Revert "Reverting to phpunit again"
This reverts commit 1159cdeab2.
# Conflicts:
# .travis.yml
|
2015-08-12 23:39:16 -07:00 |
|
|
snipe
|
1f7e0a2893
|
Revert "More donking with testing"
This reverts commit 7f3ceea77b.
# Conflicts:
# .travis.yml
|
2015-08-12 23:37:37 -07:00 |
|
|
snipe
|
1159cdeab2
|
Reverting to phpunit again
|
2015-08-12 23:32:38 -07:00 |
|
|
snipe
|
7f3ceea77b
|
More donking with testing
|
2015-08-12 23:30:27 -07:00 |
|
|
snipe
|
1d89b78315
|
Nicer validation display
|
2015-08-12 22:34:44 -07:00 |
|
|
snipe
|
463469e7c7
|
Added validation for notes
|
2015-08-12 22:34:35 -07:00 |
|
|
snipe
|
c839f0cbc8
|
Added ability to select status type
|
2015-08-12 22:33:56 -07:00 |
|
|
snipe
|
a832346bfb
|
Added statuslabel type helper
|
2015-08-12 22:33:31 -07:00 |
|
|
snipe
|
3d77666ad1
|
Nicer required field display
|
2015-08-12 21:55:23 -07:00 |
|
|
snipe
|
6ad7a9bb70
|
Replaced missing route from previous cleanup
|
2015-08-12 21:50:35 -07:00 |
|
|
snipe
|
7fa9e49880
|
Activate user created on modal create
|
2015-08-12 21:50:04 -07:00 |
|
|
snipe
|
e2e070d5e1
|
Smaller min-height for tighter layout
|
2015-08-12 21:25:48 -07:00 |
|