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

23252 Commits

Author SHA1 Message Date
Kike 0f34528f6f Set default rcmd_timeout=10 and new rcmd_timeout_bin token 2019-12-23 17:28:40 +01:00
Alejandro Fraguas 9d318a8612 Merge branch '5144-IE-Edge-Login-Background' into 'develop' 
Added control for MS Edge and Internet Explorer browsers for disallow linear gradient

See merge request artica/pandorafms!2967
 2019-12-23 17:13:42 +01:00
Alejandro Fraguas c91290f062 Merge branch 'ent-4955-Bug-nombre-y-descripcion-items-informes' into 'develop' 
Changed title  name or description in items table of reports

See merge request artica/pandorafms!2875
 2019-12-23 17:13:39 +01:00
Alejandro Fraguas 7b97855dd7 Merge branch 'ent-3607-fallos-visuales-en-la-vista-de-plugin-de-la-metaconsola' into 'develop' 
Fixed file.png in plugin

See merge request artica/pandorafms!2725
 2019-12-23 17:10:56 +01:00
Alejandro Fraguas 68a47354f9 Merge branch 'ent-3494-Item-group-en-visual-console-metaconsola' into 'develop' 
fix bug in meta visual console: group item not retrieving values properly

See merge request artica/pandorafms!2864
 2019-12-23 16:54:40 +01:00
Alejandro Fraguas ecb190910b Merge branch '3812-Pantalla-Instalacion-DB-Demos' into 'develop' 
Added images and CSS file for new demo installation screen

See merge request artica/pandorafms!2965
 2019-12-23 11:27:55 +01:00
Alejandro Fraguas 7f61caaa15 Merge branch 'ent-5034-Bug-al-copiar-acción-de-alerta' into 'develop' 
Ent 5034 bug al copiar acción de alerta

See merge request artica/pandorafms!2921
 2019-12-23 10:51:10 +01:00
Alejandro Fraguas 935d246a0d Merge branch 'ent-5162-9263-Notificaciones-infinitas' into 'develop' 
removed newsletter notification from messages list

See merge request artica/pandorafms!2978
 2019-12-23 10:49:04 +01:00
Alejandro Fraguas 807db02fec Merge branch 'ent-5099-dobles-interfaces' into 'develop' 
Fix networkmap module key assignment

See merge request artica/pandorafms!2952
 2019-12-23 10:25:04 +01:00
Alejandro Fraguas 7061ab81b6 Merge branch 'ent-4911-Informacion-mostrada-en-mapa-GIS-the-Satellite-Server' into 'develop' 
Ent 4911 informacion mostrada en mapa gis the satellite server

See merge request artica/pandorafms!2876
 2019-12-23 10:24:10 +01:00
Alejandro Fraguas fa34170e34 Merge branch 'ent-5117-problemas-con-el-inventory-en-meta' into 'develop' 
Fixed bug in inventory item

See merge request artica/pandorafms!2975
 2019-12-23 10:23:21 +01:00
Alejandro Fraguas 69159d158d Merge branch 'ent-1786-Rango-de-tiempo-en-container-graphs' into 'develop' 
Ent 1786 rango de tiempo en container graphs

See merge request artica/pandorafms!2931
 2019-12-23 10:18:39 +01:00
Alejandro Fraguas c5af1823e3 Merge branch 'ent-2023-Poder-editar-la-opcion-Safe-operation-mode-mediante-Bulk-operations' into 'develop' 
Ent 2023 poder editar la opcion safe operation mode mediante bulk operations

See merge request artica/pandorafms!2918
 2019-12-23 10:18:14 +01:00
artica cf8bf74cd4 Auto-updated build strings. 2019-12-23 00:01:17 +01:00
artica 59e91c0ed4 Auto-updated build strings. 2019-12-22 00:01:09 +01:00
artica df704997e3 Auto-updated build strings. 2019-12-21 00:01:24 +01:00
Rafael Ameijeiras 2cfc9db26b Merge branch 'update_agent_dockerfile' into 'develop' 
adding python3 to the docker agent image

See merge request artica/pandorafms!2982
 2019-12-20 08:59:52 +01:00
artica 45a8904578 Auto-updated build strings. 2019-12-20 00:01:10 +01:00
Rafael Ameijeiras 2162fdae39 adding python3 to the docker agent image 2019-12-19 18:17:59 +01:00
alejandro-campos c3daa7e803 removed newsletter notification from messages list 2019-12-19 10:42:41 +01:00
artica f69d243330 Auto-updated build strings. 2019-12-19 00:01:09 +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
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
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 d370fa560a.
 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 e43d8914aa.
 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
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
artica f7b0372e53 Auto-updated build strings. 2019-12-16 00:01:07 +01:00