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

17471 Commits

Author SHA1 Message Date
Daniel Rodriguez 191161dbfc Merge branch '4474-Paginacion-SNMP-se-pierde-al-actualizar-Intracom' into 'develop' 
Fixed pagination bug

See merge request artica/pandorafms!2637
 2019-08-30 14:13:29 +02:00
Daniel Rodriguez ab5ad9a459 Merge branch 'ent-4519-iconos-no-alineados-en-reporting-builder' into 'develop' 
fixed error

See merge request artica/pandorafms!2665
 2019-08-30 14:12:42 +02:00
Daniel Rodriguez 85b7ee034f Merge branch 'ent-4524-Campo-Command-en-respuestas-de-eventos' into 'develop' 
Changed input for textarea in command field - #4524

See merge request artica/pandorafms!2676
 2019-08-30 14:12:21 +02:00
Daniel Rodriguez f292780aa2 Merge branch 'ent-4377-Fallo-al-listar-los-items-de-tipo-text-en-los-reports-de-metaconsola' into 'develop' 
Added item type text to list of items- #4377

See merge request artica/pandorafms!2652
 2019-08-30 14:11:18 +02:00
Daniel Rodriguez cbfb8b1e89 Merge branch 'ent-4389-Error-al-mostrar-el-nombre-de-un-agente-en-la-edicion-de-un-item-de-un-report' into 'develop' 
Show alias instead of name - #4389

See merge request artica/pandorafms!2651
 2019-08-30 14:10:52 +02:00
Daniel Rodriguez 1ca7e03fa4 Merge branch 'ent-4523-fallos-en-black-theme' into 'develop' 
Changed background-color in request new licence

See merge request artica/pandorafms!2673
 2019-08-30 14:10:04 +02:00
marcos.alconada d650ff6959 fixed error 2019-08-30 11:28:24 +02:00
Daniel Maya de47275735 Fixed mr 2019-08-30 10:34:52 +02:00
manuel 94e377c3c3 Merge branch 'develop' into ent-3813-Autocompletado-de-campo-Proxy-auth-server-al-crear-webserver-module 
Conflicts:
	pandora_console/godmode/agentes/configurar_agente.php
 2019-08-30 09:46:27 +02:00
alejandro-campos f423ddc42f modified function to export audit csv to decode entities as separator 2019-08-30 09:42:58 +02:00
manuel ce4f4f003d Merge branch 'develop' into ent-3895-Pete-permisos-al-intentar-borrar-un-report-sin-seleccionar-ninguno-en-los-checkboxs 
Conflicts:
	pandora_console/godmode/reporting/reporting_builder.php
 2019-08-30 09:30:11 +02:00
Daniel Maya 25354f6f3b delete session open by api calls 2019-08-30 08:47:49 +02:00
artica 79298d0b8e Auto-updated build strings. 2019-08-30 00:01:09 +02:00
manuel b6870178c9 Fixed minor error 2019-08-29 15:21:39 +02:00
Tatiana Llorente 94195cf70a Change permissions to save custom graph in agent view - #4575 2019-08-29 11:27:40 +02:00
artica 1c4b639deb Auto-updated build strings. 2019-08-29 00:01:08 +02:00
Daniel Maya 5ad22620b9 mr power up 2019-08-28 12:49:41 +02:00
Daniel Maya 94d797b4b7 Fixed session garbage collector 2019-08-28 11:33:02 +02:00
Alejandro Fraguas 21712c5c23 Merge branch 'ent-4565-No-funciona-el-filtro-de-servidor-en-la-vista-de-eventos-de-la-metaconsola' into 'develop' 
Fixed bug in metaconsole filter events

See merge request artica/pandorafms!2683
 2019-08-28 09:20:18 +02:00
