24159 Commits

Author SHA1 Message Date
Daniel Maya
8bde504fc2 Fixed item sql 2019-12-16 15:50:21 +01:00
Jose Gonzalez
c57ef7e6a0 Added images and CSS file for new demo installation screen 2019-12-16 15:45:27 +01:00
fbsanchez
abd2213e71 Menu entry for websocket engine settings 2019-12-16 15:42:54 +01:00
fbsanchez
89b97e340e Revert "DEBIAN console updated with gotty binary file"
Undo GoTTY in Pandora Console DEB packages

This reverts commit d370fa560a86cb78f91fad53949a49d59cc847bf.
2019-12-16 12:16:42 +01:00
fbsanchez
c2d0377a8d Revert "RPMBUILD console updated with gotty binary file"
Undo Gotty in Pandora Console RPM

This reverts commit e43d8914aa83fa1c43d2ad04fc9e4329ded7afa3.
2019-12-16 12:16: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
alejandro-campos
cc574cdb39 fix pagination in meta monitor view 2019-12-16 11:46:07 +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
fbsanchez
d370fa560a DEBIAN console updated with gotty binary file 2019-12-16 10:51:24 +01:00
fbsanchez
e43d8914aa RPMBUILD console updated with gotty binary file 2019-12-16 10:46:37 +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
marcos
de161d830c add Traducction 2019-12-13 14:46:47 +01:00
marcos
3008651b65 add < list 2019-12-13 14:43:30 +01:00
marcos
4e712d1a45 fixed error 2019-12-13 14:25:33 +01:00
marcos
90d0be6ff1 fixed error 2019-12-13 14:22:50 +01:00
alejandro-campos
d30c2c9b3b Fix bug when updating ACL IP list 2019-12-13 14:17:25 +01:00
marcos
2139e0ef84 add 3 on key event 2019-12-13 14:11:12 +01:00
marcos
480673521c Can select with keyboard list items 2019-12-13 14:08:44 +01:00
Tatiana Llorente
b38c396837 Change date in hover in compact mode 2019-12-13 13:40:19 +01:00
fbsanchez
a558152cb2 minor fix 2019-12-13 13:20:44 +01:00
fbsanchez
ad6ea431bf minor fix, hide quickshell settings while disabled 2019-12-13 13:13:09 +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
13ac0a6229 Merge branch 'ent-5082-setup-visual-styles-reports' into 'develop'
Grouped report items on styles conf. Fixed font bug

See merge request artica/pandorafms!2953
2019-12-13 11:51:56 +01:00
Jose Gonzalez
6f9d400d03 Changed to 2px active tab 2019-12-13 11:50:59 +01:00
fbsanchez
3b5ebd0bf7 Better quickshell integration and fixes 2019-12-13 11:46:44 +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
Daniel Rodriguez
8f041368b4 Merge branch 'ent-4737-revision-completa-de-informes-modo-basico-en-meta' into 'develop'
Fixed minor bugs in metaconsole reports

See merge request artica/pandorafms!2877
2019-12-12 18:12:42 +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
marcos
6a5dfb5ec9 refactor code 2019-12-12 17:16:09 +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 Rodriguez
3223e0a8e1 Merge branch 'ent-4865-8983-modulos-snmp-v3-politicas' into 'develop'
Fixed snmp input

See merge request artica/pandorafms!2914
2019-12-12 17:01:12 +01:00
Daniel Rodriguez
4d34a5028e Merge branch 'ent-5132-Generacion-de-imagenes-en-PDFs' into 'develop'
base64 images pdf

See merge request artica/pandorafms!2955
2019-12-12 16:36:46 +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
marcos
1f3fc1f908 add more pages in order interpreter 2019-12-12 16:27:11 +01:00
alejandro-campos
b998ec3c44 visual changes in html report headers 2019-12-12 14:58:42 +01:00