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

11467 Commits

Author SHA1 Message Date
artica d6b91e9fce Auto-updated build strings. 2019-09-02 00:01:15 +02:00
artica aea8a6b3c7 Auto-updated build strings. 2019-09-01 00:01:07 +02:00
artica fe7ec38cef Auto-updated build strings. 2019-08-31 00:01:12 +02:00
Daniel Rodriguez c47b24d84c Merge branch 'ent-4278-Bug-ACL-al-cargar-o-gestionar-filtros-de-eventos' into 'develop' 
Fixed bug permissions on filter events- 4278

See merge request artica/pandorafms!2671
 2019-08-30 16:07:45 +02:00
Daniel Rodriguez c46686981e Merge branch 'ent-4547-Entities-extrañas-en-el-CSV-del-Review-Logs' into 'develop' 
modified function to export audit csv to decode entities as separator

See merge request artica/pandorafms!2692
 2019-08-30 14:29:44 +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
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
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
artica 1c4b639deb Auto-updated build strings. 2019-08-29 00:01:08 +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
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 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
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
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
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
artica 1d0875e89a Auto-updated build strings. 2019-08-22 00:01:11 +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
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 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
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 38547052fb Fixed bug permissions on filter events- 4278 2019-08-20 13:42:04 +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
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 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
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 bdee45c2dd Fixed duplicated names - #4280 2019-08-12 14:24:26 +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
fbsanchez adbb48ab87 pandora HA review 2019-08-10 02:13:01 +02:00
artica 4f25e42be1 Auto-updated build strings. 2019-08-10 00:01:17 +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
Daniel Rodriguez ff3134c55a Merge branch 'ent-4388-Nuevos-eventos' into 'develop' 
Ent 4388 nuevos eventos

See merge request artica/pandorafms!2628
 2019-08-09 09:00:57 +02:00
artica 992958f4b4 Auto-updated build strings. 2019-08-09 00:01:09 +02:00
alejandro-campos 0461cb04f7 fix graphs not showing in metaconsole monitors view 2019-08-08 15:18:15 +02:00
artica 21c81f6dfe Auto-updated build strings. 2019-08-08 00:01:08 +02:00
Tatiana Llorente 7826ba79e6 Remove disabled modules to create service element - #4458 2019-08-07 14:23:10 +02:00
manuel 6c90a4dd53 Fixed bug in alerts details view 2019-08-07 13:04:37 +02:00
artica 871e0568d7 Auto-updated build strings. 2019-08-07 00:01:32 +02:00
Jose Gonzalez 3d03faed9a Solved some issues 2019-08-06 14:56:57 +02:00
Luis Calvo 47e8a618c2 Fixed alert actions bug 2019-08-06 14:41:54 +02:00
artica 5aa9320ae3 Auto-updated build strings. 2019-08-06 00:01:22 +02:00
Alejandro Campos 12eacc1933 Merge branch 'develop' into 'ent-4388-Nuevos-eventos' 
# Conflicts:
#   pandora_console/extras/mr/31.sql
#   pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
 2019-08-05 09:26:18 +02:00
artica 2133551889 Auto-updated build strings. 2019-08-05 00:01:08 +02:00
artica 914a41ab8d Auto-updated build strings. 2019-08-04 00:01:08 +02:00
artica e417b775c7 Auto-updated build strings. 2019-08-03 00:01:10 +02:00
Daniel Rodriguez 06591680de Merge branch 'ent-4408-csv-meta-custom-field-views' into 'develop' 
Added title in custom field

See merge request artica/pandorafms!2613
 2019-08-02 14:12:21 +02:00
artica 3a654c7f79 Auto-updated build strings. 2019-08-02 00:01:11 +02:00
Tatiana Llorente c591dd4260 Show html tags in instructions - #4352 2019-08-01 13:11:50 +02:00
artica 28e562a2f7 Auto-updated build strings. 2019-08-01 00:01:09 +02:00
fbsanchez 1e73105fc9 minor fix adding slash if not found 2019-07-31 10:59:51 +02:00
artica 6713f51414 Updated version and build strings. 2019-07-31 09:25:59 +02:00
artica 9995d8b654 Auto-updated build strings. 2019-07-31 00:01:13 +02:00
alejandro-campos b4bd7f0f63 fixed problems in event view and event view custom fields 2019-07-30 16:10:34 +02:00
fbsanchez 755b0bbf7d Merge remote-tracking branch 'origin/develop' into ent-2441-despliegue-de-agentes-desde-pandora 2019-07-30 12:53:23 +02:00
artica 8734697169 Auto-updated build strings. 2019-07-30 00:01:11 +02:00
Jose Gonzalez dd77429aea Solved issue with status names 2019-07-29 17:22:16 +02:00
Luis Calvo f6f96523a0 Added html enconde 2019-07-29 16:57:39 +02:00
Jose Gonzalez 719f56efec Modified SQL queries for avoidance of case sensitive 2019-07-29 16:32:50 +02:00
artica 4d9d0deab7 Auto-updated build strings. 2019-07-29 00:01:08 +02:00
artica 32b013e11c Auto-updated build strings. 2019-07-28 00:01:06 +02:00
artica 3980cefd2c Auto-updated build strings. 2019-07-27 00:01:09 +02:00
fbsanchez f7e2023253 Merge remote-tracking branch 'origin/develop' into ent-2441-despliegue-de-agentes-desde-pandora 2019-07-26 21:56:45 +02:00
artica 871d8e9885 Auto-updated build strings. 2019-07-26 00:01:10 +02:00
fbsanchez 6ac21acd39 wip agent deployment scan 2019-07-25 18:35:51 +02:00
Jose Gonzalez 5ab2bfacbd Modified date formatting to avoid entities 2019-07-25 15:43:46 +02:00
Jose Gonzalez 5cdfb871a1 Modified the divider in print_audit_csv function 2019-07-25 15:35:57 +02:00
fbsanchez 1445740e2c Merge remote-tracking branch 'origin/develop' into ent-2441-despliegue-de-agentes-desde-pandora 2019-07-25 12:08:18 +02:00
Daniel Rodriguez 2475e6a881 Merge branch 'ent-8429-eventos-duplicados-metaconsola' into 'develop' 
SQL Query modified for solve duplicate events issue

See merge request artica/pandorafms!2611
 2019-07-25 10:29:31 +02:00
artica 3f90ebc938 Auto-updated build strings. 2019-07-25 00:01:09 +02:00
fbsanchez ce346bd604 agent deployment 2019-07-24 17:38:25 +02:00
Daniel Maya 4e01967b88 Added title in custom field 2019-07-24 17:05:54 +02:00