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

230 Commits

Author SHA1 Message Date
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
Calvo 6d9149e11b Merge remote-tracking branch 'origin/develop' into ent-7386-Ocultar-credenciales-de-acceso-a-la-API 2022-12-29 17:39:12 +01:00
Pablo Aragon ab54a26815 9868 Remove footer and create About section 2022-12-29 16:21:36 +01:00
Rafael Ameijeiras fa034e4ae2 Merge branch 'ent-9664-14349-modulos-pendingdelete-se-muestran-en-el-selector-de-modulos-en-paradas-planificadas' into 'develop' 
Ent 9664 14349 modulos pendingdelete se muestran en el selector de modulos en paradas planificadas

See merge request artica/pandorafms!5359
 2022-12-28 09:42:23 +00:00
Pablo Aragon bbdc5b3e93 9664 Exclude pendingdelete modules from scheduled downtime 2022-12-27 15:22:39 +01:00
daniel 5907d55ec1 phpchartjs pandora_enterprise#9554 2022-12-22 23:03:52 +01:00
Calvo f84f9733e3 Merge remote-tracking branch 'origin/develop' into ent-7386-Ocultar-credenciales-de-acceso-a-la-API 2022-12-20 12:15:10 +01:00
Daniel Barbero 62aea35d7b fixed js render 2022-12-16 10:38:37 +01:00
alejandro.campos@artica.es d564fc4022 fix reference error 2022-11-24 10:25:28 +01:00
Daniel Rodriguez a3dc8be0e5 Merge branch 'ent-9254-13891-encriptar-contrasenas-en-replicacion-de-bbdd' into 'develop' 
Ent 9254 13891 encriptar contrasenas en replicacion de bbdd

See merge request artica/pandorafms!5140
 2022-10-21 10:42:16 +00:00
Jimmy Olano aaedb39849 Merge branch 'ent-9392-no-funciona-insertar-agentes-en-paradas-planificadas' into 'develop' 
Fix planned downtime issues

Ref: pandora_enterprise#9392

See merge request artica/pandorafms!5166
 2022-10-19 11:00:04 +00:00
Calvo b29f7eb160 Fix planned downtime issues 2022-09-30 14:54:16 +02:00
edu.corral b43d548312 ent 9467 warning and critical thresholds 2022-09-28 15:02:11 +02:00
Daniel Maya 795308367f #9254 load password with ajax 2022-09-23 13:24:46 +02:00
alejandro.campos@artica.es ded2fb08ff implemented cron based scheduled downtimes 2022-08-16 18:42:51 +02:00
Daniel Barbero Martin a92d50303d fix color tabs and block histogram pandora_enterprise#8621 2022-06-30 14:09:29 +02:00
José González c3dc1d820d Frontend changes 2022-06-28 17:24:49 +02:00
Daniel Barbero Martin 867c6a1415 Merge remote-tracking branch 'origin/develop' into ent-8621-copiando-a-grafana-4-color-tabs-como-widget-en-dashboard 
Conflicts:
	pandora_console/include/javascript/pandora.js
 2022-06-28 17:02:01 +02:00
Daniel Barbero Martin 24305b40b0 Merge remote-tracking branch 'origin/develop' into ent-8621-copiando-a-grafana-4-color-tabs-como-widget-en-dashboard 
Conflicts:
	pandora_console/include/javascript/pandora.js
	pandora_console/include/lib/Dashboard/Widget.php
	pandora_console/include/styles/dashboards.css
 2022-06-27 08:38:50 +02:00
José González b871c1fb55 Added token view and generation in user views 2022-06-17 12:13:23 +02:00
Daniel Barbero Martin 5968febd04 Merge remote-tracking branch 'origin/develop' into ent-7960-filtros-de-alertas-sonoras-sound-events-2 
Conflicts:
	pandora_console/include/javascript/pandora.js
 2022-06-13 17:10:19 +02:00
Daniel Rodriguez 8fcdb59ae8 Merge branch 'ent-7850-12225-Añadir-buscador-para-agentes-en-wizard-report' into 'develop' 
implemented text search of select inputs

