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

367 Commits

Author SHA1 Message Date
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
Daniel Barbero b4d306b9b1 Merge remote-tracking branch 'origin/develop' into ent-9554-nuevas-graficas-de-tarta-que-reemplazar-a-las-actuales-3 2022-12-19 09:38:21 +01:00
Daniel Barbero 62aea35d7b fixed js render 2022-12-16 10:38:37 +01:00
alejandro.campos@artica.es 4ca220a3a7 Merge remote-tracking branch 'origin/develop' into ent-9323-14021-Modificar-el-display-de-valores-de-informe 2022-12-15 15:28:58 +01:00
alejandro.campos@artica.es e5f2c83120 minor change 2022-12-13 15:25:16 +01:00
alejandro.campos@artica.es 79e9597dd5 implemented alert warning in visual consoles 2022-12-13 12:03:13 +01:00
Daniel Barbero 5f91d2b077 new chart chartjs pandora_enterprise#9554 2022-12-13 09:11:29 +01:00
Rafael Ameijeiras dab898aaa0 Merge branch 'ent-9873-14572-imagenes-personalizadas-en-elementos-servicios-de-consola-visual-desaparecen' into 'develop' 
Ent 9873 14572 imagenes personalizadas en elementos servicios de consola visual desaparecen

See merge request artica/pandorafms!5301
 2022-12-12 08:10:10 +00:00
jose.gonzalez@pandorafms.com 445a8161cf Merge 2022-12-05 09:44:35 +01:00
alejandro.campos@artica.es c45d588ca6 fixed several bugs 2022-12-02 10:42:34 +01:00
Daniel Maya 57bd23f94c #9873 Fixed images 2022-11-29 16:45:44 +01:00
jose.gonzalez@pandorafms.com a688182062 Merge remote-tracking branch 'origin' into ent-9662-Restyling-fuentes-colores-botones 2022-11-22 17:47:02 +01:00
Calvo d8967804dd Change vc console backgroud blankspace with its entity 2022-11-16 09:32:08 +01:00
Calvo 51e832503a Fix VC background with spaces on his name 2022-11-15 13:54:57 +01:00
jose.gonzalez@pandorafms.com f99a7dc511 Adaptations 2022-11-07 14:04:07 +01:00
alejandro.campos@artica.es 8d611a8e7f implemented float formatting and option in reports to change visualization format 2022-10-26 18:25:16 +02:00
Daniel Barbero 19cfc84a39 add mode maintenance VC pandora_enterprise#4822 2022-10-13 17:45:44 +02:00
Daniel Barbero 3099ffa7cb add mode maintenance VC pandora_enterprise#4822 2022-10-13 13:44:39 +02:00
Daniel Barbero 9c93a99fb2 add mode maintenance VC pandora_enterprise#4822 2022-10-13 11:03:49 +02:00
Daniel Barbero Martin 72614130a8 fixed widget dashboards no exist item pandora_enterprise#9229 2022-07-28 14:25:31 +02:00
Daniel Barbero Martin d22c667776 fixed VC pandora_enterprise#8888 2022-06-15 19:50:19 +02:00
Daniel Barbero Martin ececdca0b6 Not orientation CV view mobile pandora_enterprise#8888 2022-05-13 12:54:58 +02:00
Daniel Rodriguez c6a3a7df10 Merge branch 'ent-8569-item-icon-cv-cambiar-token-link-enabled-a-habilitado-por-defecto' into 'develop' 
enable link item icon for default CV pandora_enterprise#8569

See merge request artica/pandorafms!4771
 2022-03-25 10:44:07 +00:00
Daniel Barbero Martin 28232f7c49 enable link item icon for default CV pandora_enterprise#8569 2022-03-21 15:43:25 +01:00
Daniel Barbero Martin 0342f2a908 Merge remote-tracking branch 'origin/develop' into ent-8676-consolas-visuales-en-consola-movil 2022-03-21 09:06:44 +01:00
Daniel Maya c2d60fafa9 #8596 Fixed image-item 2022-03-17 16:37:43 +01:00
Daniel Barbero Martin 6c4d2f2b31 fixed CV in console mobile metaconsole #8676 2022-03-15 18:12:01 +01:00
Daniel Barbero Martin e1ab514757 fixed CV in console mobile metaconsole #8676 2022-03-10 16:56:00 +01:00
fbsanchez 4d912fbd34 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 2022-02-11 09:55:34 +01:00
José González fc4b702db0 Merge branch 'develop' into 'ent-8422-Revision-completa-audit-logs' 
# Conflicts:
#   pandora_console/godmode/alerts/configure_alert_template.php
 2022-02-08 11:35:01 +00:00
fbsanchez a298b25a38 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 2022-02-03 17:55:34 +01:00
Daniel Rodriguez 3ef5c57c9e Merge branch 'ent-8501-Error-Metaconsola-y-consolas-visuales' into 'develop' 
minor fix

See merge request artica/pandorafms!4672
 2022-02-03 10:19:45 +00:00
fbsanchez 17be6f3ca5 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 2022-02-02 11:36:14 +01:00
alejandro.campos@artica.es 2bfd2e2611 minor fix 2022-02-01 17:13:13 +01:00
Daniel Maya cc7efec98a #8412 Fixed item group 2022-01-28 13:58: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
Jose Gonzalez 3252832cc7 WIP: Check audit logs 2022-01-20 10:55:23 +01:00
fbsanchez 2aad6404a2 php8 with php72 support 2022-01-13 13:48:25 +01:00
fbsanchez d8d5bb3a21 php8 vc review 2022-01-13 12:16:39 +01:00
fbsanchez edd24cd388 php8 vc context fixes 2022-01-13 11:47:49 +01:00