23632 Commits

Author SHA1 Message Date
fbsanchez
9ee102b365 already used ui_get_full_url 2019-12-19 20:02:29 +01:00
fbsanchez
abf4097e63 Minor fix - opensource welcome icon 2019-12-19 19:58:00 +01:00
Rafael Ameijeiras
2162fdae39 adding python3 to the docker agent image 2019-12-19 18:17:59 +01:00
marcos
8695e1aa4b Restore reverted changes 2019-12-19 17:45:38 +01:00
marcos
43d08f354a Ajustes CSS 2019-12-19 16:53:45 +01:00
marcos
87405ba318 add message no resoult found 2019-12-19 14:20:31 +01:00
marcos
7217176a75 add acl's to order interpreter 2019-12-19 14:11:07 +01:00
marcos
e06c974e67 add acl's to order interpreter 2019-12-19 14:10:43 +01:00
fbsanchez
4197b7036b Added ssh_launcher settings to pandora_Server 2019-12-19 11:48:20 +01:00
alejandro-campos
c3daa7e803 removed newsletter notification from messages list 2019-12-19 10:42:41 +01:00
Tatiana Llorente
4aa57143e7 Fixed visual bug in update manager offline 2019-12-19 09:42:54 +01:00
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
Luis Calvo
22eb76b56b Fixed meta regex agent matching ids 2019-12-18 19:00:34 +01:00
Daniel Barbero
9b4f12a875 Fixed forms VC 2019-12-18 17:36:01 +01:00
manuel
9e88c1c2c2 Fixed bug in inventory item 2019-12-18 17:00:14 +01:00
Daniel Rodriguez
56f22dbd71 Merge branch 'ent-5146-No-se-pueden-editar-los-Front-side-custom-reports' into 'develop'
Fixed mceLast class

See merge request artica/pandorafms!2973
2019-12-18 11:14:56 +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 Rodriguez
a016f7fb40 Merge branch 'ent-5132-Generacion-de-imagenes-en-PDFs-4' into 'develop'
Fixed errors PDF images relative routes

See merge request artica/pandorafms!2970
2019-12-17 18:18:00 +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
Daniel Rodriguez
ed78839d07 Merge branch 'ent-5095-Visualizacion-formato-de-fechas' into 'develop'
Ent 5095 visualizacion formato de fechas

See merge request artica/pandorafms!2948
2019-12-17 12:15:51 +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 Maya
9db5b2bead fixed recursion in Group event report 2019-12-17 10:38:56 +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
Daniel Rodriguez
ad9879bc1e Merge branch 'ent-5158-Informes-SQL-en-la-meta' into 'develop'
Fixed item sql

See merge request artica/pandorafms!2966
2019-12-16 18:23:17 +01:00
Luis Calvo
b5bc431d7b Changed pdf report header colours(lighter) 2019-12-16 18:19:34 +01:00
Alejandro Fraguas
f59f044c1c Merge branch 'ent-5108-ws-cookie-parser' into 'develop'
Ent 5108 ws cookie parser

See merge request artica/pandorafms!2964
2019-12-16 17:02:13 +01:00
fbsanchez
4631d9ea64 minor style fix 2019-12-16 16:48:29 +01:00
fbsanchez
ded6dcb41a Merge remote-tracking branch 'origin/develop' into ent-5108-ws-cookie-parser 2019-12-16 16:44:02 +01:00
Jose Gonzalez
d8f232d814 Added control for MS Edge and Internet Explorer browsers for disallow linear gradient 2019-12-16 16:39:13 +01:00
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