tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
21,556 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

21556 Commits

Author SHA1 Message Date
Daniel Rodriguez 35c914dc34 Merge branch 'ent-4181-7962-LDAP-no-parsea-Advanced-Permissions-LDAP' into 'develop' 
Fixed Advanced Permissions LDAP

See merge request artica/pandorafms!2521
 2019-06-25 18:21:42 +02:00
Daniel Rodriguez 6af895b9c1 Merge branch 'ent-3999-No-se-ve-icono-SO-en-eventos-en-metaconsola' into 'develop' 
Added meta option in function ui_print_os_icon - #3999

See merge request artica/pandorafms!2502
 2019-06-25 16:04:51 +02:00
Daniel Rodriguez 10aa0631af Merge branch 'ent-4208-Ayuda-vacia-modulos-unknown' into 'develop' 
Removed empty help in unknown modules - #4208

See merge request artica/pandorafms!2499
 2019-06-25 14:47:20 +02:00
Daniel Rodriguez b18de5cb1c Merge branch 'ent-4160-Fallo-visual-SNMP-browser' into 'develop' 
Fixed visual bug in snmp browser - #4160

See merge request artica/pandorafms!2531
 2019-06-25 14:46:25 +02:00
Daniel Rodriguez 01514ba5b6 Merge branch 'ent-3699-descuadre-visual-recuperar-password' into 'develop' 
Ent 3699 descuadre visual recuperar password

See merge request artica/pandorafms!2336
 2019-06-25 14:26:57 +02:00
Daniel Rodriguez 63eca254f6 Merge branch 'ent-3888-cambio-titulo-plugin-creation' into 'develop' 
changed title plugin creation to plugin registration

See merge request artica/pandorafms!2358
 2019-06-25 14:25:34 +02:00
Daniel Rodriguez a3d0e3b55d Merge branch 'ent-4040-menu-resources-no-esta-resaltado-en-vista-de-agente' into 'develop' 
Condition is added to keep the selection color in the main menu

See merge request artica/pandorafms!2464
 2019-06-25 13:10:15 +02:00
Daniel Rodriguez 2ab7e26d07 Merge branch 'ent-3821-Option-servers-operator-read' into 'develop' 
Deleted Servers menu option for operator(read)

See merge request artica/pandorafms!2328
 2019-06-25 13:09:23 +02:00
Daniel Rodriguez c5be8e55ae Merge branch 'ent-3807-html-special-chars-conversion' into 'develop' 
Ent 3807 html special chars conversion

See merge request artica/pandorafms!2320
 2019-06-25 12:19:01 +02:00
Daniel Rodriguez 569bfa2329 Merge branch 'ent-3697-no-hay-opcion-a-ver-todos-los-grupos-con-permisos-correctos' into 'develop' 
Pending Q&A

See merge request artica/pandorafms!2262
 2019-06-25 12:06:07 +02:00
Daniel Rodriguez ea7e4892c3 Merge branch 'ent-4064-7999-pandora-ha-eventserver-alertas-duplicadas' into 'develop' 
HA related fixes to the Recon Server.

See merge request artica/pandorafms!2529
 2019-06-25 10:36:16 +02:00
artica a469ff29da Auto-updated build strings. 2019-06-25 00:01:09 +02:00
fbsanchez 381e30941d Merge branch 'ent-4244-hearbeat-designs-gif' into 'develop' 
new hearbeat designs

See merge request artica/pandorafms!2535
 2019-06-24 19:32:11 +02:00
fbsanchez c24d7dbbda new hearbeat designs 2019-06-24 19:28:19 +02:00
Tatiana Llorente 13ecec40c2 Fixed visual bug in snmp browser - #4160 2019-06-24 17:08:21 +02:00
Ramon Novoa 3fe4256743 HA related fixes to the Recon Server. 2019-06-24 11:25:26 +02:00
Alejandro Fraguas ce1231eae6 Merge branch 'ent-3916-bulk-operation-alerts-no-entuentra-alertas' into 'develop' 
Added option in massive delete alerts to show alerts on disabled modules

See merge request artica/pandorafms!2396
 2019-06-24 09:55:44 +02:00
artica c56f1dea9e Auto-updated build strings. 2019-06-24 00:01:06 +02:00
artica 3bd4743247 Auto-updated build strings. 2019-06-23 00:01:08 +02:00
artica 0878af4ab1 Auto-updated build strings. 2019-06-22 00:01:08 +02:00
artica e2e53cf248 Auto-updated build strings. 2019-06-21 00:01:08 +02:00
Daniel Rodriguez 265202f1ed Merge branch 'ent-4136-button-styles' into 'develop' 
Review 1

