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

782 Commits

Author SHA1 Message Date
Daniel Maya 816bbf4d00 #8435 Added jquery mobile 1.5 2022-02-07 12:29:57 +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 b547278930 Merge branch 'ent-7988-no-se-puede-cambiar-la-skin-de-pandora-en-entorno-meta-nodo-sincronizados' into 'develop' 
Ent 7988 no se puede cambiar la skin de pandora en entorno meta nodo sincronizados

See merge request artica/pandorafms!4633
 2022-01-25 10:27:25 +00:00
Daniel Maya e8d3d93f7f Fixed pandora_black in metaconsole 2022-01-17 10:22:30 +01:00
Jose Gonzalez 0f549ce813 Fix issues with grid and background color 2022-01-14 13:56:08 +01:00
fbsanchez 8e5a0917ba php8 review + pdf images b64 fix 2022-01-12 19:43:33 +01:00
Jose Gonzalez 4ce90a70eb Fixed visual issue 2022-01-10 10:22:59 +01:00
Calvo f9dceb9e10 Fix not init color 2021-12-28 12:38:22 +01:00
fbsanchez 582cb9a082 Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2 
Conflicts:
	pandora_console/extras/mr/51.sql
 2021-11-19 10:51:46 +01:00
Daniel Rodriguez 7e8782f56b Merge branch 'ent-6757-Aumentar-numero-caracteres-en-custom-graphs' into 'develop' 
title en ticks bullet charts

See merge request artica/pandorafms!4521
 2021-11-16 13:15:20 +00:00
Daniel Barbero Martin 72f2caacd9 title en ticks bullet charts 2021-11-05 11:22:25 +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
Daniel Maya 05bc15f74c #8099 Added jquery mobile 1.4.5 2021-10-25 11:09:24 +02:00
Jose Gonzalez 6deaee84ac Merge 2021-10-04 10:00:15 +02:00
Daniel Rodriguez 7904c61df5 Merge branch 'ent-7273-Consola-Visual-nuevo-elemento-Gráfica-básica' into 'develop' 
Ent 7273 consola visual nuevo elemento gráfica básica

See merge request artica/pandorafms!4304
 2021-10-01 12:48:09 +00:00
Jose Gonzalez 8696d21a42 Fixed any minor bugs 2021-09-29 17:03:13 +02:00
Daniel Maya 1f32c62de9 #7963 Fixed netflow view 3 2021-09-29 16:47:24 +02:00
Daniel Maya fb449910c9 #7963 Fixed netflow view 2 2021-09-29 10:57:57 +02:00
Daniel Maya af4e49e156 #7963 Fixed netflow view 2021-09-28 09:42:05 +02:00
Daniel Maya 8fa834fb9b resolved conflict 2021-09-22 17:27:18 +02:00
Daniel Rodriguez 8621d8cbb8 Merge branch 'ent-7824-problemas-vista-mobile' into 'develop' 
Fixed issues

Closes pandora_enterprise#7824

See merge request artica/pandorafms!4315
 2021-08-17 12:20:18 +00:00
José González 1aa788bd83 Fix issue with colours in mobile view 2021-08-16 16:32:20 +02:00
fbsanchez 486abde989 tree event graphs 2021-08-12 14:24:16 +02:00
Daniel Rodriguez 089b981f7f Merge branch 'ent-7397-Bug-en-item-module-graph-de-cv' into 'develop' 
fixed several issues in item module graph of visual consoles

See merge request artica/pandorafms!4279
 2021-08-11 07:16:19 +00:00
Daniel Rodriguez dca52dca6a Merge branch 'ent-7702-vista-de-agentes-sin-color-en-grafica-circulo-estado-agente' into 'develop' 
Fixes in pie coauth: daniel

See merge request artica/pandorafms!4210
 2021-08-10 06:59:29 +00:00
