 snipe
|
318b4b48c6
|
Fixes null value for LDAP settings
|
2015-11-23 14:11:55 -08:00 |
|
|
snipe
|
329a2282e4
|
Merge pull request #1357 from merid14/features/ldap-settings
Features/ldap settings
|
2015-11-23 14:10:44 -08:00 |
|
|
Walter
|
7a07c07e29
|
removed password insert to database
|
2015-11-23 16:16:05 -05:00 |
|
|
Walter
|
6ea3bedb9e
|
set decryption and set pword in migraiton
|
2015-11-22 23:08:18 -05:00 |
|
|
Walter
|
840e5b1523
|
Revert "begin work on idap import button"
This reverts commit 3942fd1869.
|
2015-11-22 11:10:36 -05:00 |
|
|
Walter
|
1ee3f29d2e
|
Revert "working on ldap import button"
This reverts commit 113dfc9c24.
|
2015-11-22 11:02:19 -05:00 |
|
|
Walter
|
6b26640077
|
Merge remote-tracking branch 'refs/remotes/snipe/develop' into features/ldap-settings
|
2015-11-22 11:01:07 -05:00 |
|
|
snipe
|
01b574069a
|
Fixes #1362 - status labels losing type on edit
|
2015-11-20 09:20:14 -08:00 |
|
|
snipe
|
cc930fc5b8
|
Fixed links to getting help and common issues
|
2015-11-20 09:19:45 -08:00 |
|
|
snipe
|
67a58221eb
|
Fixes #1368 - typos in installer
|
2015-11-20 07:30:40 -08:00 |
|
|
snipe
|
2b26fd7e20
|
Fixed string in gh-changelog
|
2015-11-18 14:29:29 -08:00 |
|
|
snipe
|
7a0598dfc3
|
Pulled naughty language from changelog
|
2015-11-18 13:56:13 -08:00 |
|
|
snipe
|
5ebb267a53
|
Updated changelog script
|
2015-11-18 13:52:57 -08:00 |
|
|
Wahlstedt, Walter
|
638a7773bd
|
syntax error
|
2015-11-18 16:36:02 -05:00 |
|
|
Wahlstedt, Walter
|
113dfc9c24
|
working on ldap import button
add route for button
added button and open/close for form
|
2015-11-18 16:22:04 -05:00 |
|
|
Walter
|
3942fd1869
|
begin work on idap import button
|
2015-11-18 12:11:42 -05:00 |
|
|
Wahlstedt, Walter
|
73a183677d
|
Revert "add escaping to ldap fields in blades"
This reverts commit 1d24450dcd.
|
2015-11-17 16:12:24 -05:00 |
|
|
Wahlstedt, Walter
|
1d24450dcd
|
add escaping to ldap fields in blades
|
2015-11-17 16:06:55 -05:00 |
|
|
Wahlstedt, Walter
|
6f338e573c
|
set required_if ldap_enabled box has been checked.
|
2015-11-17 16:00:52 -05:00 |
|
|
Wahlstedt, Walter
|
8e44421788
|
added Crypt class and set ldap_pword field to longText
|
2015-11-17 15:20:55 -05:00 |
|
|
Wahlstedt, Walter
|
e031239cf0
|
Removed escaping, add sometimes required, add encrypt ldap password
|
2015-11-17 13:49:59 -05:00 |
|
|
snipe
|
21a280676b
|
Merge pull request #1356 from merid14/develop
Set default to not seed DB
|
2015-11-17 09:34:38 -08:00 |
|
|
Wahlstedt, Walter
|
ac44140d83
|
fix edit blades
|
2015-11-17 10:50:39 -05:00 |
|
|
Wahlstedt, Walter
|
c8ecddba54
|
Revert "Set required fields if ldap is enabled"
This reverts commit 2f69be03d3.
|
2015-11-17 10:47:59 -05:00 |
|
|
Wahlstedt, Walter
|
2f69be03d3
|
Set required fields if ldap is enabled
|
2015-11-17 10:46:29 -05:00 |
|
|
Wahlstedt, Walter
|
7e8a0af6e5
|
Set default to not seed DB
|
2015-11-17 10:12:26 -05:00 |
|
|
Wahlstedt, Walter
|
63cd0c1ae1
|
Merge remote-tracking branch 'refs/remotes/snipe/develop' into features/ldap-settings
|
2015-11-17 10:11:38 -05:00 |
|
|
Wahlstedt, Walter
|
8a014d4bd3
|
update ldap integration
|
2015-11-17 10:00:06 -05:00 |
|
|
Wahlstedt, Walter
|
8793a04869
|
add ldap integration to settings page.
|
2015-11-17 09:59:20 -05:00 |
|
|
Wahlstedt, Walter
|
d72df21b3b
|
Update migration and blades
|
2015-11-16 16:31:43 -05:00 |
|
|
Wahlstedt, Walter
|
08d0fe5118
|
change tables from text to string/int
|
2015-11-16 13:21:00 -05:00 |
|
|
Wahlstedt, Walter
|
2ec5f340e8
|
update validators and lang
|
2015-11-16 13:08:51 -05:00 |
|
|
Wahlstedt, Walter
|
3e1e9b0077
|
syntax errors
|
2015-11-16 12:48:41 -05:00 |
|
|
Wahlstedt, Walter
|
937249b960
|
enable ldap import if data exists in database
|
2015-11-16 12:38:47 -05:00 |
|
|
Wahlstedt, Walter
|
50ea6c66f9
|
LDAP Settings update
update ldap field names
add ldap fields to controllers
add ldap fields to migration
add lang fields
update edit page
|
2015-11-16 11:30:51 -05:00 |
|
|
Wahlstedt, Walter
|
0910d9cf8c
|
correct name of migration
|
2015-11-16 09:44:06 -05:00 |
|
|
Walter
|
30e8555148
|
updating users controller to work with database fields
|
2015-11-15 22:48:56 -05:00 |
|
|
Walter
|
8f6c37c301
|
add ldap to en lang
|
2015-11-15 22:22:42 -05:00 |
|
|
Walter
|
7f9fab0055
|
adjusted settings
|
2015-11-15 21:42:49 -05:00 |
|
|
Walter
|
12912b3e27
|
adjusting the migration
|
2015-11-11 23:43:02 -05:00 |
|
|
Walter
|
d9cd4a4da0
|
setting up views for ldap
|
2015-11-11 23:03:46 -05:00 |
|
|
snipe
|
2afc252549
|
Link to category listing from accessories
|
2015-11-11 17:43:24 -08:00 |
|
|
snipe
|
aa05d041bd
|
Fixes #1324 - missing $inout variable when if/else not met
|
2015-11-11 17:22:28 -08:00 |
|
|
snipe
|
bbe0189be2
|
CSS for max image size on asset view
|
2015-11-11 16:06:17 -08:00 |
|
|
snipe
|
a0599712a6
|
Show model image if available and no asset image
|
2015-11-11 16:06:07 -08:00 |
|
|
snipe
|
1a4926ce13
|
Sort by asset image for PR #1330
|
2015-11-11 15:57:41 -08:00 |
|
|
snipe
|
3c8959e92d
|
Bumped version
|
2015-11-11 15:56:10 -08:00 |
|
|
snipe
|
ab3871f678
|
Small changes for PR #1330
|
2015-11-11 15:56:01 -08:00 |
|
|
snipe
|
7297a6031e
|
Merge pull request #1330 from mtucker6784/develop
Images for devices on the Assets datatable page.
|
2015-11-11 15:51:31 -08:00 |
|
|
snipe
|
75bd29b027
|
Added cookie expiration for sorting/filtering
|
2015-11-11 14:50:17 -08:00 |
|