Commit Graph

617 Commits

Author SHA1 Message Date
Daniel Rodriguez 791d8f512a Merge branch 'ent-4311-Fallos_en_graficas_al_descargar_informes' into 'develop'
fixed error in pdf

See merge request artica/pandorafms!2585
2019-07-15 16:53:07 +02:00
Daniel Barbero 58cb113d40 fixed error in pdf 2019-07-08 13:23:35 +02:00
Tatiana Llorente d1bc6cc2ff Created green theme - #4194 2019-07-05 13:59:48 +02:00
Tatiana Llorente beace34567 Created black theme - #4194 2019-07-02 13:12:05 +02:00
Alejandro Gallardo Escobar 94764bf92e Bugfixes
(cherry picked from commit 3421f21cdf71447bf029028c138e203689aa38a2)
2019-06-24 17:23:55 +02:00
fbsanchez 2f5265fcbb color updates 2019-06-04 14:08:07 +02:00
fbsanchez 974db824a8 style review 2019-06-03 19:13:29 +02:00
fbsanchez 69054571ab Style review 2019-05-31 09:50:59 +02:00
fbsanchez 9a12b34847 Updates styling 2019-05-28 12:13:29 +02:00
fbsanchez 5be124f315 Styles review 2019-05-27 19:00:48 +02:00
Daniel Barbero Martin e981edfa89 fixed label reports and more fixed
Former-commit-id: a71c341fc7f6f182f7d847911a7dc4e0cd6f36f7
2019-05-09 16:26:38 +02:00
Alejandro Gallardo Escobar c1272035cc Merge remote-tracking branch 'origin/develop' into visual-console-refactor
Former-commit-id: 6cffccf44d4bf8c5b87c5c5f112d814c796645c6
2019-04-24 17:05:20 +02:00
Alejandro Fraguas 194f4400f7 Merge branch 'ent-3647-Revision-estilos-discovery-con-la-nueva-linea-de-estilos' into 'develop'
Ent 3647 revision estilos discovery con la nueva linea de estilos

See merge request artica/pandorafms!2370

Former-commit-id: 0f46544f8b05ee464c4dd85301f7a23a4067267a
2019-04-23 17:48:00 +02:00
alejandro-campos 4f6a81dc5b visual changes to discovery
Former-commit-id: fd606abb997aa4f3144d072f610915524b5358db
2019-04-22 17:46:04 +02:00
Alejandro Gallardo Escobar 683dcf3469 Visual Console Refactor: bugfixes
Former-commit-id: 0c06a88cc6136961cbb7622e373e5c1dfe265c27
2019-04-17 12:29:38 +02:00
fermin831 b2f046e4d6 Merge remote-tracking branch 'origin/ent-3595-discovery-fase-2' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
Conflicts:
	pandora_console/extras/mr/26.sql
	pandora_console/include/class/ConsoleSupervisor.php
	pandora_console/include/class/NetworkMap.class.php
	pandora_console/include/styles/pandora.css
	pandora_console/operation/menu.php

Former-commit-id: 2a0661a65772d4a91f95587d77b0d1287fb66b18
2019-03-27 12:11:23 +01:00
Daniel Barbero Martin e3b0b7ad11 fixed update progress bars task for 3 second
Former-commit-id: 7558c33e8540007608f7afd97ebf03e193a08def
2019-03-26 15:38:47 +01:00
fermin831 2711eb59ea Merge remote-tracking branch 'origin/ent-3595-discovery-fase-2' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
Conflicts:
	pandora_console/extras/mr/26.sql
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/pandoradb.sql

Former-commit-id: 29c3e96f3022c59a9252849c2adeb29182476395
2019-03-25 09:20:06 +01:00
Daniel Barbero 7e345035e1 add height and round border in d3 graph progress
Former-commit-id: 8eacfe068c1ae744fd04a752f65ed44f747d6158
2019-03-15 10:22:55 +01:00
fermin831 b660da6e84 Merge remote-tracking branch 'origin/develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
Conflicts:
	pandora_console/extras/mr/26.sql
	pandora_console/install.php

Former-commit-id: dda11929acf5f741e0a4d290b4607ae72683284b
2019-03-14 10:49:16 +01:00
fermin831 cf8915af36 [Netflow live] Removed unit from circular mesh
Former-commit-id: 4f6fceadcf504ccf5006722b26a5b2259adc2970
2019-03-14 10:05:21 +01:00
Luis Calvo 98ec2f31e6 Restored width in % and forced Agent SNMP view to enter if with widget=true
Former-commit-id: 25ca763789d5d30d298b6bf77bd5f0630aff526f
2019-03-07 18:05:03 +01:00
Luis Calvo d4b79179d9 Fixed width unit on graph, setted to px instead of %
Former-commit-id: 2517a1bfad9c609709f30025c2d6927c0011ade1
2019-03-01 14:58:41 +01:00
fbsanchez b1aa0fe2f2 Merge from develop
Former-commit-id: 043b38c0e4ea96e0e39cc2480420164dd0f5d3b7
2019-02-22 12:30:27 +01:00
Alejandro Fraguas 218e90a663 Merge branch '2970_No_capta_bien_las_fuentes' into 'develop'
Fixed minor bug in pandora flot js