Daniel Rodriguez 604ef4bc89 Merge branch 'ent-7442-Metaconsole-Dashboard-WUX-Transaction-Stats-no-encuentra-trans' into 'develop' 
Ent 7442 metaconsole dashboard wux transaction stats no encuentra trans

Closes pandora_enterprise#7442

See merge request artica/pandorafms!4295
 2021-08-06 12:53:06 +00:00
Daniel Rodriguez fa2cec2878 Merge branch 'ent-7387-fallos-netflow-live-view' into 'develop' 
Fixed issues with views in Netflow live view

Closes pandora_enterprise#7387

See merge request artica/pandorafms!4240
 2021-08-05 11:08:04 +00:00
Daniel Maya 318edda041 Added basic chart 3 2021-08-03 15:46:01 +02:00
José González 3263ef8b9a Fix issue with WUX Trans Stats 2021-07-13 17:26:03 +02:00
alejandro.campos@artica.es a484fb2408 fixed several issues in item module graph of visual consoles 2021-07-08 10:03:57 +02:00
Daniel Rodriguez b0c640767e Merge branch 'ent-7144-Consola-Visual-Poder-cambiar-color-de-leyenda-de-Event-histogram' into 'develop' 
Ent 7144 consola visual poder cambiar color de leyenda de event histogram

See merge request artica/pandorafms!4146
 2021-06-29 10:03:49 +00:00
Daniel Maya b73924052c Ent 7144 consola visual poder cambiar color de leyenda de event histogram 2021-06-29 10:03:49 +00:00
José González fb129750d5 Fixed issues with views in Netflow live view 2021-06-28 12:03:25 +02:00
José González b530ff1ee2 Added control for font-size in events graph in agent view 2021-06-25 12:56:03 +02:00
fbsanchez 9ed895d457 Fixes in pie coauth: daniel 2021-06-16 11:41:57 +02:00
Marcos Alconada 665efa4fb7 Ent 7519 cambio de fuentes en la consola a nivel global 2021-06-10 08:19:11 +00:00
Daniel Rodriguez 4b819360ff Revert "Merge branch 'ent-7519-cambio-de-fuentes-en-la-consola-a-nivel-global' into 'develop'" 
This reverts merge request !4132
 2021-06-09 18:09:43 +02:00
Marcos Alconada 2334eccd01 Ent 7519 cambio de fuentes en la consola a nivel global 2021-06-09 13:59:28 +00:00
Daniel Rodriguez c54f542b45 Merge branch 'ent-7376-11735-varios-problemas-de-visualizacion-modo-en-tema-oscuro' into 'develop' 
fixed minnor error black theme 7376

See merge request artica/pandorafms!4064
 2021-04-27 14:05:08 +00:00
marcos f818b86827 fixed minnor error black theme 7376 2021-04-23 09:56:06 +02:00
Daniel Barbero Martin fc2da38cbd Fixed errors charts in open 2021-04-23 08:58:23 +02:00
marcos e506523fff fixed minnor error 2021-04-15 13:55:14 +02:00
marcos 48cc1283cc add black theme to widget dashboard 2021-04-14 15:09:19 +02:00
marcos b6ea565118 add black theme to widget dashboard 2021-04-14 12:07:38 +02:00
Marcos Alconada 225f183e75 set black theme custom graph colors 2021-04-09 09:52:28 +00:00
Marcos Alconada a1fceb2e81 set black theme on agent access rate flot 2021-04-09 09:29:26 +00:00
fbsanchez 5143bbdfdb networkmaps in dashboards MC 2021-04-06 16:47:32 +02:00
fbsanchez 1c94f619ef Custom graphs in widget in MC 2021-04-06 14:20:07 +02:00
Marcos Alconada d8a628b1c4 Ent 6781 revision de estilos visuales y eliminacion de sistemas skins 2021-03-11 14:40:23 +00:00
daniel fbf26fab91 Fix styles file export_data 2021-03-04 10:29:52 +00:00
Daniel Rodriguez 4fbfc14479 Merge branch 'ent-6817-Meter-spinning-Loading-en-la-visualizacion-de-graficas-de-modulos' into 'develop' 
Fix loading charts modules and interfaces

