Commit Graph

304 Commits

Author SHA1 Message Date
fbsanchez 4d912fbd34 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 2022-02-11 09:55:34 +01:00
fbsanchez 8b09c49871 minor errata fix 2022-02-07 11:56:00 +01:00
Jose Gonzalez 40efaa157d Merge remote-tracking branch 'origin' into ent-8422-Revision-completa-audit-logs 2022-02-01 13:42:30 +01:00
Jose Gonzalez d81e6571ec New audit logs 2022-02-01 13:39:18 +01:00
fbsanchez 1207463f16 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8
Conflicts:
	pandora_console/include/class/HTML.class.php
2022-01-25 14:16:47 +01:00
vgilc f2d0ecc304 Merge branch 'ent-7485-12717-incluir-botones-de-generacion-de-informe-en-vista-html' into 'develop'
Added combo with all export formats to report html view

See merge request artica/pandorafms!4638
2022-01-25 10:29:00 +00:00
Jose Gonzalez 3252832cc7 WIP: Check audit logs 2022-01-20 10:55:23 +01:00
alejandro.campos@artica.es 5a19e071e9 fixed visualization of vertical bars graph when switching values on graph viewer 2022-01-19 13:34:58 +01:00
alejandro.campos@artica.es a0391e3ef2 fixed visualization of vertical bars graph when switching values on graph viewer 2022-01-19 13:33:49 +01:00
fbsanchez 28743dcb5d sizeof => count 2022-01-19 12:40:52 +01:00
Calvo c16499720e Added combo with all export formats to report html view 2022-01-18 14:54:10 +01:00
Daniel Maya 7767e9aae2 #8295 Fixed data 2021-12-21 15:22:22 +01:00
Daniel Maya ae0e4e2826 #8295 Added ajax call and spinner 2 2021-12-02 08:52:33 +01:00
Daniel Maya cacaaa89ae #8295 Added ajax call and spinner 2021-11-30 15:56:40 +01:00
Daniel Barbero Martin aae0016191 fix chart area 2021-11-23 13:14:56 +01:00
José González bdc4d0a8b1 Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'"
This reverts merge request !4302
2021-11-04 16:28:15 +01:00
Jose Gonzalez 8696d21a42 Fixed any minor bugs 2021-09-29 17:03:13 +02:00
Marcos Alconada 3bc2844b4d fixed visual error black theme 2021-06-04 11:03:35 +00:00
Jose Gonzalez 08c945d91d Fixed missed buttons, improve code and added go back button when create-update 2021-06-03 15:37:11 +02:00
Daniel Rodriguez 3f8d3a883f Merge branch 'ent-7002-Revision-cabeceras-tabs' into 'develop'
Ent 7002 revision cabeceras tabs

Closes pandora_enterprise#7002

See merge request artica/pandorafms!4094
2021-05-27 16:21:48 +00:00
José González 71c88313d5 Added standard header 2021-04-30 10:58:37 +02:00
Calvo 0b1e60b8cf Fixed view icon on report and custom graphs 2021-04-06 18:18:17 +02:00
Marcos Alconada 9dd17acb57 fixed visual error 2021-03-26 13:40:55 +00:00
Marcos Alconada d8a628b1c4 Ent 6781 revision de estilos visuales y eliminacion de sistemas skins 2021-03-11 14:40:23 +00:00
alejandro-campos 366d02f203 Merge remote-tracking branch 'origin/ent-6354-Bug-de-creacion-de-dashboard-con-permisos-no-ALL-2' into ent-6354-Bug-de-creacion-de-dashboard-con-permisos-no-ALL-3 2021-01-14 09:22:06 +01:00
Jose Gonzalez 649442f794 Updated copyrights 2020-11-27 13:52:35 +01:00
alejandro-campos def59508ae changed behavior of all group acl check and fixed acl vulnerabilities 2020-10-22 12:00:44 +02:00
daniel 709201bf23 dashboards 2020-03-26 12:29:38 +01:00
Tatiana Llorente 945383b8ec Changed name of xml report 2019-11-05 12:43:08 +01:00
manuel b7ff7bc121 Fixed bug in report items 2019-09-23 15:27:06 +02:00
Luis Calvo 53c239f558 fixed minor errors 2019-07-17 10:34:56 +02:00
Luis Calvo ef9502a552 Fixed errors on sum report uncompressed checkbox 2019-07-15 11:56:57 +02:00
fbsanchez 9de5dadbf2 style review 2019-06-03 11:16:51 +02:00
fbsanchez 88b0802472 style review 2019-06-03 10:46:52 +02:00
artica b3da2803a4 Changed the format of the .php files
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
2019-01-30 16:18:44 +01:00
daniel 05d8d0ccf5 fixed errors graph 2018-06-13 19:13:42 +02:00
enriquecd 632fc26be2 Thermometer graph only for intracom - #2214 2018-06-12 12:39:05 +02:00
daniel f85a8b513a fixed errors 2018-06-08 14:30:15 +02:00
daniel eb7cdc7c90 fixed errors in graph delete to image pdf 2018-06-08 08:58:18 +02:00
daniel badfd83b0d Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio
Conflicts:
	pandora_console/include/functions_graph.php
	pandora_console/include/graphs/fgraph.php
2018-06-06 11:57:02 +02:00
daniel 47a287b6f6 fixed errors in graph 2018-06-01 13:58:29 +02:00
enriquecd 734c52d8bd New graph thermometer - #2214 2018-05-04 11:13:26 +02:00
daniel ead1161e0b add fullscale combined and custom graph 2018-01-03 12:13:00 +01:00
fermin831 dd0401b815 Moved xml report generation to a function 2017-09-21 13:22:40 +02:00
Daniel Maya a81dcdcfc5 When there is no custom graph redirects to the graph list 2017-04-11 15:30:32 +02:00
enriquecd 0acfe23e9d Fix newlines in reporting viewer and pdf generatos - #88 2017-03-06 17:07:29 +01:00
daniel 8f8a17bf24 fixed alias for name in reports 2017-02-27 16:48:28 +01:00
daniel 7609e85d3e fixed errors in tab menu 2017-02-23 09:23:27 +01:00
daniel f351a95993 fixed errors in tabs reports 2017-02-22 09:21:35 +01:00
m-lopez-f 5bb39c4618 Fixed problems with percentil in customs graphs. Gitlab: #326 2017-02-21 16:52:56 +01:00