 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
|
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 |
|
|
snipe
|
b77b9c0434
|
Merge pull request #1323 from merid14/develop
Enhancements for installer
|
2015-11-10 18:02:47 -08:00 |
|
|
snipe
|
b9c36f8638
|
Fixes #1335 - editing maintenance
|
2015-11-10 18:02:06 -08:00 |
|
|
Walter
|
ecae451ebf
|
form validation
|
2015-11-09 22:34:18 -05:00 |
|
|
Walter
|
9627f15412
|
update settings controller to add ldap field validation
|
2015-11-09 22:32:00 -05:00 |
|
|
Walter
|
464f11c398
|
setting up bones for ldap settings
add migration
add ldap settings to settings controller
add ldap fields edit settings views
|
2015-11-09 22:09:09 -05:00 |
|
|
mtucker6784
|
90009db1b5
|
Image is now recorded upon initial asset creation.
|
2015-11-09 12:01:31 -07:00 |
|
|
mtucker6784
|
d7f8d0fc04
|
Changed image save location in AssetsController
|
2015-11-09 09:35:10 -07:00 |
|
|
mtucker6784
|
effad46cc0
|
create assets image directory
|
2015-11-09 09:16:53 -07:00 |
|
|
mtucker6784
|
4509631921
|
Add image column migration
|
2015-11-09 08:47:05 -07:00 |
|
|
mtucker6784
|
d1a306cfd8
|
Yay, asset image progress!
|
2015-11-09 08:25:29 -07:00 |
|
|
Walter
|
2de4741170
|
Add password confirmation, hide password and set default database seed to no
|
2015-11-07 22:21:07 -05:00 |
|
|
Walter
|
fc609ece12
|
Merge remote-tracking branch 'refs/remotes/snipe/develop' into develop
|
2015-11-07 22:13:48 -05:00 |
|
|
snipe
|
a8da68d3fd
|
Fixes #1320 - added name for cookie table
|
2015-11-07 15:53:39 -08:00 |
|
|
snipe
|
ef7c7da4e5
|
Merge pull request #1302 from merid14/develop
Reworked the Installer
|
2015-11-07 15:42:06 -08:00 |
|
|
snipe
|
306d8ebaf7
|
Fixes #1317 - regression issue in bulk delete
|
2015-11-07 15:40:25 -08:00 |
|
|
snipe
|
250880c6f3
|
Include default text in status label helper
|
2015-11-07 15:39:03 -08:00 |
|
|
Walter
|
9f43b6af9f
|
fixed apache config file
|
2015-11-06 15:17:54 -05:00 |
|
|
Walter
|
a47a4e83e2
|
fixed issues with sed command and /
|
2015-11-06 11:53:07 -05:00 |
|
|
Walter
|
ca1384504a
|
fixed tzone variable assignment
|
2015-11-06 10:03:58 -05:00 |
|
|
Walter
|
fc6bb7f056
|
sets the timezone automatically
|
2015-11-06 09:02:51 -05:00 |
|
|
Walter
|
62cee46a83
|
update webdir for debian and fix the error logs
|
2015-11-06 08:30:51 -05:00 |
|
|
Walter
|
c94ece2925
|
changed replace for sed command
|
2015-11-05 21:42:20 -05:00 |
|
|
Walter
|
5d5882ea5b
|
moved the permissions changes to the end
|
2015-11-05 21:40:51 -05:00 |
|
|
Walter
|
61fc912c47
|
moving permisions block and some mysql stuff
|
2015-11-05 16:25:03 -05:00 |
|