 Walter
|
1ee3f29d2e
|
Revert "working on ldap import button"
This reverts commit 113dfc9c24.
|
2015-11-22 11:02:19 -05: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
|
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 |
|
|
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
|
8793a04869
|
add ldap integration to settings page.
|
2015-11-17 09:59:20 -05:00 |
|
|
Wahlstedt, Walter
|
2ec5f340e8
|
update validators and lang
|
2015-11-16 13:08:51 -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
|
30e8555148
|
updating users controller to work with database fields
|
2015-11-15 22:48:56 -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
|
1a4926ce13
|
Sort by asset image for PR #1330
|
2015-11-11 15:57:41 -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
|
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
|
d1a306cfd8
|
Yay, asset image progress!
|
2015-11-09 08:25:29 -07:00 |
|
|
snipe
|
306d8ebaf7
|
Fixes #1317 - regression issue in bulk delete
|
2015-11-07 15:40:25 -08:00 |
|
|
Michael T
|
11c2fcd094
|
Remove new window target
|
2015-11-04 16:10:27 -07:00 |
|
|
Michael T
|
b856e7f2c6
|
Make Model column a hyperlink to access the model page.
|
2015-11-04 15:55:41 -07:00 |
|
|
snipe
|
feb74806a8
|
Removed models override
|
2015-11-04 01:08:17 -08:00 |
|
|
snipe
|
bc8c8e4225
|
Fixes #1012 - more consistency in manufacturer view
|
2015-11-04 00:48:53 -08:00 |
|
|
snipe
|
dc64ad55ee
|
Fixed link to manufacturers view
|
2015-11-04 00:37:43 -08:00 |
|
|
snipe
|
7e2b4183f6
|
Added in/out to categories
|
2015-11-04 00:37:27 -08:00 |
|
|
snipe
|
0a843fa856
|
OMFG really?
|
2015-11-04 00:18:22 -08:00 |
|
|
snipe
|
5a687f280f
|
One more currency tweak
|
2015-11-04 00:15:35 -08:00 |
|
|
snipe
|
4b2e7b9b06
|
Fixes #1013 - show location name on asset view page
|
2015-11-04 00:13:48 -08:00 |
|
|
snipe
|
1ac41a72ec
|
Link to asset in asset maintenance screen
|
2015-11-04 00:07:00 -08:00 |
|
|
snipe
|
6e117efebd
|
Fixed dumb indenting
|
2015-11-03 23:58:12 -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
|
f4331f4498
|
Fixes #1291 - use location currency and fall back to defaul currency for asset maintenances
|
2015-11-03 22:04:57 -08:00 |
|
|
snipe
|
0b0b55619b
|
Fixes #1291 - Use current currency, or sane fallback
|
2015-11-02 20:06:06 -08:00 |
|
|
snipe
|
a760a7575a
|
Added user notes back in
|
2015-11-02 19:28:51 -08:00 |
|
|
snipe
|
0745ec1502
|
Fixed scope for users
|
2015-11-02 19:26:10 -08:00 |
|
|
snipe
|
9731727095
|
Sorting for #1266
|
2015-11-02 19:17:20 -08:00 |
|
|
snipe
|
67a113cbf4
|
Additional fields for location assets display
|
2015-11-02 17:41:58 -08:00 |
|
|
snipe
|
e07dcf2598
|
Added location detail view
|
2015-11-02 16:45:19 -08:00 |
|
|
snipe
|
5c820d49a6
|
Fixes #1305
|
2015-11-02 16:44:17 -08:00 |
|
|
snipe
|
76968f7d48
|
Fixes asset model table sorting
|
2015-10-28 03:23:55 -07:00 |
|