artica 662c9ca7f2 Auto-updated build strings. 2019-08-28 00:01:10 +02:00
manuel 3901a1abb6 Fixed bug in metaconsole filter events 2019-08-27 15:46:22 +02:00
Tatiana Llorente d38f1f8aec Fixed bug in unit in massive operations - #4166 2019-08-27 12:21:00 +02:00
Alejandro Fraguas fe088a59d6 Merge branch 'ent-4490-Cambio-de-dato-a-percentil-segun-el-tamano-de-custom-graph-en-consola-visual' into 'develop' 
fixed error labels pie chart

See merge request artica/pandorafms!2679
 2019-08-27 12:02:27 +02:00
Luis Calvo 23e5c50d13 Added new custom fields url formating to custom fields 2019-08-27 09:34:42 +02:00
Luis Calvo 2dc084da8a Merge remote-tracking branch 'origin/develop' into ent-4132-custom-fields-url 2019-08-27 09:11:45 +02:00
artica c06ec0477c Auto-updated build strings. 2019-08-27 00:01:10 +02:00
Daniel Maya 63da85798e Change mr 2019-08-26 16:10:06 +02:00
Daniel Maya 473b29252c Merge branch 'develop' into ent-3918-cambiar-el-tamaño-por-defecto-de-los-elementos-de-icono 2019-08-26 16:08:03 +02:00
Alejandro Fraguas fadccf0ff3 Merge branch 'ent-4509-AADCM-MCM-8206-Bug-en-consola-visual-link-a-consola-visual-publica' into 'develop' 
Fixed bug in public visual console view

See merge request artica/pandorafms!2672
 2019-08-26 13:12:31 +02:00
Tatiana Llorente ea970f2adc Escape the double quotes that may have the name of the module - #4503 2019-08-26 12:26:43 +02:00
marcos.alconada efd6a72bb8 Merge remote-tracking branch 'origin/develop' into ent-4513-bugs-en-password-policy 2019-08-26 08:09:14 +02:00
artica a2713517f0 Auto-updated build strings. 2019-08-26 00:01:08 +02:00
artica 1320426628 Auto-updated build strings. 2019-08-25 00:01:09 +02:00
artica 56da633588 Auto-updated build strings. 2019-08-24 00:01:09 +02:00
Alejandro Fraguas 51f2baa0dd Merge branch 'ent-4541-Comportamiento_erroneo_en_Metaconsola' into 'develop' 
fixed event view metaconsole

See merge request artica/pandorafms!2677
 2019-08-23 13:19:30 +02:00
Daniel Barbero 22f125dee0 fixed error labels pie chart 2019-08-23 10:59:06 +02:00
artica 6a982697d2 Auto-updated build strings. 2019-08-23 00:01:11 +02:00
marcos.alconada 8d8e08d37b fixed visual error 2019-08-22 15:25:35 +02:00
Daniel Barbero Martin 31da17db03 fixed event view metaconsole 2019-08-22 14:27:45 +02:00
Alejandro Fraguas 03fb2875be Merge branch 'ent-4431-Problemas-CSV-Audit-log' into 'develop' 
Modified the divider in print_audit_csv function

See merge request artica/pandorafms!2615
 2019-08-22 13:40:55 +02:00
Tatiana Llorente e8a873de7c Changed input for textarea in command field - #4524 2019-08-22 11:22:40 +02:00
Alejandro Fraguas 38d6a587fd Merge branch 'ent-4504-contador-de-graficas-encontradas-no-funciona' into 'develop' 
fixed error

See merge request artica/pandorafms!2663
 2019-08-22 10:12:57 +02:00
Alejandro Fraguas 26f247375b Merge branch '4496-Graficas-Metaconsola-no-funcionan' into 'develop' 
fix graphs not showing in metaconsole monitors view

See merge request artica/pandorafms!2649
 2019-08-22 09:41:18 +02:00
Alejandro Fraguas 1e5b6a8416 Merge branch 'ent-4507-bug-visual-en-version-open' into 'develop' 
fixed visual error in Open

See merge request artica/pandorafms!2670
 2019-08-22 08:43:44 +02:00