See merge request artica/pandorafms!1897

Former-commit-id: 7c45783033b5f856375498ec30954341a4ddc0fa
2019-02-19 17:51:19 +01:00
fbsanchez 42dc0c60be supervisor
Former-commit-id: cf99e746a02ab3e921a39b19f6b4822580299b7e
2019-02-12 11:41:21 +01:00
daniel f14684b22d Merge remote-tracking branch 'origin/develop' into ent-2806-Administracion_base_de_datos_de_historico
Conflicts:
	pandora_console/godmode/setup/performance.php
	pandora_console/godmode/setup/setup.php


Former-commit-id: 9a96a30cc97d2d2af707d7cd89b5a1e6ad0d0746
2019-02-07 07:58:33 +01:00
samucarc 9c623148f5 Fixed conflict
Former-commit-id: 02b3e0656041e5bdadf295177f0c29a81abf8c3f
2019-02-06 19:14:46 +01:00
artica b3da2803a4 Changed the format of the .php files
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
2019-01-30 16:18:44 +01:00
artica dc238cf74a Changed the format of the .js and .html files
Former-commit-id: 7a06315787b85355f4840cbfb0431d55dea4293d
2019-01-30 12:27:18 +01:00
Daniel Rodriguez b2434229db Merge branch '1851-Grafica_de_widget_de_WUX_se_descoloca_si_falla_la_primera_fase' into 'develop'
fixed error widgets wux

See merge request artica/pandorafms!2102

Former-commit-id: c47bc3fc71f671b9ae4d668a6f81711683bb43a2
2019-01-16 11:03:02 +01:00
Tatiana Llorente 0cb7aa3d0e Merge branch '3047-Error-en-etiqueta-en-gráficas-horizontales' into 'develop'
Changed the font styles of the labels - #3047

See merge request artica/pandorafms!1982

Former-commit-id: 48a5230053344368f5858192e6eb3a4d7c42c830
2019-01-08 12:15:05 +01:00
daniel a789b3350e fixed minor error pie chart
Former-commit-id: e335f96e7538f939c2fd20137c19c354125f0edb
2018-12-27 10:35:31 +01:00
daniel ee7ff52a04 fixed error widgets wux
Former-commit-id: 149cfea6dc0d427b57f05594214374d220111031
2018-12-24 14:25:19 +01:00
daniel 7de36e1631 Merge branch '3257-No_se_ven_graficas_en_plantillas_de_informes_de_availability_SLA' into 'develop'
fixed error template availability

See merge request artica/pandorafms!2086

Former-commit-id: 94d91ceb98a78fc09a3d6af4e26baeba12343901
2018-12-24 09:23:35 +01:00
vgilc 411c815f19 Merge branch '3096-Error-exportar-a-CSV-en-Graph-Container' into 'develop'
Removed unnecessary loop - #3096

See merge request artica/pandorafms!1992

Former-commit-id: 0708e60e64cd10bc27e3841f718fa64d8513b97c
2018-12-21 10:23:09 +01:00
vgilc 4f43396d81 Merge branch '3151-Fallo-jquery-en-consola-mobile' into 'develop'
fixed bug: pie graph not showing in mobile's tactical view dashboard widget

See merge request artica/pandorafms!2027

Former-commit-id: d3a814853a43ea8c6c5c621893a4eaaac3e7d401
2018-12-21 10:22:41 +01:00
daniel 84a0f227b9 fixed error template availability
Former-commit-id: 249e476d8fa4394fda0cf5df01b7b14dca8d2bea
2018-12-17 11:24:44 +01:00
daniel 05e94ece90 Merge remote-tracking branch 'origin/develop' into 3190-Bugarro_en_informe_servicios_SLA 2018-12-04 10:20:09 +01:00
daniel c63be5b4cc fixed error print pdf chart slice bars 2018-12-04 10:19:26 +01:00
vgilc 5a3911d185 Merge branch '2939-Bug-en-la-vista-de-graficas-de-un-agente' into 'develop'
Fixed bug in agent graph view

See merge request artica/pandorafms!1955
2018-11-30 13:07:03 +01:00
vgilc 4bdc7d5303 Merge branch '3077-Fallos_en_las_consolas_visuales' into 'develop'
fixed errors in visual console

See merge request artica/pandorafms!2026
2018-11-30 13:04:31 +01:00
daniel 3bf215782e fixed minor error slicebar 2018-11-29 17:00:55 +01:00
alejandro-campos 8d2daf3948 fixed bug: pie graph not showing in mobile's tactical view dashboard widget 2018-11-29 16:08:41 +01:00
daniel 9bdd1af488 fixed errors in visual console 2018-11-29 13:24:12 +01:00
tatiana.llorente@artica.es 8e72f53aff Removed unnecessary loop - #3096 2018-11-19 16:07:45 +01:00
tatiana.llorente@artica.es 8956ebd3c0 Changed the font styles of the labels - #3047 2018-11-16 11:46:41 +01:00
manuel.montes 69df02da48 Fixed bug in agent graph view 2018-11-12 10:45:50 +01:00
daniel 58aa334798 fixed minor errors in graphs an license diag 2018-11-07 13:33:07 +01:00
daniel 8e206eeeef fixed errors php7 2018-10-29 18:20:56 +01:00