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

12054 Commits

Author SHA1 Message Date
Daniel Barbero 7d60287018 Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2019-12-19 08:02:47 +01:00
artica f69d243330 Auto-updated build strings. 2019-12-19 00:01:09 +01:00
Daniel Barbero 9b4f12a875 Fixed forms VC 2019-12-18 17:36:01 +01:00
Daniel Maya 7f1245e09d Fixed mceLast class 2019-12-18 10:23:27 +01:00
Daniel Barbero 49ab5e95aa Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2019-12-18 07:50:08 +01:00
artica dcd1bbd527 Auto-updated build strings. 2019-12-18 00:01:20 +01:00
daniel 3e58746cd5 Fixed errors PDF images relative routes 2019-12-17 18:18:00 +01:00
Daniel Rodriguez 3b0de7d448 Merge branch 'ent-5089-color-cabeceras-informes-pdf' into 'develop' 
Changed pdf report header colours(lighter)

See merge request artica/pandorafms!2968
 2019-12-17 12:17:01 +01:00
Tatiana Llorente eca876212c Ent 5095 visualizacion formato de fechas 2019-12-17 12:15:51 +01:00
Daniel Barbero 2a92c9d38d Fixed errors VC forms 2019-12-17 10:57:19 +01:00
Daniel Barbero d77d50bb74 Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2019-12-17 08:26:04 +01:00
artica 0b0c38f9c0 Auto-updated build strings. 2019-12-17 00:01:10 +01:00
Luis Calvo b5bc431d7b Changed pdf report header colours(lighter) 2019-12-16 18:19:34 +01:00
Daniel Maya 8bde504fc2 Fixed item sql 2019-12-16 15:50:21 +01:00
Daniel Rodriguez 24838cad0f Merge branch 'ent-4233-Modificación-en-la-función-genérica-de-render-de-fecha-hora' into 'develop' 
Added compact mode to show timestamp - #4233

See merge request artica/pandorafms!2688
 2019-12-16 11:48:09 +01:00
artica 79cad3eaa9 Updated version and build strings. 2019-12-16 11:43:58 +01:00
artica b71752ea03 Merge remote-tracking branch 'remotes/origin/ent-5108-ws-cookie-parser' into develop 2019-12-16 11:23:06 +01:00
Daniel Rodriguez 11beedc773 Merge branch 'ent-5132-Generacion-de-imagenes-en-PDFs-3' into 'develop' 
Fixed errors

See merge request artica/pandorafms!2962
 2019-12-16 11:20:37 +01:00
Alejandro Fraguas 37020bd572 Merge branch 'ent-4903-list_ACL_IPs_for_API' into 'develop' 
Fix bug when updating ACL IP list

See merge request artica/pandorafms!2961
 2019-12-16 11:19:10 +01:00
Daniel Barbero 6aa085abb9 Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2019-12-16 07:56:13 +01:00
artica f7b0372e53 Auto-updated build strings. 2019-12-16 00:01:07 +01:00
artica 20f3583fc5 Auto-updated build strings. 2019-12-15 00:01:06 +01:00
artica ebe0ba25c8 Auto-updated build strings. 2019-12-14 00:01:09 +01:00
Daniel Barbero a203da5a26 Fixed errors 2019-12-13 16:01:24 +01:00
alejandro-campos d30c2c9b3b Fix bug when updating ACL IP list 2019-12-13 14:17:25 +01:00
Tatiana Llorente b38c396837 Change date in hover in compact mode 2019-12-13 13:40:19 +01:00
fbsanchez bd1954ce38 Setup Websocket engine, unified 2019-12-13 13:11:38 +01:00
Daniel Barbero 9e01cb097c Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2019-12-13 13:02:04 +01:00
fbsanchez 5f32bfdb64 Datatype fix - ws engine 2019-12-13 11:58:12 +01:00
Daniel Rodriguez 350dbaf832 Merge branch 'ent-5132-Generacion-de-imagenes-en-PDFs-2' into 'develop' 
Fix gauge pdf reports

See merge request artica/pandorafms!2958
 2019-12-13 11:28:30 +01:00
Alejandro Fraguas 810ad03c65 Merge branch '4290-Opciones-Adicionales-Templates-Alertas-Idiomas' into 'develop' 
Possible solution to avoid issues with JS and apostrophe of other languages strings

See merge request artica/pandorafms!2932
 2019-12-13 10:50:37 +01:00
Daniel Barbero 603b4e71eb Fix gauge pdf reports 2019-12-13 09:06:54 +01:00
Daniel Barbero 319b3e604f Merge remote-tracking branch 'origin' into new-vc-line-element 2019-12-13 08:15:23 +01:00
artica 37c5acf4d1 Auto-updated build strings. 2019-12-13 00:01:12 +01:00
Daniel Rodriguez b3c55db8fd Merge branch 'ent-4931-Bug-al-crear-informe-con-SLA-Wizard-en-META' into 'develop' 
Ent 4931 bug al crear informe con sla wizard en meta

See merge request artica/pandorafms!2873
 2019-12-12 18:14:00 +01:00
Manuel Montes a2162948b4 Fixed minor bugs in metaconsole reports 2019-12-12 18:12:42 +01:00
vgilc 3d3ff46d12 Merge branch 'ent-5088-Cabecera-de-informes-en-html' into 'develop' 
Ent 5088 cabecera de informes en html

See merge request artica/pandorafms!2956
 2019-12-12 17:58:53 +01:00
vgilc 0a7f24192e Merge branch 'ent-5110-formulario-de-modulos-remotos-erroneo' into 'develop' 
Fixed bug in module creation view

See merge request artica/pandorafms!2954
 2019-12-12 17:07:35 +01:00
Daniel Barbero 63dd3c48f8 Merge remote-tracking branch 'origin/develop' into new-vc-line-element 
Conflicts:
	pandora_console/include/javascript/pandora.js
 2019-12-12 16:32:32 +01:00
alejandro-campos b998ec3c44 visual changes in html report headers 2019-12-12 14:58:42 +01:00
alejandro-campos 7f79a50c33 visual changes in html report headers 2019-12-12 14:55:27 +01:00
Jose Gonzalez 81dcf4713f Modified arab phrase for solve the issue 2019-12-12 14:19:09 +01:00
Daniel Barbero 415a54fb55 base64 images pdf 2019-12-12 14:01:11 +01:00
manuel 2504a3dc09 Fixed bug in module creation view 2019-12-12 13:50:35 +01:00
Daniel Rodriguez 01db6dd3b2 Merge branch 'ent-5094-selector-fechas-informes-html' into 'develop' 
Added margin to date selector elements in reporting viewer

See merge request artica/pandorafms!2945
 2019-12-12 09:10:35 +01:00
artica dd49f0c91c Auto-updated build strings. 2019-12-12 00:01:11 +01:00
daniel 3dbdfdb6eb Fix Landscape reports 2019-12-11 15:07:38 +01:00
fbsanchez bb093482a7 Fix: ws session extraction 2019-12-11 13:04:45 +01:00
Daniel Maya bb4fce07a1 Added secondary groups in event details 2019-12-11 12:35:27 +01:00
artica 772b26ffcb Auto-updated build strings. 2019-12-11 00:01:11 +01:00