artica 1d0875e89a Auto-updated build strings. 2019-08-22 00:01:11 +02:00
Tatiana Llorente b444be87b4 Fixed bug in custom unit #4166 2019-08-21 14:46:58 +02:00
Alejandro Fraguas 0f1baadb00 Merge branch 'ent-4032-new-macro-sql-reports' into 'develop' 
Ent 4032 new macro sql reports

See merge request artica/pandorafms!2610
 2019-08-21 14:23:28 +02:00
Tatiana Llorente d515e510f3 Fixed bug in custom unit #4166 2019-08-21 13:38:53 +02:00
Alejandro Fraguas d42bcd17c2 Merge branch 'ent-4366-fallos-visuales-en-el-log-de-pandora' into 'develop' 
fixed visual error

See merge request artica/pandorafms!2666
 2019-08-21 12:17:53 +02:00
Alejandro Fraguas 73a421db14 Merge branch 'ent-4502-busqueda-global' into 'develop' 
fixed security warning

See merge request artica/pandorafms!2664
 2019-08-21 11:26:27 +02:00
Alejandro Fraguas 83cb4fc484 Merge branch 'ent-4458-Filtro-de-módulos-deshabilitados-al-agregarlos-a-un-servicio' into 'develop' 
Remove disabled modules to create service element - #4458

See merge request artica/pandorafms!2646
 2019-08-21 10:32:11 +02:00
Alejandro Fraguas 72e28d6a3c Merge branch 'ent-4304-8295-centrar-elementos-en-informes-sql' into 'develop' 
centrar elementos en informes sql

See merge request artica/pandorafms!2662
 2019-08-21 09:58:50 +02:00
Luis Calvo a8c351d177 Custom fields type hint BBCode updated 2019-08-21 09:55:53 +02:00
marcos.alconada ff44666e41 fixed visual error2 2019-08-21 09:49:17 +02:00
Alejandro Fraguas 7e4987b1c8 Merge branch 'ent-4514-bug-visual-al-crear-usuarios' into 'develop' 
fixed visual error

See merge request artica/pandorafms!2668
 2019-08-21 09:46:44 +02:00
marcos.alconada a6037d8308 Changed background-color in request new licence 2019-08-21 09:27:55 +02:00
manuel e439e7349f Fixed bug in public visual console view 2019-08-21 09:22:13 +02:00
artica c36234a3ae Auto-updated build strings. 2019-08-21 00:01:09 +02:00
Alejandro Fraguas 4c3d705340 Merge branch 'ent-4352-Evento-con-intructions-no-las-muestra-como-enlaces' into 'develop' 
Ent 4352 evento con intructions no las muestra como enlaces

See merge request artica/pandorafms!2630
 2019-08-20 14:29:47 +02:00
Tatiana Llorente 32a3776260 Fixed bug permissions on filter events- 4278 2019-08-20 13:46:13 +02:00
Tatiana Llorente 38547052fb Fixed bug permissions on filter events- 4278 2019-08-20 13:42:04 +02:00
marcos.alconada a77a72cea5 fixed visual error on Open 2019-08-20 13:07:47 +02:00
Alejandro Fraguas 8b9cd01d58 Merge branch 'ent-4483-Vista-detalle-de-alertas-erronea' into 'develop' 
Fixed bug in alerts details view

See merge request artica/pandorafms!2643
 2019-08-20 11:32:23 +02:00
artica 13d8c065e6 Auto-updated build strings. 2019-08-20 00:01:10 +02:00
Alejandro Fraguas 3356349578 Merge branch 'ent-4522-Bug-en-el-autorrefresco-de-la-vista-de-eventos-en-pantalla-completa' into 'develop' 
Fixed bug in autorefresh in events view with fullscreen - #4522

See merge request artica/pandorafms!2667
 2019-08-19 14:23:42 +02:00
Alejandro Fraguas 23cdc419a9 Merge branch 'ent-4397-visual-console-racks-branch2' into 'develop' 
Ent 4397 visual console racks branch2

See merge request artica/pandorafms!2650
 2019-08-19 13:55:51 +02:00
