Daniel Barbero Martin
|
6ddb501b08
|
fixed errors VC
|
2020-01-27 16:15:54 +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 |
Alejandro Campos
|
dcd2aae3c5
|
Merge branch 'develop' into 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024'
# Conflicts:
# pandora_console/extras/mr/35.sql
|
2020-01-14 10:28:55 +01:00 |
Tatiana Llorente
|
2c019f04ee
|
Fixed bug in auto combined graph
|
2020-01-08 11:37:44 +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 |
vgilc
|
8d0b86c420
|
Merge branch 'ent-4481-entities-en-graficas-personalizadas-bullet-chart' into 'develop'
remove entities custom graph bullet chart
See merge request artica/pandorafms!2640
|
2019-12-10 11:50:57 +01:00 |
Luis
|
2b03b00223
|
Fixed agent event graph bar and link to event list
|
2019-12-10 11:28:56 +01:00 |
|
alejandro-campos
|
5880bec88a
|
changes in module data formatting when printed across the application and new setup options
|
2019-12-05 17:41:44 +01:00 |
marcos
|
be3dcccc4d
|
out entities
|
2019-12-04 17:45:58 +01:00 |
|
marcos
|
d6090771ef
|
Merge remote-tracking branch 'origin/develop' into ent-4481-entities-en-graficas-personalizadas-bullet-chart
|
2019-12-04 17:32:38 +01:00 |
manuel
|
deb217906c
|
Fixed bug in templates
|
2019-10-22 15:41:13 +02:00 |
|
manuel
|
93bca4673f
|
Fixed bugs in reports
|
2019-10-09 13:15:07 +02:00 |
Daniel Rodriguez
|
e6724752ff
|
Merge branch 'ent-4661-leyenda-de-las-graficas-en-classic-mode' into 'develop'
Fixed Error
See merge request artica/pandorafms!2767
|
2019-10-07 19:21:28 +02:00 |
Alejandro Fraguas
|
e42932ad19
|
Merge branch 'ent-4543-Bug-en-Graficas-Personalizadas-con-Average-series-Visual' into 'develop'
fixed summatory series custom graph
See merge request artica/pandorafms!2754
|
2019-10-03 13:38:18 +02:00 |
|
marcos.alconada
|
4c93ca3d60
|
fixed minor error
|
2019-09-27 12:07:40 +02:00 |
|
marcos.alconada
|
cc18d5d1ed
|
Fixed Error
|
2019-09-26 17:51:26 +02:00 |
|
Daniel Barbero Martin
|
43aa13b4e5
|
fixed summatory series custom graph
|
2019-09-24 17:39:11 +02:00 |
|
Daniel Barbero Martin
|
84d1979c9e
|
fixed error percentil label
|
2019-09-18 11:15:55 +02:00 |
|
marcos.alconada
|
0414b4033e
|
fixed visual error
|
2019-08-19 10:05:06 +02:00 |
|
marcos.alconada
|
762a8ad4ca
|
remove entities custom graph bullet chart
|
2019-08-07 11:39:16 +02:00 |
|
Daniel Rodriguez
|
c97074ea74
|
Merge branch 'ent-4354-Revision_completa_de_macros_de_reports' into 'develop'
fixed macros reports
See merge request artica/pandorafms!2595
|
2019-07-17 13:49:38 +02:00 |
|
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 Martin
|
2f110b8e2e
|
Merge remote-tracking branch 'origin/develop' into ent-4354-Revision_completa_de_macros_de_reports
|
2019-07-15 11:37:02 +02:00 |
|
Daniel Barbero Martin
|
ed0688f853
|
fixed macros reports
|
2019-07-10 18:20:43 +02:00 |
|
Daniel Barbero
|
58cb113d40
|
fixed error in pdf
|
2019-07-08 13:23:35 +02:00 |
|
alejandro-campos
|
58009b43c6
|
fix bug: custom graphs not showing properly
|
2019-06-21 13:39:48 +02:00 |
fbsanchez
|
24025ebb74
|
Merge remote-tracking branch 'origin/develop' into ent-4136-button-styles
|
2019-06-18 17:48:03 +02:00 |
|
Luis Calvo
|
d3016a2839
|
Fixed sum/avg graph infinite loop
|
2019-06-18 14:04:38 +02:00 |
|
fbsanchez
|
4bb300889d
|
Merge remote-tracking branch 'origin/develop' into ent-4136-button-styles
|
2019-06-12 13:17:36 +02:00 |
|
fbsanchez
|
23e6711f09
|
WIP Events
|
2019-06-06 17:50:47 +02:00 |
|
manuel
|
5ba2ba1ef3
|
Fixed bug in time comparison graphs
|
2019-06-03 15:37:05 +02:00 |
|
fbsanchez
|
7a09a80ace
|
style review
|
2019-06-03 14:30:23 +02:00 |
|
fbsanchez
|
5be124f315
|
Styles review
|
2019-05-27 19:00:48 +02:00 |
|
Daniel Barbero Martin
|
ae11ea18c9
|
Merge remote-tracking branch 'origin/develop' into ent-3630-7648-7712-campo-label-no-se-muestra-en-informes-de-graficas
Conflicts:
pandora_console/include/functions_graph.php
Former-commit-id: 8436d51b142d4f3d528b3f1c4d459f5194f6a234
|
2019-05-14 12:27:02 +02:00 |
|
Daniel Barbero Martin
|
ab2bf737d5
|
Merge remote-tracking branch 'origin/develop' into ent-3894-Bug-Feature-labels-weigh-en-graficas
Conflicts:
pandora_console/include/functions.php
Former-commit-id: 6c1ef8bcb15b9969b25082851fa39c8241398b29
|
2019-05-10 12:18:10 +02:00 |
|
Daniel Barbero Martin
|
e981edfa89
|
fixed label reports and more fixed
Former-commit-id: a71c341fc7f6f182f7d847911a7dc4e0cd6f36f7
|
2019-05-09 16:26:38 +02:00 |
|
Daniel Rodriguez
|
ac101af72f
|
Merge branch '3631_Unidades_no_se_muestran_en_informes_de_graficas_combinadas' into 'develop'
Added module units in module graphs
See merge request artica/pandorafms!2237
|
2019-05-08 16:36:43 +02:00 |
|
Daniel Barbero Martin
|
3fcd854ae6
|
fixed error labels graphs and weight in chart
Former-commit-id: 52acfda4438417b711295ce8d335ea2748b1fa53
|
2019-05-06 16:43:59 +02:00 |
fermin831
|
030bcc69c4
|
[Netflow live] Readded circular mesh and some refactorizations
Former-commit-id: a3b2d9cf622a6e539baff9de3c36f1b7a7072e4b
|
2019-03-21 12:37:03 +01:00 |
|
fermin831
|
6299d23528
|
[Netflow live] Minor fixes
Former-commit-id: 9778bf449513e3fad89f59f56f327e7afd154d96
|
2019-03-14 17:49:44 +01:00 |
|
fermin831
|
da08acce4f
|
[Netflow live] Removed units
Former-commit-id: 37d9182a46a85b44a400a50eae48cd7778a3dc84
|
2019-03-14 10:36:15 +01:00 |
|
fermin831
|
cf8915af36
|
[Netflow live] Removed unit from circular mesh
Former-commit-id: 4f6fceadcf504ccf5006722b26a5b2259adc2970
|
2019-03-14 10:05:21 +01:00 |
|
Fermin
|
8a336d6cfe
|
[Netflow live] Implemented resolution on area graphs and fixed end date
Former-commit-id: 86d55ac7645e62fcae6a07cbf1bd50f92d5d37a1
|
2019-03-13 18:55:16 +01:00 |
|
fermin831
|
e0d41957f9
|
Netflow graphs display as stacked
Former-commit-id: 58bdd14900b5d6e36041417d31b242f31af9358b
|
2019-03-11 16:25:10 +01:00 |
samucarc
|
00eb2766a9
|
Fixed labels in automatic combined graphs
Former-commit-id: f91777c30da55edc43d021b87cda2c0105626f64
|
2019-03-05 18:06:50 +01:00 |
|
samucarc
|
7d88af625e
|
Added module units in module graphs
Former-commit-id: d17383bd9e8ea7101cf5479b01e2ab0bf45c6813
|
2019-03-04 15:53:47 +01:00 |
|
fermin831
|
ac9452583a
|
Added no data to show to some graphs where id not found
Former-commit-id: 1697a482e80521666f679eb18d2f44fc3975e304
|
2019-02-25 16:50:27 +01:00 |
|
daniel
|
43ddd9d482
|
fixed pdf
Former-commit-id: e220052501d8f1b4c3d8f392cc9665876671e7ae
|
2019-02-18 16:34:48 +01:00 |
artica
|
b3da2803a4
|
Changed the format of the .php files
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
|
2019-01-30 16:18:44 +01:00 |