See merge request artica/pandorafms!2470
 2019-06-20 16:35:12 +02:00
Alejandro Fraguas c173f9a58f Merge branch 'ent-4209-bug-vc-grafica-sla-automatica-explota-en-cuanto-se-le-ajustan-un-label' into 'develop' 
Bug en label de  auto sla graph

See merge request artica/pandorafms!2517
 2019-06-20 13:53:07 +02:00
Alejandro Fraguas 4660ca286f Merge branch 'ent-4225-No-se-pueden-crear-componentes-de-red-en-la-meta' into 'develop' 
Ent 4225 no se pueden crear componentes de red en la meta

See merge request artica/pandorafms!2516
 2019-06-20 11:41:21 +02:00
Alejandro Fraguas 57e3c147c8 Merge branch 'ent-3959-eventos-de-validacion-manual-de-alertas' into 'develop' 
Changed message to module name

See merge request artica/pandorafms!2518
 2019-06-20 10:22:15 +02:00
Daniel Maya e828fd6690 Fixed Advanced Permissions LDAP 2019-06-20 09:49:54 +02:00
artica 61b35d4bf2 Auto-updated build strings. 2019-06-20 00:01:08 +02:00
marcos.alconada 98eb1acf00 Add name alert to message 2019-06-19 17:55:09 +02:00
marcos.alconada 358c3f6a55 Changed message to module name 2019-06-19 16:04:08 +02:00
Alejandro Gallardo Escobar c87919af94 Bugfix 2019-06-19 15:17:13 +02:00
alejandro-campos 45d544ca5d remove typo error in commit 2019-06-19 15:14:41 +02:00
alejandro-campos 5503abc8e1 fix bug in metaconsoles network component creation 2019-06-19 15:12:17 +02:00
Alejandro Fraguas 9a24c90725 Merge branch 'ent-4134-los-informes-no-funcionan-al-exportar-a-csv-json-ni-xml' into 'develop' 
Remove entities from json reports

See merge request artica/pandorafms!2512
 2019-06-19 14:17:58 +02:00
marcos.alconada 174db17a05 remove entities from reports 2019-06-19 12:33:11 +02:00
Daniel Rodriguez cfaeaa3c9c Merge branch 'ent-3295-revision-comportamiento-metaconsola-con-nodo-multi-servidor' into 'develop' 
Ent 3295 revision comportamiento metaconsola con nodo multi servidor

See merge request artica/pandorafms!2440
 2019-06-19 12:15:14 +02:00
fbsanchez 4424189632 Merge remote-tracking branch 'origin/develop' into ent-3295-revision-comportamiento-metaconsola-con-nodo-multi-servidor 2019-06-19 10:51:34 +02:00
Rafael Ameijeiras 47fc2d70ad Merge branch 'ent-4235-deltete_forgoten_file' into 'develop' 
Ent 4235  deltete_forgoten_file

See merge request artica/pandorafms!2514
 2019-06-19 10:23:01 +02:00
Rafael Ameijeiras b428797004 delete_file 2019-06-19 10:12:06 +02:00
fbsanchez a7f9484adb minor style change 2019-06-19 08:43:37 +02:00
artica a5b140768a Auto-updated build strings. 2019-06-19 00:01:09 +02:00
fbsanchez 37e98d108b fit mc 2019-06-18 19:17:21 +02:00
fbsanchez 8b8d17f089 event ajax validation little improvement 2019-06-18 18:35:34 +02:00
fbsanchez 24025ebb74 Merge remote-tracking branch 'origin/develop' into ent-4136-button-styles 2019-06-18 17:48:03 +02:00
fbsanchez c3ebe88178 style review 2019-06-18 17:40:31 +02:00
Daniel Rodriguez a87e3ce97e Merge branch 'ent-3739-Vista-Agent-Module-view-no-funciona-en-pantalla-completa-y-autorefresco' into 'develop' 
Fixed bug in Agent-Module fullscreen view

See merge request artica/pandorafms!2299
 2019-06-18 17:00:15 +02:00
Alejandro Fraguas bb64524da9 Merge branch 'ent-4222-No-genera-custom-graphs-lines-average-summation' into 'develop' 
Fixed sum/avg graph infinite loop

See merge request artica/pandorafms!2513
 2019-06-18 16:58:33 +02:00
fbsanchez d290b91b28 RC1 event viewer v2 2019-06-18 16:07:53 +02:00
fbsanchez a1f004fdec minor fixes 2019-06-18 15:03:49 +02:00
Tatiana Llorente 46f64f75c8 Fixed autorefresh in full screen - #3739 2019-06-18 14:54:40 +02:00
fbsanchez 22272225b8 massive operations over events 2019-06-18 14:26:55 +02:00