ab2bf737d5
Merge remote-tracking branch 'origin/develop' into ent-3894-Bug-Feature-labels-weigh-en-graficas
...
Conflicts:
pandora_console/include/functions.php
Former-commit-id: 6c1ef8bcb15b9969b25082851fa39c8241398b29
2019-05-10 12:18:10 +02:00
3119278b26
Auto-updated build strings.
...
Former-commit-id: 1dc55561e83817f91b38b437d57e479fb13f3ac3
2019-05-10 00:01:14 +02:00
8027238dfd
Merge branch 'ent-3925-eliminar-custom-response-deprecated' into 'develop'
...
Ent 3925 eliminar custom response deprecated
See merge request artica/pandorafms!2390
Former-commit-id: aa92dfe86b9039f45db063cd1a711b26e8c36442
2019-05-09 17:52:46 +02:00
5126c651f7
Changed '' of query
2019-05-09 17:38:40 +02:00
3e91207186
Merge branch 'ent-3617-Gráfica-de-módulos' into 'develop'
...
Ent 3617 gráfica de módulos
See merge request artica/pandorafms!2407
Former-commit-id: ac545e4211f9e68e81482657c6e294dcac082a8e
2019-05-09 17:03:03 +02:00
9b51928e35
Added HTML edit feature, needed because TinyEdit adds lot's of HTML and is not practical. You need to edit the contents in HTML. Is not a security issue, because only admin can edit this news contents.
...
Former-commit-id: 4039346ffe4fc2628f515b4cdaeaf1655377e74b
2019-05-09 16:01:51 +02:00
c775d0359c
Merge branch 'ent-3973-al-hacer-update-de-un-comando-persiste-valor-antiguo-de-los-campos-al-refrescar-la-vista' into 'develop'
...
Show new values after update
See merge request artica/pandorafms!2405
Former-commit-id: aa2b2a4857e47a4999ef9ca42f6ba1b59fa9d714
2019-05-09 14:36:51 +02:00
7c3e883c01
Merge branch 'ent-3770-texto-del-pandora-diag' into 'develop'
...
Ent 3770 texto del pandora diag
Closes pandora_enterprise#3529, pandora_enterprise#1744, pandora_enterprise#3305, pandora_enterprise#3121, and pandora_enterprise#3252
See merge request artica/pandorafms!2393
Former-commit-id: d78409acd362ebc5308495c359344f5b706685cd
2019-05-09 13:01:28 +02:00
fd83540ad5
New menu module graph for interface modules- #3617
2019-05-09 12:39:03 +02:00
0aa8bcda30
Merge branch 'ent-3758-7777-bug-validacion-eventos-en-consola' into 'develop'
...
Pending to review
See merge request artica/pandorafms!2295
2019-05-09 11:56:29 +02:00
c7c7a8457f
Merge branch 'ent-3952-6601-aadcm-fallo-visual-en-pdf-report-sla-semanal' into 'develop'
...
fixed errors pdf SLA Weekly
See merge request artica/pandorafms!2410
2019-05-09 11:05:54 +02:00
ef45fc3ca6
Merge remote-tracking branch 'origin/develop' into ent-3617-Gráfica-de-módulos
2019-05-09 10:44:31 +02:00
23b3d07f37
Merge remote-tracking branch 'origin/develop' into ent-3925-eliminar-custom-response-deprecated
2019-05-09 09:29:27 +02:00
7da73afd08
Auto-updated build strings.
2019-05-09 00:01:10 +02:00
8f6c8a9932
Merge branch 'ent-3613-Ventana-modal-de-vista-de-Eventos' into 'develop'
...
Ent 3613 ventana modal de vista de eventos
See merge request artica/pandorafms!2387
2019-05-08 19:07:39 +02:00
1644b492d2
fixed errors pdf SLA Weekly
2019-05-08 18:29:33 +02:00
0a7539cc3a
Merge branch 'ent-3990-7999-colecciones-no-funcionan-no-se-puede-subir-ni-crear-archivos' into 'develop'
...
fixed filemanager
See merge request artica/pandorafms!2408
2019-05-08 18:26:23 +02:00
ac101af72f
Merge branch '3631_Unidades_no_se_muestran_en_informes_de_graficas_combinadas' into 'develop'
...
Added module units in module graphs
See merge request artica/pandorafms!2237
2019-05-08 16:36:43 +02:00
4b7f9e4882
Merge branch 'ent-3884-Error-Superredes' into 'develop'
...
fixed errors IPAM subneting
See merge request artica/pandorafms!2395
2019-05-08 15:57:53 +02:00
0b118f63ad
Merge remote-tracking branch 'origin/develop' into ent-3758-7777-bug-validacion-eventos-en-consola
2019-05-08 15:19:40 +02:00
1ffc6bd028
Merge remote-tracking branch 'origin/develop' into ent-3770-texto-del-pandora-diag
...
Former-commit-id: 35f8be06ed6fff20ff930a19429a0cbcf5aff33d
2019-05-08 14:36:04 +02:00
0ebf89a9eb
Merge branch 'ent-3533-Mostrar-Contact-en-informacion-de-los-eventos' into 'develop'
...
Show contact in events information
See merge request artica/pandorafms!2373
2019-05-08 14:13:08 +02:00
0c8fab6cb3
Merge branch 'ent-3574-7598-bug-botones-y-casillas-vista-de-eventos' into 'develop'
...
Ent 3574 7598 bug botones y casillas vista de eventos
See merge request artica/pandorafms!2222
2019-05-08 13:52:45 +02:00
72a127c085
Merge branch 'ent-3773-fallo-paginacion-templates-alerts' into 'develop'
...
Fixed pagination in Alert templates
See merge request artica/pandorafms!2391
2019-05-08 13:40:18 +02:00
d9e0d44a66
Merge branch 'ent-3782-module-visualization-bug' into 'develop'
...
Added unknown status image
See merge request artica/pandorafms!2314
2019-05-08 13:34:41 +02:00
f13162abf1
Merge branch 'ent-3802-visual-constole-warning-state-bug' into 'develop'
...
Fixed select bug not selectig value
See merge request artica/pandorafms!2346
2019-05-08 13:17:02 +02:00
247605f308
Merge branch 'ent-3664-Al_aplicar_un_cambio_en_un_agente_se_muestra_que_se_ha_realizado_con_exito_pero_no_actualiza_campos_a_primera_vista' into 'develop'
...
Eliminated the cache when update agents
See merge request artica/pandorafms!2242
2019-05-08 12:50:40 +02:00
ef1149d3bb
Fixed get agent status on linked map
2019-05-08 12:39:53 +02:00
5b75b671aa
Merge remote-tracking branch 'origin/develop' into ent-3802-visual-constole-warning-state-bug
2019-05-08 12:37:10 +02:00
297f53b9de
Merge branch 'ent-3608-Update-Manager-Online' into 'develop'
...
Ent 3608 update manager online
See merge request artica/pandorafms!2379
2019-05-08 11:20:12 +02:00
610e0dabbf
Merge branch 'develop' into ent-3773-fallo-paginacion-templates-alerts
2019-05-08 11:17:15 +02:00
99f5cab83d
fixed filemanager
2019-05-08 10:55:20 +02:00
cb49de4d81
New menu module graph - #3617
2019-05-08 10:28:00 +02:00
5e0b53e3c2
New menu module graph - #3617
2019-05-08 09:35:28 +02:00
f2873714a6
Auto-updated build strings.
2019-05-08 00:01:08 +02:00
fa14fa9510
Show new values after update
2019-05-07 17:47:47 +02:00
954aac3aeb
Merge remote-tracking branch 'origin/develop' into ent-3802-visual-constole-warning-state-bug
2019-05-07 17:13:54 +02:00
3221bcf55a
Merge remote-tracking branch 'origin/develop' into ent-3782-module-visualization-bug
2019-05-07 16:08:29 +02:00
283be8f632
New menu module graph - #3617
2019-05-07 16:07:07 +02:00
a92f81272a
Merge branch 'ent-3835-pandora-db-historical-fails-when-port-setted' into develop
2019-05-07 15:05:03 +02:00
10fd9c4b57
Merge branch 'ent-3755-Vista-de-eventos-se-carga-dos-veces' into develop
2019-05-07 15:02:47 +02:00
0a96cfd696
Merge branch 'ent-3819-Bug-en-vista-monitor-details-con-tags' into 'develop'
...
Fixed bug in monitor detail view
See merge request artica/pandorafms!2360
Former-commit-id: fcbe351e4a71b0827fa7e4919a3b4ae8ffa956bb
2019-05-07 10:17:37 +02:00
9116a72a2b
Auto-updated build strings.
...
Former-commit-id: dfb64d2cea90593ac4b70d6e4d9f6958f3b472d8
2019-05-07 00:01:09 +02:00
ad00492ad6
se elimina la query del 27
...
Former-commit-id: 1756d296ad9c13c62c4eb46a854291dfc4200256
2019-05-06 18:23:12 +02:00
fff3a783a1
Se restablece archivo modificado
...
Former-commit-id: 1dca6ef8291dbd98951da31fc765130c9c450316
2019-05-06 18:09:30 +02:00
e1951c45a4
Se añade al 28
...
Former-commit-id: 1607d9cbc88fe0e029df46ada20046899558829e
2019-05-06 18:06:59 +02:00
11a16e4c2a
Merge branch 'ent-3408-snmp-component-creation-api' into 'develop'
...
Fixed wrong array index for id_group
See merge request artica/pandorafms!2286
Former-commit-id: eaea4fc6551e34c2941e094c78099e07a5315df5
2019-05-06 17:00:29 +02:00
3fcd854ae6
fixed error labels graphs and weight in chart
...
Former-commit-id: 52acfda4438417b711295ce8d335ea2748b1fa53
2019-05-06 16:43:59 +02:00
a622dcc9d4
add condition to avoid trying to retrieve a non existing event filter when synchronizing meta and node
...
Former-commit-id: 83a1f9ad1c99de0e29a880de4ed6c518884bda31
2019-05-06 15:06:26 +02:00
545afcb684
Merge branch 'ent-3866-7901-bug-en-busqueda-general-usuario-con-grupo-asignado' into 'develop'
...
Added secondary groups in global search
See merge request artica/pandorafms!2351
Former-commit-id: c9202c576699e7cd4df19e5d7a28bda5fc36826c
2019-05-06 10:33:30 +02:00
Daniel Barbero Martin
artica
Daniel Rodriguez
Marcos Alconada
slerena
Tatiana Llorente
Alejandro Fraguas
Luis Calvo
Daniel Maya
Ramon Novoa
alejandro-campos