Commit Graph

11373 Commits

Author SHA1 Message Date
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
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
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
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
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
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