tatiana.llorente@artica.es
|
7bc5fb47a0
|
Don't show image for groups without icon - #3446
Former-commit-id: 6a67e368a2aef7f2df04a3937a0466064fa6894e
|
2019-01-28 17:06:35 +01:00 |
samucarc
|
cf2b9c5798
|
Fixed conflicts
Former-commit-id: 1be548acda51690c59d03e7270810ad03bb16822
|
2019-01-28 15:35:37 +01:00 |
Alejandro Fraguas
|
042bf1c6e7
|
Merge branch '2526_Listar_acciones_de_alerta_desde_la_API' into 'develop'
List alert actions in nodes with CLI and API
See merge request artica/pandorafms!2085
Former-commit-id: 9732161ea417a1518e508cb9e2d20438d34ec3b2
|
2019-01-28 12:56:28 +01:00 |
|
tatiana.llorente@artica.es
|
ad368ed09b
|
Fixed height in slicesbar graph of table interface snmp - #3274
Former-commit-id: ebfb44b1bfe9c6d2cfb9e95a982ae169f0c631a4
|
2019-01-28 12:15:05 +01:00 |
artica
|
550abc6634
|
Auto-updated build strings.
Former-commit-id: b2b65befe5f01bb047fe48f25c4f33eacc277d41
|
2019-01-28 00:01:23 +01:00 |
|
artica
|
dd9f6e5f21
|
Auto-updated build strings.
Former-commit-id: 92bbfc8b4c06e1873fe92c9f3b31ddc43d070a1d
|
2019-01-27 00:01:29 +01:00 |
|
artica
|
50036f2120
|
Auto-updated build strings.
Former-commit-id: 18dc882c6097c97f606ffc45e592f2118b4890cc
|
2019-01-26 00:01:25 +01:00 |
daniel
|
ffcdca7e8b
|
Merge branch 'ent-3013-ipam-modo-configuracion-de-vlan' into 'develop'
fixed errors
See merge request artica/pandorafms!2116
Former-commit-id: 355989ad28b743537f790433024bd88bd02ef53d
|
2019-01-25 12:56:26 +01:00 |
|
daniel
|
7d4fc056ca
|
fixed errors Qa
Former-commit-id: 9eea2ee2a3ec6bd51d0e7ef88b560e0475fe7504
|
2019-01-25 11:18:15 +01:00 |
|
daniel
|
61c9603ae8
|
Merge remote-tracking branch 'origin/develop' into ent-3013-ipam-modo-configuracion-de-vlan
Former-commit-id: ec5c28bb52343952fd644c1f999d3b5ef04cd709
|
2019-01-25 09:55:09 +01:00 |
|
daniel
|
335abb9abc
|
fixed error css
Former-commit-id: d2be8c4cf4306cb51c9b3854cbe06d4c80119d8b
|
2019-01-25 09:54:53 +01:00 |
|
artica
|
d191cdef17
|
Auto-updated build strings.
Former-commit-id: 0c056fa59423bd4342f513f80bd0a49a9df0dddd
|
2019-01-25 00:01:33 +01:00 |
|
Alejandro Fraguas
|
19268bad59
|
Merge branch 'ent-2516-api-listar-y-crear-modulos-de-inventario-6170-eucomm' into 'develop'
Added centralized error code to API
See merge request artica/pandorafms!2140
Former-commit-id: ed554c7874589d8ca5fe040b9433a8befc12a6e8
|
2019-01-24 16:46:09 +01:00 |
|
Alejandro Fraguas
|
ddbf9a8bad
|
Merge branch 'ent-3441-no-se-esta-comprobando-bien-el-modo-centralizado-en-el-nodo' into 'develop'
Add return value to generate_hash_to_api function
See merge request artica/pandorafms!2142
Former-commit-id: e9a97e223c68a153c3ee941d87e55961330620a4
|
2019-01-24 16:45:35 +01:00 |
fermin831
|
3cd9d22f1e
|
Merge branch 'ent-3441-no-se-esta-comprobando-bien-el-modo-centralizado-en-el-nodo' into ent-2516-api-listar-y-crear-modulos-de-inventario-6170-eucomm
Former-commit-id: 577301035cbde2dee5e7a001e48aab50a482a0ec
|
2019-01-24 14:56:23 +01:00 |
|
fermin831
|
072ad0a1ea
|
Add return value to generate_hash_to_api function
Former-commit-id: b6420e14ab59c08c661a11763edaaa52ad612af8
|
2019-01-24 13:38:13 +01:00 |
|
tatiana.llorente@artica.es
|
f5c96b7e5d
|
New organization of CSS files - #3358
Former-commit-id: 8512adc7742eecb64db2b0ee539acfddd33406c2
|
2019-01-24 11:10:49 +01:00 |
|
artica
|
f9113fa2e5
|
Auto-updated build strings.
Former-commit-id: 4593b36762b46a3b621d39318cb7a9e5b437db52
|
2019-01-24 00:01:27 +01:00 |
|
Fermin
|
48eea4ab87
|
Added centralized error code to API
Former-commit-id: 0400f0047276d08182477b4d4c59d42c665189c7
|
2019-01-23 19:21:02 +01:00 |
|
daniel
|
687358d70c
|
add new token treshold IPAM
Former-commit-id: cc7858af6a83b0773fec3249e13cfbfb274f2fba
|
2019-01-23 17:33:06 +01:00 |
|
daniel
|
5d8360860d
|
fixed error include in API not necessary
Former-commit-id: a1520c5b4438d559fd98bba4daafd80fb854a406
|
2019-01-23 17:06:31 +01:00 |
|
Alejandro Fraguas
|
25d4239ef9
|
Merge branch '2521_Crear_grupos_de_modulo_desde_la_API' into 'develop'
Create module group API
See merge request artica/pandorafms!2053
Former-commit-id: 55819d89a59549ebec28d32840667e37d34a1f79
|
2019-01-23 17:02:34 +01:00 |
|
daniel
|
fb46197c1f
|
fixed minor error button
Former-commit-id: 4b57425285d33d181390090fbdd3c36882ab4fcf
|
2019-01-23 15:30:46 +01:00 |
|
daniel
|
841a9cf60b
|
Merge remote-tracking branch 'origin/develop' into ent-3013-ipam-modo-configuracion-de-vlan
Former-commit-id: a23fffb984a6edd4ef7eefe871814ea0120c615a
|
2019-01-23 11:08:48 +01:00 |
|
artica
|
1e4a288f53
|
Auto-updated build strings.
Former-commit-id: d02bc496b37ddd35ad1a75174daa0b3ca6d24f24
|
2019-01-23 00:01:23 +01:00 |
|
daniel
|
2e2774f256
|
Merge remote-tracking branch 'origin/develop' into ent-3013-ipam-modo-configuracion-de-vlan
Conflicts:
pandora_server/lib/PandoraFMS/DataServer.pm
Former-commit-id: 5729e346de91ebf8897bc5d0dbc9f3f451711e86
|
2019-01-22 17:42:47 +01:00 |
Daniel Rodriguez
|
65fce762df
|
Merge branch 'Informes_Event_report_group_no_se_visualizan_exportan_2' into 'develop'
Fixed Event reports pie graphs in metaconsole
See merge request artica/pandorafms!2128
Former-commit-id: d134417a05ddb7fd323d8ed4cba93e21e2551f7f
|
2019-01-22 14:30:45 +01:00 |
|
Daniel Rodriguez
|
d8ca12bd63
|
Merge branch 'ent-3296-Descarga-informe-CSV-con-Graficas-no-funcionan' into 'develop'
Fixed bug in export to csv report
See merge request artica/pandorafms!2135
Former-commit-id: 04d0af4a61212057c7e539fc4513e2b45a2bc31a
|
2019-01-22 14:06:59 +01:00 |
manuel.montes
|
e8497bb80c
|
Changed the order of actions
Former-commit-id: ec733bfcf1705552f6257dc14c5a34e0a3e84e66
|
2019-01-22 11:03:52 +01:00 |
|
Daniel Rodriguez
|
f1dbd40a6a
|
Merge branch 'ent-3421-error-en-un-push' into 'develop'
Ent 3421 error en un push
See merge request artica/pandorafms!2138
Former-commit-id: 6740a7f61adebbacaeb40b47b42973e4b518d12d
|
2019-01-22 10:04:07 +01:00 |
|
daniel
|
4236b55694
|
Merge remote-tracking branch 'origin/develop' into ent-3013-ipam-modo-configuracion-de-vlan
Conflicts:
pandora_server/lib/PandoraFMS/DataServer.pm
Former-commit-id: 87b7d3a7591ed181be022b786deba8f090e43d49
|
2019-01-22 09:00:47 +01:00 |
|
daniel
|
0f29d6461e
|
Merge branch 'ent-3013-ipam-modo-configuracion-de-vlan' of brutus.artica.lan:artica/pandorafms into ent-3013-ipam-modo-configuracion-de-vlan
Former-commit-id: b7873c08910f08827387db6d92d8a656d8ca4bf2
|
2019-01-22 08:57:59 +01:00 |
|
daniel
|
2c208b5e29
|
fixed errors php7 mysqli and warning include
Former-commit-id: 68bdf4c26530de45efe2dd8fab360fb88c8976bc
|
2019-01-22 08:57:48 +01:00 |
|
artica
|
c586b68cb3
|
Auto-updated build strings.
Former-commit-id: 84dcfe707e9a70754b4ee72365bd549c8d1c09ef
|
2019-01-22 00:01:24 +01:00 |
|
samucarc
|
da7e8e5487
|
Fixed conflict
Former-commit-id: 9ca611335700b59f58edf02fa1ab393fcfb8c567
|
2019-01-21 19:03:32 +01:00 |
|
fermin831
|
e540d96eb2
|
Revert "Added events in DataServer processed XML"
This reverts commit cbe518dc53 [formerly e3166d9fb2bcbf1b6aa574ae1a96e796a26a70a6].
Former-commit-id: 759a3da8b31fef88d2d7b22daeae09062f3bd80c
|
2019-01-21 18:43:47 +01:00 |
|
fermin831
|
923c8ee0b8
|
Revert "Added tnetwork_matrix data structure"
This reverts commit 5328a0e239 [formerly aa49de6c04a3c7a612ce7041393fe521e23e281d].
Former-commit-id: 2c762f04c289c46670aab7ed7844ff3880e8d39a
|
2019-01-21 18:43:35 +01:00 |
|
fermin831
|
64b8223f12
|
Revert "Added matrix_data XML"
This reverts commit d970c6628a [formerly cd26d436e6745a456df95484120d1b96439b274d].
Former-commit-id: 7f5d3d628605a2458622174edcd56916a3a63cd9
|
2019-01-21 18:43:09 +01:00 |
|
samucarc
|
75dc82f42f
|
Merged two branches into one
Former-commit-id: 1e15cd80a5ef0a03834c4d835c7ff0fe77b4c7e0
|
2019-01-21 18:41:46 +01:00 |
|
fermin
|
c75f94f9e0
|
Merge branch 'ent-3418-nueva-estructura-de-datos-tnetworkmatrix' into 'develop'
Ent 3418 nueva estructura de datos tnetworkmatrix
See merge request artica/pandorafms!2136
Former-commit-id: b04eaee2ce78625f9710b0851609ca8dfa2aea43
|
2019-01-21 18:32:05 +01:00 |
|
fermin831
|
d970c6628a
|
Added matrix_data XML
Former-commit-id: cd26d436e6745a456df95484120d1b96439b274d
|
2019-01-21 18:27:31 +01:00 |
|
samucarc
|
91f547b6f4
|
Save password option disabled if Fallback is enabled
Former-commit-id: 5ed747ab6e22478a46102104095f5d2d1ba32deb
|
2019-01-21 18:11:12 +01:00 |
fbsanchez
|
f77373aa1d
|
Plugintools added ip2long & long2ip
Former-commit-id: 5c5f9589a32947ce2d9a725e504661a11c8311ee
|
2019-01-21 18:06:44 +01:00 |
|
fermin831
|
5328a0e239
|
Added tnetwork_matrix data structure
Former-commit-id: aa49de6c04a3c7a612ce7041393fe521e23e281d
|
2019-01-21 17:42:41 +01:00 |
|
manuel.montes
|
4c6cd847bd
|
Fixed bug in export to csv report
Former-commit-id: 4bb84abbbb42945974643207f4976131753ab257
|
2019-01-21 16:19:22 +01:00 |
|
fermin
|
965ef4d6f4
|
Merge branch 'ent-3410-eventos-data-server' into 'ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1'
Ent 3410 eventos data server
See merge request artica/pandorafms!2134
Former-commit-id: c9c8b1936355eab03dd3ec1909eff1a04428e95f
|
2019-01-21 15:22:03 +01:00 |
|
fermin831
|
cbe518dc53
|
Added events in DataServer processed XML
Former-commit-id: e3166d9fb2bcbf1b6aa574ae1a96e796a26a70a6
|
2019-01-21 15:12:46 +01:00 |
|
samucarc
|
bd48c96de4
|
Fixed duplicated function module group synch in API
Former-commit-id: 03b23a85223add6d8f730dbfebaf58fbf7839e2a
|
2019-01-21 15:03:02 +01:00 |
|
fbsanchez
|
bd0aa4ea8a
|
Merge remote-tracking branch 'origin/develop' into ent-3013-ipam-modo-configuracion-de-vlan
Former-commit-id: 6545ada5fba710e8399e01f84d7503b289317abd
|
2019-01-21 12:26:46 +01:00 |
|
samucarc
|
367c9fc6fc
|
Merge remote-tracking branch 'origin/2521_Crear_grupos_de_modulos_desde_la_API_2' into 2521_Crear_grupos_de_modulo_desde_la_API
Former-commit-id: 7d604cb6777734f43dc5d64f38b5cca651cce25d
|
2019-01-21 11:41:57 +01:00 |