marcos.alconada 44eb8dd3d1 fixed visual error 2019-08-19 12:31:47 +02:00
Tatiana Llorente d85e4caa99 Fixed bug in autorefresh in events view with fullscreen - #4522 2019-08-19 11:36:13 +02:00
Tatiana Llorente 7eeafaf351 Fixed bug in autorefresh in events view with fullscreen - #4522 2019-08-19 11:32:40 +02:00
marcos.alconada 0414b4033e fixed visual error 2019-08-19 10:05:06 +02:00
artica 6550d52813 Auto-updated build strings. 2019-08-19 00:01:07 +02:00
artica 7a57ae9063 Auto-updated build strings. 2019-08-18 00:01:06 +02:00
artica 0802d45e85 Auto-updated build strings. 2019-08-17 00:01:10 +02:00
marcos.alconada e83f001948 fixed error 2019-08-16 13:47:06 +02:00
marcos.alconada 323c877890 fixed security warning 2019-08-16 11:25:08 +02:00
Daniel Rodriguez d690ef1a5d Merge branch 'ent-4505-Errores-en-el-black-theme' into 'develop' 
add deleted condition

See merge request artica/pandorafms!2660
 2019-08-16 10:51:59 +02:00
marcos.alconada e89193ca0f fixed error 2019-08-16 10:43:56 +02:00
Daniel Rodriguez 2a59a69f02 Merge branch 'ent-4300-Desaparecen-margenes-al-borrar-un-tag-management' into 'develop' 
Added margin - #4300

See merge request artica/pandorafms!2657
 2019-08-16 10:00:18 +02:00
marcos.alconada f2cf24cfb8 center content tables in pdf generator 2019-08-16 09:30:10 +02:00
marcos.alconada 61a1243213 center content tables in pdf generator 2019-08-16 09:29:40 +02:00
artica ac85884e46 Auto-updated build strings. 2019-08-16 00:01:08 +02:00
artica 4e544e8433 Auto-updated build strings. 2019-08-15 00:01:16 +02:00
artica 7b78b5820e Auto-updated build strings. 2019-08-14 00:01:10 +02:00
marcos.alconada 3d68641e4e add space in networkp map 2019-08-13 14:41:57 +02:00
marcos.alconada 9310fd8dc1 add deleted condition 2019-08-13 13:58:44 +02:00
artica c0588d95ca Updated version and build strings. 2019-08-13 12:27:44 +02:00
artica a8915e13ad Auto-updated build strings. 2019-08-13 00:01:08 +02:00
Tatiana Llorente 747e06c8b0 Added margin - #4300 2019-08-12 12:54:06 +02:00
Luis Calvo db349a4783 Fixed empty http_auth_user and pass 2019-08-12 12:26:00 +02:00
marcos.alconada 30f7a48d7b Fixed error with news modal windows 2019-08-12 09:36:16 +02:00
artica 5cecf1f899 Auto-updated build strings. 2019-08-12 00:01:07 +02:00
artica 390acf0459 Auto-updated build strings. 2019-08-11 00:01:09 +02:00
artica 4f25e42be1 Auto-updated build strings. 2019-08-10 00:01:17 +02:00
Tatiana Llorente 2bc57b9561 Reduced the speed of events marquee - #4363 2019-08-09 12:50:07 +02:00
Tatiana Llorente b893d55a49 Added item type text to list of items- #4377 2019-08-09 12:09:49 +02:00
Tatiana Llorente 8bfde74a06 Show alias instead of name - #4389 2019-08-09 11:06:17 +02:00
Luis Calvo 72c4b55477 Corregida errata comentario 2019-08-09 10:52:25 +02:00
Luis Calvo 4fe4e58874 Re-uploaded visual-console rack images and db data 2019-08-09 10:46:47 +02:00
Luis Calvo 0cb0a63a8f Re-uploaded visual-console rack images and db data 2019-08-09 10:42:44 +02:00
Daniel Rodriguez 57fcfee36c Merge branch '4003-Arreglos-en-servicios' into 'develop' 
4003 arreglos en servicios

See merge request artica/pandorafms!2621
 2019-08-09 09:04:17 +02:00