slerena
|
dddde8fba1
|
Merge branch '2194-IDs-de-SO-en-Manage-agents' into 'develop'
Fixed select in modificar_agente.php
See merge request artica/pandorafms!1520
|
2018-06-25 18:52:38 +02:00 |
|
slerena
|
288a751417
|
Merge branch 'pandora_enterprise#2419' into 'develop'
Added regex to LDAP advanced permissions
See merge request artica/pandorafms!1570
|
2018-06-25 18:51:15 +02:00 |
|
daniel
|
7dc60b65a2
|
Merge remote-tracking branch 'origin/develop' into 2075-Proteccion_en_cascada_de_servicios
|
2018-06-25 15:46:36 +02:00 |
|
nramon
|
35d9082a1c
|
Merge branch '2423-Se_toman_como_data_las_graficas_boleanas' into 'develop'
fixed error in zoom graphs boolean
See merge request artica/pandorafms!1572
|
2018-06-25 15:41:26 +02:00 |
|
daniel
|
eaf5abd476
|
fixed keep alive bool type module 100
|
2018-06-25 15:35:12 +02:00 |
|
daniel
|
6be7881514
|
fixed error in zoom graphs boolean
|
2018-06-25 15:09:57 +02:00 |
|
daniel
|
ff934e28fa
|
fixed minor error
|
2018-06-25 15:09:01 +02:00 |
|
daniel
|
36293cba3a
|
Revert "fixed error ingraph bool zoom"
This reverts commit 1ca35be41e80738c02cd36671582cb2a406d4b8c.
|
2018-06-25 15:07:12 +02:00 |
|
daniel
|
1ca35be41e
|
fixed error ingraph bool zoom
|
2018-06-25 15:05:07 +02:00 |
|
manuel.montes
|
6f25c229e3
|
Fixed bug in cluster view
|
2018-06-25 12:35:39 +02:00 |
|
daniel
|
e39b03511d
|
Merge remote-tracking branch 'origin/develop' into 2075-Proteccion_en_cascada_de_servicios
|
2018-06-25 08:29:45 +02:00 |
|
artica
|
17e5c39a67
|
Auto-updated build strings.
|
2018-06-25 00:01:24 +02:00 |
|
artica
|
5d4a4eebc4
|
Auto-updated build strings.
|
2018-06-24 00:01:25 +02:00 |
|
Kike
|
7ed5077c01
|
Added regex to LDAP advanced permissions
|
2018-06-23 14:24:32 +02:00 |
|
artica
|
b467eea16b
|
Auto-updated build strings.
|
2018-06-23 00:01:25 +02:00 |
|
daniel
|
92fbc86ed9
|
add cascade protection in services
|
2018-06-22 14:59:17 +02:00 |
|
fermin831
|
dcb73f844e
|
Revert "Revert "Recover critical status the SNMPTrap on SNMP console actions""
This reverts commit 16cff75242dd8538bd84a9ac6662758b89883d42.
|
2018-06-22 13:37:36 +02:00 |
|
fermin831
|
2719cadc61
|
Revert "Fixed agents display on GIS maps"
This reverts commit 6a53e924bb9f7170cfdc717ca3ee6360a8e6e5b9.
|
2018-06-22 13:37:17 +02:00 |
|
manuel.montes
|
02822bcfd6
|
Deleted 'show in two columns' option
|
2018-06-22 13:36:38 +02:00 |
|
fermin831
|
e19f116637
|
Fixed add particular agents to GIS layers
|
2018-06-22 13:33:04 +02:00 |
|
fermin831
|
16cff75242
|
Revert "Recover critical status the SNMPTrap on SNMP console actions"
This reverts commit 8ef8f31f67278c4ee0c2bfd7879e60ac7ade794a.
|
2018-06-22 13:30:10 +02:00 |
|
fermin831
|
6a53e924bb
|
Fixed agents display on GIS maps
|
2018-06-22 13:28:39 +02:00 |
|
artica
|
0a61a5f5d3
|
Auto-updated build strings.
|
2018-06-22 00:01:24 +02:00 |
|
fermin831
|
8ef8f31f67
|
Recover critical status the SNMPTrap on SNMP console actions
|
2018-06-21 19:27:33 +02:00 |
|
manuel.montes
|
09ed3fa7c3
|
Fixed visual bug
|
2018-06-21 14:21:22 +02:00 |
|
daniel
|
17b726d7a0
|
changes bd for mr, schema and migrate and update tocken mr
|
2018-06-21 14:15:27 +02:00 |
|
artica
|
f40e3883ec
|
Auto-updated build strings.
|
2018-06-21 00:01:26 +02:00 |
|
fermin831
|
288d2bafb6
|
Added in progres selected button to events view
|
2018-06-20 18:56:44 +02:00 |
|
fermin831
|
251c308d8c
|
Fixed new servers (migration and autoprovision) icons
|
2018-06-20 18:31:52 +02:00 |
|
fermin831
|
1ccd7d1fd7
|
Modified set create_snmp_module to permit create remote_snmp_proc modules
|
2018-06-20 17:07:13 +02:00 |
|
nramon
|
ebfbc59055
|
Merge branch '2407-anadir_phantomjs_docker' into 'develop'
add phantomjs to docker
See merge request artica/pandorafms!1562
|
2018-06-20 16:08:43 +02:00 |
|
daniel
|
e7cbd4604e
|
add phantomjs to docker
|
2018-06-20 16:04:07 +02:00 |
|
artica
|
c97530a4ee
|
Updated version and build strings.
|
2018-06-20 15:19:39 +02:00 |
|
Ramon Novoa
|
dc103988ae
|
Fix the current enterprise package number.
|
2018-06-20 15:18:50 +02:00 |
|
Ramon Novoa
|
7a026bd1c0
|
Update the MR version.
|
2018-06-20 14:40:47 +02:00 |
|
manuel.montes
|
11dc746eca
|
Fixed bug in ajax/events.php
|
2018-06-20 13:31:23 +02:00 |
|
nramon
|
cf38c82653
|
Merge branch '2294-requisitos-api-cluster' into 'develop'
Minor fixes in api responses
See merge request artica/pandorafms!1560
|
2018-06-20 13:03:11 +02:00 |
|
fbsanchez
|
d0796a3e09
|
Minor fixes in api responses
|
2018-06-20 12:58:46 +02:00 |
|
slerena
|
5efc2d220e
|
Merge branch '2294-requisitos-api-cluster' into 'develop'
Fixed some acl issues in cluster api methods
See merge request artica/pandorafms!1557
|
2018-06-20 12:33:27 +02:00 |
|
nramon
|
d960d6f89b
|
Merge branch '2290-seguridad-en-la-api-3' into 'develop'
2290 seguridad en la api 3
See merge request artica/pandorafms!1556
|
2018-06-20 12:23:55 +02:00 |
|
fbsanchez
|
1f06a15d7c
|
Fixed get_cluster_status
|
2018-06-20 12:20:34 +02:00 |
|
fbsanchez
|
ed5381ec69
|
Merge remote-tracking branch 'origin/develop' into 2294-requisitos-api-cluster
|
2018-06-20 12:20:13 +02:00 |
|
slerena
|
293fbce674
|
Merge branch '1827-Graficas-TIP-eje-x-dev' into 'develop'
fixed minor error default graph for pdf or email 320
See merge request artica/pandorafms!1558
|
2018-06-20 12:15:16 +02:00 |
|
fermin831
|
a072cd34de
|
Fixed tree view meta secondary groups repeated agents
|
2018-06-20 12:09:32 +02:00 |
|
daniel
|
2ae0dc6c52
|
fixed minor error default graph for pdf or email 320
|
2018-06-20 11:54:03 +02:00 |
|
fbsanchez
|
b75ee89397
|
Fixed some acl issues in cluster api methods
|
2018-06-20 11:49:15 +02:00 |
|
fermin831
|
85f84f4211
|
[API ACL] Fixed meta create_event
|
2018-06-20 11:46:57 +02:00 |
|
slerena
|
1948cdd3e4
|
Merge branch '1827-Graficas-TIP-eje-x-dev' into 'develop'
1827 graficas tip eje x dev
See merge request artica/pandorafms!1555
|
2018-06-20 11:36:58 +02:00 |
|
daniel
|
aa4f13d17a
|
fixed errors in graphs
|
2018-06-20 11:31:43 +02:00 |
|
artica
|
2c6ad942cb
|
Auto-updated build strings.
|
2018-06-20 00:01:24 +02:00 |
|