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

702 Commits

Author SHA1 Message Date
Jonathan 00ba02e23e Visual changes PDFs slicebar 2023-03-14 13:26:21 +01:00
Jonathan 1e2657fed3 Chart generator bug solution 2023-03-09 14:15:18 +01:00
alejandro.campos@artica.es 13186f23ba Merge remote-tracking branch 'origin/develop' into ent-10093-Activar-modo-mantenimiento-en-politicas-cuando-se-ejecuta-el-pandora-db 2023-02-22 11:08:27 +01:00
alejandro.campos@artica.es a1ccfc99ec policy maintenance mode 2023-02-06 13:41:31 +01:00
alejandro.campos@artica.es de3a74ae1a policy maintenance mode 2023-02-06 13:27:25 +01:00
alejandro.campos@artica.es a7a0886e6c policy maintenance mode 2023-02-06 13:24:37 +01:00
Pablo Aragon 54e4da7aad Merge branch 'develop' into ent-9220-verificar-y-capar-en-su-caso-que-las-colecciones-no-funcionan-en-la-nms-2 2023-02-03 10:48:42 +01:00
daniel ddebce7a3c fix validate events pandora_enterprise#10175 2023-01-25 11:25:20 +01:00
Pablo Aragon 0ec58067ab 9220 Cast config['license_nms'] 2023-01-24 14:45:42 +01:00
Pablo Aragon d2c286fc4c 9220 Conflict resolved 2023-01-24 09:50:34 +01:00
Pablo Aragon c503836634 Restrict access to collections with nms license 2023-01-12 12:28:40 +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
Calvo c14842a4f9 WIP:Api auth with bearer token 2022-12-29 17:20:34 +01:00
Rafael Ameijeiras 171fb5ed46 Merge branch 'ent-9825-no-se-suben-imagenes-por-file-manager-en-meta' into 'develop' 
Ent 9825 no se suben imagenes por file manager en meta

See merge request artica/pandorafms!5358
 2022-12-28 09:41:37 +00:00
daniel 69e3203317 Merge remote-tracking branch 'origin/develop' into ent-9554-nuevas-graficas-de-tarta-que-reemplazar-a-las-actuales-3 2022-12-27 09:06:20 +01:00
Pablo Aragon 6a528496cd 9825 Add function get file via POST 2022-12-27 08:41:15 +01:00
Rafael Ameijeiras c25ad3d4ea Merge branch 'ent-9932-errores-en-consola-del-navegador-de-filtro-del-snmp-browser' into 'develop' 
Fi browser console reporting errors

See merge request artica/pandorafms!5330
 2022-12-23 07:43:21 +00:00
Calvo 617c044a92 Fix js snmp browser errors 2022-12-22 20:10:02 +01:00
daniel 36eda00ae6 fix errors in new charts pandora_enterprise#9554 2022-12-21 10:07:18 +01:00
Daniel Barbero 3e071a7d33 remove phamtomjs pandora_enterprise#9554 2022-12-20 12:23:18 +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 1d01b8257d WIP pandora_enterprise#9554 2022-12-16 14:28:04 +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
Daniel Barbero 01d14ae3b8 new chart chartjs pandora_enterprise#9554 2022-12-13 09:10:13 +01:00
Calvo d525cb594c WIP: Download wait message 2022-12-02 09:42:24 +01:00
Luis 14745a9625 WIP:Prepare download control 2022-11-21 09:23:31 +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
Diego Muñoz-Reja 326365e54b Merge branch 'ent-9324-meta-wizard-no-borra-agentes' into 'develop' 
fixed wizard meta delete agent pandora_enterprise#9324

See merge request artica/pandorafms!5131
 2022-10-11 14:50:50 +00:00
Daniel Maya a674bdceb0 #9595 Fixed order 2022-10-03 10:16:00 +02:00
Daniel Barbero 72040df7bb fixed wizard meta delete agent pandora_enterprise#9324 2022-09-21 13:37:51 +02:00
José González 2a63f19d38 Fix 2022-09-20 11:13:02 +02:00
José González 68654804b4 Fixed minor issue 2022-09-14 17:18:39 +02:00
Daniel Rodriguez b1ff477780 Merge branch 'ent-6367-report-server-gestion-de-informes-extensos-varios-cientos-de-agentes-val' into 'develop' 
new console report pandora_enterprise#6367

See merge request artica/pandorafms!5013
 2022-08-09 12:09:26 +00:00
Daniel Barbero d9227fae0e fix console report pandora_enterprise#6367 2022-08-08 13:51:07 +02:00
Daniel Barbero 38c7bcc061 fix errors ipam pandora_enterprise#9282 2022-08-04 10:10:20 +02:00
Daniel Barbero 2a51a448ac Merge remote-tracking branch 'origin/develop' into ent-6367-report-server-gestion-de-informes-extensos-varios-cientos-de-agentes-val 
Conflicts:
	pandora_console/godmode/menu.php
 2022-08-02 10:34:21 +02:00
Daniel Barbero Martin 1e9ca202f0 fix error services items pandora_enterprise#8522 2022-07-19 11:09:49 +02:00
Daniel Barbero Martin 628d9b5630 new console report pandora_enterprise#6367 2022-07-12 10:18:06 +02:00
Daniel Barbero Martin 8e2b074460 new console report pandora_enterprise#6367 2022-07-11 16:42:20 +02:00
Daniel Barbero Martin 01ba149280 new console report pandora_enterprise#6367 2022-07-08 13:40:20 +02:00
Diego Muñoz-Reja bdb1fda92e Merge branch 'ent-9019-13559-Bug-en-logueo-con-AD-con-el-nombre' into 'develop' 
Ent 9019 13559 bug en logueo con ad con el nombre

See merge request artica/pandorafms!4910
 2022-07-07 10:44:46 +00:00
Diego Muñoz-Reja 3fe66d9a9b Merge branch 'ent-9085-13692-Fallo-permisos-en-creacion-edicion-de-List-of-Special-Days' into 'develop' 
fixed permissions

See merge request artica/pandorafms!4934
 2022-06-28 14:32:31 +00:00
Daniel Barbero Martin f3e645146d Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-17 08:51:11 +02:00
Daniel Rodriguez bea57c8991 Merge branch 'ent-8861-wizard-snmp-convierte-valores-hex-string-en-string' into 'develop' 
Changed snmpwalk parameters for wizard

See merge request artica/pandorafms!4872
 2022-06-16 12:17:27 +00:00
Daniel Barbero Martin 951a1703bf Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 
Conflicts:
	pandora_console/include/functions_reporting.php
 2022-06-08 08:15:49 +02:00
alejandro.campos@artica.es bf2ef75552 fixed permissions 2022-06-03 11:39:58 +02:00
Daniel Barbero Martin 0cda3d3613 refactor events meta pandora_enterprise#9086 2022-06-01 17:27:44 +02:00
Daniel Maya a78eb71995 #9019 Fixed id_user in active directory 2022-05-25 13:00:04 +02:00
Calvo dfc4786ef1 Changed snmpwalk parameters for wizard 2022-05-06 13:35:04 +02:00