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

23597 Commits

Author SHA1 Message Date
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
Luis Calvo 2c37ef4acb dbmanager blankspaces transparent to user 2019-12-20 14:18:48 +01:00
Daniel Barbero d4207ef67c Fixed form php VC 2019-12-20 13:58:47 +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
Daniel Barbero f08e92b6ad Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2019-12-20 08:02:18 +01:00
Junichi Satoh b245b3b4a8 Added support for MySQL 8.0. 2019-12-20 11:25:01 +09:00
artica 45a8904578 Auto-updated build strings. 2019-12-20 00:01:10 +01:00
Daniel Barbero a6dfdb796a Fixed errors Form VC 2019-12-19 20:47:52 +01:00
Daniel Barbero 14984faaaa Fixed errors Form VC 2019-12-19 20:42:29 +01:00
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