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

330 Commits

Author SHA1 Message Date
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
fbsanchez a728d384d7 php8 vc moved static created method to Model instead Item (for lines) 2022-01-13 11:43:33 +01:00
fbsanchez a1546ba080 vc php8 review 2022-01-13 10:47:53 +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