 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 |
|
|
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
|
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
|
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
|
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 |
|
|
Walter
|
d9cd4a4da0
|
setting up views for ldap
|
2015-11-11 23:03:46 -05:00 |
|
|
snipe
|
a0599712a6
|
Show model image if available and no asset image
|
2015-11-11 16:06:07 -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 |
|
|
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
|
d1a306cfd8
|
Yay, asset image progress!
|
2015-11-09 08:25:29 -07:00 |
|
|
snipe
|
a8da68d3fd
|
Fixes #1320 - added name for cookie table
|
2015-11-07 15:53:39 -08:00 |
|
|
snipe
|
14ba5a3b77
|
Fixes #1310 - adds version hash to table name to prevent cookie issues for folks who pull from dev
|
2015-11-04 01:08:05 -08:00 |
|
|
snipe
|
bc8c8e4225
|
Fixes #1012 - more consistency in manufacturer view
|
2015-11-04 00:48:53 -08:00 |
|
|
snipe
|
7e2b4183f6
|
Added in/out to categories
|
2015-11-04 00:37:27 -08:00 |
|
|
snipe
|
4b2e7b9b06
|
Fixes #1013 - show location name on asset view page
|
2015-11-04 00:13:48 -08:00 |
|
|
snipe
|
17207ddea1
|
Fixed table cookie name
|
2015-11-03 23:57:58 -08:00 |
|
|
snipe
|
130b1b4f4a
|
Converted category asset listing to bootstrap tables for #1266
|
2015-11-03 23:57:31 -08:00 |
|
|
snipe
|
2a43491792
|
Fixes #1291 on the asset view as well
|
2015-11-03 22:19:58 -08:00 |
|
|
snipe
|
0b0b55619b
|
Fixes #1291 - Use current currency, or sane fallback
|
2015-11-02 20:06:06 -08:00 |
|
|
snipe
|
f147a0ff02
|
Fixed user table name
|
2015-11-02 19:26:33 -08:00 |
|
|
snipe
|
9731727095
|
Sorting for #1266
|
2015-11-02 19:17:20 -08:00 |
|
|
snipe
|
769fb13282
|
Search on manager name for #1266
|
2015-11-02 18:37:16 -08:00 |
|
|
snipe
|
a9e1283a17
|
Added search on location parent for #1266
|
2015-11-02 18:36:49 -08:00 |
|
|
snipe
|
5bb94c4b4e
|
Added fields to location assets display
|
2015-11-02 17:42:47 -08:00 |
|
|
snipe
|
e07dcf2598
|
Added location detail view
|
2015-11-02 16:45:19 -08:00 |
|
|
snipe
|
e0fccc8fc9
|
Possible fix for #1296? Can't reproduce locally
|
2015-10-28 05:53:28 -07:00 |
|
|
snipe
|
76968f7d48
|
Fixes asset model table sorting
|
2015-10-28 03:23:55 -07:00 |
|
|
snipe
|
5436d54aa0
|
Fixes #1290 - datatable broken for assets in model
|
2015-10-28 02:10:04 -07:00 |
|
|
snipe
|
b6f4080b97
|
Fixes consumable detail view
|
2015-10-26 14:36:55 -07:00 |
|
|
snipe
|
efddda8665
|
Fixed expected_checkin error on asset view
|
2015-10-23 18:28:06 -07:00 |
|
|
snipe
|
48e6ebe306
|
Make EOL not sortable anymore, since that sort doesn't work
|
2015-10-23 18:15:27 -07:00 |
|
|
snipe
|
eb1335405b
|
Order by last_checkout and expected_checkin for #1266
|
2015-10-23 17:59:21 -07:00 |
|
|
snipe
|
e9050826ec
|
Added order number if one is being searched on
|
2015-10-23 14:49:58 -07:00 |
|
|
snipe
|
20e7888bd9
|
Fixed expected checkin on view
|
2015-10-23 14:36:20 -07:00 |
|
|
snipe
|
0a3843393d
|
Addec expected_checkout, fixed language calls to use blade syntax
|
2015-10-23 14:35:31 -07:00 |
|
|
snipe
|
aaf2c6fbce
|
Updated licenses and unaccepted assets to use bootstrap tables for #1266
|
2015-10-22 03:28:12 -07:00 |
|