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

444 Commits

Author SHA1 Message Date
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
Daniel Rodriguez b596b895d1 Merge branch 'ent-9679-bug-en-log-de-last-activity-al-iniciar-sesion' into 'develop' 
Ent 9679 bug en log de last activity al iniciar sesion

See merge request artica/pandorafms!5378
 2023-01-10 09:03:37 +00:00
alejandro.campos@artica.es 5b5694c5f6 fixed conflicts 2023-01-09 10:49:11 +01:00
Daniel Cebrian 28ce3c4c86 #9679 added id user in review logs 2023-01-05 09:44:59 +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 3273fc23ed Merge remote-tracking branch 'origin/develop' into ent-4822-estado-de-consola-visual-mantenimiento 
Conflicts:
	pandora_console/extras/mr/58.sql
 2022-10-26 09:42:02 +02:00
Alejandro Campos c995a5eafb Merge branch 'develop' into 'ent-9592-Problema-de-seguridad-con-la-gestion-de-sesiones-Limited-Authentication-bypass-in-ajax-php' 
# Conflicts:
#   pandora_console/extras/mr/58.sql
 2022-10-18 07:23:29 +00: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
alejandro.campos@artica.es 05cbc2fb0e fixed vulnerability 2022-10-04 18:00:47 +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 e9fcc89eac Merge branch 'ent-8677-app-android-consolas-visuales' into 'develop' 
Ent 8677 app android consolas visuales

See merge request artica/pandorafms!4748
 2022-03-25 11:52:26 +00: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 4e444a9d20 Merge remote-tracking branch 'origin/develop' into ent-8677-app-android-consolas-visuales 2022-03-23 16:16:10 +01: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 9e07afdab2 fixed CV in console mobile metaconsole #8676 2022-03-15 11:39:57 +01:00
Daniel Barbero Martin e1ab514757 fixed CV in console mobile metaconsole #8676 2022-03-10 16:56:00 +01:00
Daniel Barbero Martin b0d73fa3ff API CV #8677 2022-03-08 14:56:33 +01:00
Daniel Barbero Martin 4f67ec2f22 API CV #8677 2022-03-08 14:50:59 +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
fbsanchez a728d384d7 php8 vc moved static created method to Model instead Item (for lines) 2022-01-13 11:43:33 +01:00
fbsanchez 59b0b71303 php8 vc Copy item 2022-01-13 11:31:11 +01:00
fbsanchez a1546ba080 vc php8 review 2022-01-13 10:47:53 +01:00
fbsanchez 7f574e1132 php8 visualconsoles review, warning! class and object missunderstanding here... 2022-01-12 20:46:46 +01:00
fbsanchez a58c6862e1 php8 visualconsoles review, warning! class and object missunderstanding here... 2022-01-12 20:46:19 +01:00
fbsanchez 8e5a0917ba php8 review + pdf images b64 fix 2022-01-12 19:43:33 +01:00
Daniel Rodriguez cd073ef4e3 Merge branch 'ent-8263-Fallo-interpretacion-grupos-en-Consola-Visual' into 'develop' 
Ent 8263 fallo interpretacion grupos en consola visual

See merge request artica/pandorafms!4550
 2022-01-11 15:39:43 +00:00
fbsanchez c7b3a63288 vc php8 2022-01-11 14:48:44 +01:00
fbsanchez 92186aa15f vc php8 2022-01-11 14:46:57 +01:00
fbsanchez c3639a22fb vc php8 2022-01-11 14:36:05 +01:00
Daniel Maya f5e165f253 Fixed alert fired 2022-01-10 15:26:07 +01:00
Daniel Maya be587c5294 #8207 Fixed group item 2021-12-03 10:38:27 +01:00
Daniel Maya cfd2fe390e #8263 Fixed status group 2021-11-24 11:40:24 +01:00
Daniel Rodriguez a6fc887613 Merge branch 'ent-8041-Bug-en-item-Module-graph-CV-creados-desde-wizard' into 'develop' 
Ent 8041 bug en item module graph cv creados desde wizard

See merge request artica/pandorafms!4471
 2021-11-15 11:21:44 +00: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
Jose Gonzalez c0abe5edb9 Fix merge 2021-11-04 16:00:05 +01:00
Daniel Maya 9792e64ed5 #8209 Fixed odometer 2021-10-29 14:35:57 +02:00
Daniel Maya 9976783266 #8041 Fixed module graph height 2021-10-15 11:43:43 +02:00
marcos 7418719861 resolved merge conflict 2021-10-04 12:27:57 +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
Daniel Maya eb4277f4bd #7273 Fixed background and value 2021-10-01 13:13:33 +02:00
Jose Gonzalez 8696d21a42 Fixed any minor bugs 2021-09-29 17:03:13 +02:00
Daniel Maya 574098e4ee #8062 Fixed custom graph in metaconsole 2021-09-29 16:20:18 +02:00
Daniel Maya 8fa834fb9b resolved conflict 2021-09-22 17:27:18 +02:00
Daniel Maya aef3e8affd #8013 Fixed percentile 2021-09-20 17:51:56 +02:00
marcos 9552b9716e reduce title of longer module name odometer VC 2021-09-06 12:28:57 +02:00
marcos 197ae303e2 reduce longer module name on odometers VC 2021-09-03 14:59:39 +02:00
Daniel Rodriguez 9b684ab9ef Merge branch 'ent-7568-11898-Problemas-de-configuración-consolas-visuales' into 'develop' 
Ent 7568 11898 problemas de configuración consolas visuales

See merge request artica/pandorafms!4278
 2021-08-11 08:33:24 +00: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 Maya f1f7291b5e Added basic chart 4 2021-08-04 11:11:28 +02:00
Daniel Maya 318edda041 Added basic chart 3 2021-08-03 15:46:01 +02:00
Daniel Maya 71fc8bd6e3 Added basic chart 2 2021-07-16 14:18:06 +02:00
Daniel Maya 71767a3f11 Added basic chart 2021-07-16 14:16:45 +02:00
Daniel Maya 3d3251bdc1 resolved conflict 2021-07-12 16:49:11 +02:00
Daniel Maya a4203aaee2 Ent 7272 nuevos elementos consola visual odómetro 2021-07-12 10:27:10 +00: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 Maya 2b5c5f0cce Fixed height 2021-07-08 09:41:49 +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
Daniel Maya b37bbcd944 Ent 7143 autoajuste de la consola visual 2021-06-29 10:02:13 +00:00
Daniel Maya 104dfdd92e Ent 7142 consola visual me oculta los botones 2021-06-21 14:04:11 +00:00