See merge request artica/pandorafms!3700
 2021-03-01 12:16:27 +00:00
Daniel Rodriguez b0f862b4c7 Merge branch 'ent-1175-copyright-actualizados' into 'develop' 
Updated copyrights

Closes pandora_enterprise#1175

See merge request artica/pandorafms!3668
 2020-12-23 17:19:46 +01:00
Daniel Rodriguez bc74565662 Merge branch 'ent-4491-Mostrar-siempre-arriba-el-valor-de-la-barra-de-grafico-en-consola-visual' into 'develop' 
fix custom graph

See merge request artica/pandorafms!3655
 2020-12-23 11:48:03 +01:00
José González 623b729001 Merge branch 'develop' into 'ent-1175-copyright-actualizados' 
# Conflicts:
#   pandora_agents/pc/Win32/pandora_agent.conf
#   pandora_agents/win32/bin/pandora_agent.conf
#   pandora_console/extensions/realtime_graphs.php
#   pandora_console/godmode/snmpconsole/snmp_alert.php
#   pandora_console/include/functions_ui.php
#   pandora_console/install.php
#   pandora_console/operation/agentes/realtime_win.php
 2020-12-14 11:10:35 +01:00
Daniel Barbero Martin aa52ab01df Fix loading charts modules and interfaces 2020-12-09 14:05:40 +01:00
Luis aeb7a7e9c6 Add decimal separator to all pandora csv 2020-12-01 11:56:15 +01:00
Jose Gonzalez 649442f794 Updated copyrights 2020-11-27 13:52:35 +01:00
Daniel Barbero Martin 9c99058f30 fix custom graph 2020-11-25 17:29:09 +01:00
daniel 7d0c31885c fixed errors visual pie charts 2020-11-19 14:53:44 +01:00
Daniel Rodriguez 64df831302 Merge branch 'ent-6657-Se-quedan-bloqueados-zooms-en-las-graficas' into 'develop' 
fix charts

See merge request artica/pandorafms!3581
 2020-10-30 13:23:03 +01:00
Daniel Barbero Martin 170ee5b9a5 fixed csv charts 2020-10-28 15:36:38 +01:00
Daniel Barbero Martin 9b81da193b fix charts 2020-10-28 12:50:15 +01:00
daniel 510a96af8f fixed sql grph 2020-10-14 11:17:05 +02:00
Daniel Barbero Martin 8a72074a8a fixed sql graph pie 2020-10-09 12:05:57 +02:00
daniel 3455de7f85 fixed visual errors and default values 2020-10-07 16:03:52 +02:00
daniel 1b5ccfb20a Add new token chart fit to content 2020-10-05 17:03:30 +02:00
daniel a5d5a45cac add render graph to reports 2020-10-02 14:16:55 +02:00
daniel 0db539c444 fix visual windows charts 2020-10-01 15:29:54 +02:00
Daniel Barbero Martin c6165fbdee fixed mobile console donut charts 2020-09-21 15:13:07 +02:00
fbsanchez cd81e77b18 fix event legend 2020-09-15 11:13:41 +02:00
alejandro.campos@artica.es c6ee74e6b7 Merge branch 'develop' into ent-5105-9235-Error-tactical-view-consola-movil 2020-07-17 10:54:12 +02:00
Daniel Rodriguez 52dc38fcb2 Merge branch 'ent-5672-Graficas-gauge-no-se-muestran-bien-en-PDF' into 'develop' 
Fixed error in gauges

See merge request artica/pandorafms!3261
 2020-07-14 11:01:21 +02:00
daniel c0661fc1b7 fixed legend max 10 modules for chart 2020-07-13 10:02:56 +02:00
daniel 7dc759f3ac Fixed minor error graph sparse width 2020-06-25 15:18:33 +02:00
Alejandro Fraguas 01c72e09b4 Merge branch 'ent-5997-marca-horaria-graficas-modulos' into 'develop' 
Returned timestamp message for graphs

