daniel
|
00f9098f56
|
Merge remote-tracking branch 'origin/develop' into ent-12352-integrar-tablas-de-merge-en-el-pandoradb-sql
Conflicts:
pandora_console/extras/mr/68.sql
pandora_console/pandoradb.sql
|
2024-01-25 15:57:20 +01:00 |
|
daniel
|
27d76a0890
|
fix error cv item module graph periodicity mode pandora_enterprise#9640
|
2023-12-14 11:03:45 +01:00 |
|
daniel
|
a418673489
|
Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo
|
2023-12-11 11:09:54 +01:00 |
Matias Didier
|
385989f185
|
Merge branch 'ent-12329-16465-problema-public-link-consolas-visuales-metaconsola' into 'develop'
VC Public links pandora_enterprise#12329
See merge request artica/pandorafms!6633
|
2023-12-07 15:27:57 +00:00 |
|
daniel
|
ee3df634d6
|
fix error histogram and events history graph pandora_enterprise#12209
|
2023-12-05 10:35:02 +01:00 |
|
daniel
|
aaa590b65f
|
VC Public links pandora_enterprise#12329
|
2023-11-07 09:20:48 +01:00 |
|
daniel
|
868700f9f1
|
add sliced mode simple graph reports and CV pandora_enterprise#9640
|
2023-10-25 15:55:54 +02:00 |
|
daniel
|
d19b506781
|
fix cv in mobile pandora_enterprise#12196
|
2023-10-11 10:48:26 +02:00 |
|
daniel
|
588f19fa18
|
fix cv in mobile pandora_enterprise#12196
|
2023-10-06 12:59:33 +02:00 |
Jonathan
|
563323d0be
|
#11852 warning time lapse more than 30 days
|
2023-08-21 13:05:39 +02:00 |
|
Jonathan
|
d7a682d48c
|
Merge branch 'develop' into ent-11093-reticula-en-consola-visual
|
2023-07-03 09:50:59 +02:00 |
|
Matias Didier
|
fde3857674
|
Merge branch 'ent-11476-cambiar-headers-de-copyright' into 'develop'
Ent 11476 cambiar headers de copyright
See merge request artica/pandorafms!6069
|
2023-06-22 13:24:47 +00:00 |
|
Jonathan
|
6ac8425ea3
|
#11592 resize item label VC
|
2023-06-15 11:52:42 +02:00 |
|
Jonathan
|
0463d3bea3
|
#11093 grid position recolocation after drag
|
2023-06-08 13:54:05 +02:00 |
miguel angel rasteu
|
db62a91cb6
|
#11476 Fix https url
|
2023-06-08 13:19:01 +02:00 |
|
miguel angel rasteu
|
1f8752ee63
|
#11476 Fix pandora url
|
2023-06-08 13:10:16 +02:00 |
|
miguel angel rasteu
|
64204b6ff7
|
#11476 Fix ascci art
|
2023-06-08 12:42:10 +02:00 |
|
miguel angel rasteu
|
933f69f2ab
|
#11476 Change copyright header
|
2023-06-08 11:53:13 +02:00 |
|
Jonathan
|
dd375dc73e
|
#11093 grid background VC
|
2023-06-07 12:46:39 +02:00 |
Daniel Cebrian
|
151882859a
|
#11456 fixed visual console when setting background none
|
2023-06-05 15:20:02 +02:00 |
Daniel Maya
|
346518e6e9
|
#11400 fixed group icons with cache
|
2023-05-30 12:17:41 +02:00 |
|
Matias Didier
|
9bdeecf124
|
Merge branch 'ent-11212-dos-bugs-con-item-de-donuts-chart-de-consolas-visuales' into 'develop'
Ent 11212 dos bugs con item de donuts chart de consolas visuales
See merge request artica/pandorafms!5900
|
2023-05-19 08:03:29 +00:00 |
Daniel Rodriguez
|
03dcf88023
|
Merge branch 'ent-10638-enlaces-de-red-consola-visual-mejorar-visualizacion' into 'develop'
Ent 10638 enlaces de red consola visual mejorar visualizacion
See merge request artica/pandorafms!5811
|
2023-05-18 13:21:04 +00:00 |
|
Daniel Maya
|
be0f77b782
|
#11202 Fixed url icon
|
2023-05-17 14:56:00 +02:00 |
|
Daniel Maya
|
57ed7a6610
|
#11212 Fixed donut graph
|
2023-05-16 12:09:23 +02:00 |
|
Jonathan
|
1ba6566cff
|
#10362 token recursive group VC default 1
|
2023-05-09 16:52:30 +02:00 |
|
Jonathan
|
13f0e3db23
|
#10362 recursive group visual console
|
2023-05-09 16:45:44 +02:00 |
|
Jonathan
|
e1f473f985
|
#10638 format numbers network link
|
2023-04-28 10:51:02 +02:00 |
|
Daniel Rodriguez
|
af80e204de
|
Merge branch 'ent-10255-14940-Funcionalidad-cuadro-naranja-en-las-consolas-visuales-cuando-hay-una-alerta' into 'develop'
setup check to enable/disable vc item alert frame
See merge request artica/pandorafms!5668
|
2023-04-20 17:22:57 +00:00 |
alejandro.campos@artica.es
|
d0aa931f46
|
setup check to enable/disable vc item alert frame
|
2023-04-05 16:24:46 +02:00 |
|
Jonathan
|
000ab68327
|
#10490 TinyMCE Upgrade V6
|
2023-04-04 11:24:49 +02:00 |
|
daniel
|
48a254c4b2
|
fixed styles
|
2023-03-27 14:34:05 +02:00 |
|
Matias Didier
|
5529c33f0c
|
Merge branch 'ent-10650-bugs-funcionales-en-consolas-visuales' into 'develop'
Ent 10650 bugs funcionales en consolas visuales
See merge request artica/pandorafms!5601
|
2023-03-24 09:11:26 +00:00 |
|
daniel
|
732000f7bd
|
fixed styles
|
2023-03-21 18:42:31 +01:00 |
|
Daniel Cebrian
|
26c08ebe0f
|
#10650 fixed bug when user access in view maintenance and show modules select
|
2023-03-14 17:13:19 +01:00 |
Jose Gonzalez
|
edbc9d8f6b
|
Icons review
|
2023-03-09 23:31:40 +01:00 |
|
daniel
|
ff3b7001c3
|
fixed styles
|
2023-03-04 13:22:52 +01:00 |
|
daniel
|
5d7738a05e
|
Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones
Conflicts:
pandora_console/extras/mr/62.sql
pandora_console/include/ajax/module.php
pandora_console/include/functions_ui.php
pandora_console/operation/agentes/estado_agente.php
pandora_console/operation/agentes/status_monitor.php
pandora_console/operation/events/events.php
|
2023-03-03 08:20:44 +01:00 |
|
alejandro.campos@artica.es
|
8b9803c1c5
|
fixed tinyMCE converting URLs to relative ones
|
2023-02-08 17:04:24 +01:00 |
|
Jose Gonzalez
|
0363a90e1f
|
Resolve merge issues
|
2023-01-31 17:35:44 +01:00 |
|
Daniel Cebrian
|
7163b3d853
|
#10160 fixed xss vulnerability in visual console name
|
2023-01-23 16:47:27 +01:00 |
|
Daniel Maya
|
68eac366dd
|
#9971 Fixed imageSrc
|
2023-01-19 10:37:52 +01:00 |
Diego Muñoz-Reja
|
0435dc09bb
|
Merge branch 'ent-7386-Ocultar-credenciales-de-acceso-a-la-API' into 'develop'
Ent 7386 ocultar credenciales de acceso a la api
See merge request artica/pandorafms!4991
|
2023-01-13 12:44:32 +00:00 |
Calvo
|
d8428a46a7
|
Merge remote-tracking branch 'origin/develop' into ent-7386-Ocultar-credenciales-de-acceso-a-la-API
|
2023-01-13 10:12:21 +01:00 |
|
Daniel Cebrian
|
4d08ca57b4
|
#10129 fixed Circular progress bar name
|
2023-01-12 09:55:07 +01:00 |
|
Jose Gonzalez
|
a9c4dd625c
|
Merge develop branch
|
2023-01-11 13:46:15 +01:00 |
|
alejandro.campos@artica.es
|
5b5694c5f6
|
fixed conflicts
|
2023-01-09 10:49:11 +01:00 |
|
Jose Gonzalez
|
8421fb49ca
|
Merge remote-tracking branch 'origin' into ent-9662-Restyling-fuentes-colores-botones
|
2023-01-04 15:54:16 +01:00 |
|
daniel
|
c32483a38a
|
phpchartjs pandora_enterprise#9554
|
2022-12-23 11:34:35 +01:00 |
|
daniel
|
5907d55ec1
|
phpchartjs pandora_enterprise#9554
|
2022-12-22 23:03:52 +01:00 |