Commit Graph

22388 Commits

Author SHA1 Message Date
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
Alejandro Fraguas b390c6cb26 Merge branch 'ent-4149-Poner-mensaje-sin-eventos-en-la-extension-de-pandora-si-no-hay-eventos' into 'develop'
updated chrome events extension

See merge request artica/pandorafms!2622
2019-08-20 13:12:51 +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
marcos.alconada d46e013567 fixed visual error!
ç2
2019-08-19 14:29:04 +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 f1291bee4c Merge branch 'develop' of https://192.168.50.5:8081/artica/pandorafms into develop 2019-08-13 12:27:39 +02:00
Daniel Rodriguez d561f7862a Merge branch 'ent-4489-revision-comportamiento-pandora_server-e7' into 'develop'
Ent 4489 revision comportamiento pandora server e7

See merge request artica/pandorafms!2644
2019-08-13 12:24:02 +02:00
artica 411bb093b2 Merge remote-tracking branch 'remotes/origin/ent-4489-revision-comportamiento-pandora_server-e7' into develop 2019-08-13 10:53:45 +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
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