Closes pandora_enterprise#5997

See merge request artica/pandorafms!3306
 2020-06-22 10:30:32 +02:00
Alejandro Fraguas ee577cff35 Merge branch 'ent-5947-Mala-representacion-de-graficas-en-PDF-Availability-graph-y-Module-histogram-graph' into 'develop' 
Fixed sla graph in pdf

See merge request artica/pandorafms!3279
 2020-06-16 08:29:10 +02:00
Jose Gonzalez cdf4109ad4 Returned timestamp message for graphs 2020-06-15 16:14:34 +02:00
alejandro-campos 4af22aca78 fix mobile tactical view 2020-06-12 13:14:58 +02:00
Daniel Rodriguez b0d774524a Merge branch 'ent-5545-Valores-feos-en-graficas-de-agentes' into 'develop' 
Fixed values legend charts sparse

See merge request artica/pandorafms!3245
 2020-06-11 14:02:47 +02:00
Daniel Barbero Martin 82b66d567d Fixed sla graph in pdf 2020-06-08 14:14:35 +02:00
Daniel Barbero Martin 8eb3a982e1 Fixed error in gauges 2020-06-01 14:48:53 +02:00
Daniel Barbero Martin f2f1eaf58e Fixed values legend charts sparse 2020-05-26 14:44:52 +02:00
Luis Calvo 4f52a693ac CSV flot export fixes 2020-05-13 19:19:58 +02:00
alejandro-campos 80ce89e650 fix format function for X axis of custom graphs 2020-04-03 10:41:24 +02:00
alejandro-campos 0c3a7166e0 fix format function for X axis of custom graphs 2020-04-03 10:34:54 +02:00
daniel 709201bf23 dashboards 2020-03-26 12:29:38 +01:00
Tatiana Llorente 4777ecd4bf Ent 5439 error grafica eventos de agente 2020-03-24 10:12:14 +01:00
Daniel Barbero Martin 1d2ad47507 Merge remote-tracking branch 'origin/develop' into ent-5408-consola-visual-nueva-bugs 2020-02-11 07:57:42 +01:00
Daniel Barbero Martin 0042f390ef Fixed errors VC 2020-02-10 17:31:48 +01:00
Daniel Rodriguez 6faac04672 Merge branch 'ent-5267-Fechas-erroneas-en-availability-graph' into 'develop' 
Fixed date in availability graph

See merge request artica/pandorafms!3027
 2020-02-10 10:46:55 +01:00
Daniel Barbero Martin f459c6fb79 fixed errors VC 2020-01-28 11:05:15 +01:00
Daniel Barbero Martin 6ddb501b08 fixed errors VC 2020-01-27 16:15:54 +01:00
Daniel Maya 1998db3317 Fixed date in availability graph 2020-01-27 11:52:13 +01:00
Daniel Barbero Martin 5ec8c68aed fixed errors VC 2020-01-24 15:13:42 +01:00
Daniel Barbero Martin 6c6403336f Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-23 08:14:24 +01:00
Luis Calvo ca35bb64cc Prepend folder to image to avoid Phar injection 2020-01-22 10:17:35 +01:00
Daniel Barbero Martin 89e83e38e0 Merge remote-tracking branch 'origin/develop' into new-vc-line-element 
Conflicts:
	pandora_console/include/javascript/pandora.js
 2020-01-21 08:28:00 +01:00
Daniel Barbero Martin c3ae3f08a7 Fixed errors VC 2020-01-15 14:28:43 +01:00
Daniel Barbero Martin 60bd600392 module graph convert to image base 64 2020-01-13 13:31:23 +01:00
Alejandro Campos 0468c85a4d Merge branch 'develop' into 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024' 
# Conflicts:
#   pandora_console/godmode/setup/setup_visuals.php
 2020-01-07 12:00:27 +01:00