See merge request artica/pandorafms!4831
 2022-06-02 08:31:58 +00:00
Daniel Barbero Martin 8e78110d5d events sound pandora_enterprise#7960 2022-05-30 17:47:28 +02:00
Daniel Barbero Martin 9d2c179423 add new widget color tabs module pandora_enterprise#8621 2022-05-19 18:00:49 +02:00
José González 3cd116f88b Fix issue with period selector 2022-04-25 10:33:33 +02:00
alejandro.campos@artica.es 9adb8bae1d minor fix 2022-04-25 10:16:18 +02:00
alejandro.campos@artica.es 0223dd27c7 implemented text search of select inputs 2022-04-21 16:56:08 +02:00
alejandro.campos@artica.es 6b708777f6 change email alert templates 2022-04-07 17:24:06 +02:00
Daniel Barbero Martin 2e083c06d7 add report services sla to wizard metaconsole pandora_enterprise#7063 2022-03-22 11:32:44 +01:00
Daniel Barbero Martin 7ffca83b29 fixed error massive operation agents #2152 2022-03-10 20:06:45 +01:00
alejandro.campos@artica.es 2b6a9f0277 show agent and module name tip 2022-01-31 15:43:56 +01:00
alejandro.campos@artica.es b9c78bbfb1 show agent and module name tip 2022-01-31 13:18:26 +01:00
alejandro.campos@artica.es d210390a3d truncate texts in module massive operations 2022-01-27 17:30:20 +01:00
Calvo 7daf138ef5 Fix recursion and filter on modules massive operations 2021-10-18 15:47:22 +02:00
marcos 3cb2b92774 fixed error with manual resize advanced action alerts 2021-08-31 11:47:36 +02:00
Daniel Rodriguez 46b17e5156 Merge branch 'ent-7657-Vulnerabilidad-xss-en-nombre-de-modulos' into 'develop' 
fixed xss vulnerability

See merge request artica/pandorafms!4196
 2021-08-09 08:59:44 +00:00
alejandro.campos@artica.es 98f0bc9fac fixed xss vulnerability 2021-06-11 08:54:00 +02:00
alejandro.campos@artica.es cb5905b000 fixed xss vulnerability 2021-06-11 08:52:10 +02:00
fbsanchez ae34209f52 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-10 21:45:50 +02:00
Marcos Alconada 665efa4fb7 Ent 7519 cambio de fuentes en la consola a nivel global 2021-06-10 08:19:11 +00:00
Daniel Rodriguez 4b819360ff Revert "Merge branch 'ent-7519-cambio-de-fuentes-en-la-consola-a-nivel-global' into 'develop'" 
This reverts merge request !4132
 2021-06-09 18:09:43 +02:00
Marcos Alconada 2334eccd01 Ent 7519 cambio de fuentes en la consola a nivel global 2021-06-09 13:59:28 +00:00
Daniel Barbero Martin 77693b6c6d Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-07 08:33:56 +02:00
marcos ac286a438c set labels white color on module interval svg 2021-04-05 11:41:36 +02:00
Daniel Barbero Martin d92adfc008 WIP command center 2021-03-25 16:50:24 +01:00
Daniel Rodriguez 23edf2f11f Merge branch 'ent-6751-Al-poner-en-unidades-distintas-del-selector-no-se-puede-volver-a-dejar-en-blanco' into 'develop' 
Ent 6751 al poner en unidades distintas del selector no se puede volver a dejar en blanco

See merge request artica/pandorafms!3695
 2021-03-01 12:14:54 +00:00
Jose Gonzalez 7cfc1d2f9a Fixed issue with all modules 2021-02-25 16:08:02 +01:00
Daniel Maya 244c4d56d6 Fixed unit 2020-12-04 12:32:38 +01:00
Luis 2f2556ef79 Ent 6680 ventana de perdida de conexion incorrecta 2020-11-04 16:41:25 +01:00
Marcos Alconada 8e4c62a0e9 fixed error 2020-10-29 18:20:33 +01:00