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

6638 Commits

Author SHA1 Message Date
Daniel Cebrian df87c122af added ip in modules list 2023-01-10 10:50:47 +01:00
Enrique Martin 2cf0e301c5 Merge branch 'ent-9758-14470-alertas-triggereadas-deshabilitadas-cuentan-en-el-group-view' into 'develop' 
Ent 9758 14470 alertas triggereadas deshabilitadas cuentan en el group view

See merge request artica/pandorafms!5369
 2023-01-05 11:46:53 +00:00
Enrique Martin 502f43df9c Merge branch 'ent-10034-acl-enterprise-pfms-error-al-crear-perfil' into 'develop' 
Ent 10034 acl enterprise pfms error al crear perfil

See merge request artica/pandorafms!5376
 2023-01-05 11:43:05 +00:00
Diego Muñoz-Reja 14e703d1c3 Merge branch 'ent-10074-content-type-cannot-be-modified-on-snmp-alert-with-email-action' into 'develop' 
Ent 10074 content type cannot be modified on snmp alert with email action

See merge request artica/pandorafms!5362
 2023-01-04 16:06:16 +00:00
Daniel Cebrian 5fb435796b #10034 fixed option blank in ENTERPRISE ACL SETUP 2023-01-04 12:14:59 +01:00
Jonathan b9d6898639 #9758 update_alert_count on enable/disable alerts 2023-01-03 15:09:18 +01:00
Pablo Aragon ab54a26815 9868 Remove footer and create About section 2022-12-29 16:21:36 +01:00
Jonathan 707763f5e2 #10074 snmp alert edit content_type 2022-12-29 14:55:30 +01:00
Rafael Ameijeiras 6b4bc8b9b0 Merge branch 'ent-9903-no-permitir-nombres-de-perfiles-duplicados' into 'develop' 
Ent 9903 no permitir nombres de perfiles duplicados

See merge request artica/pandorafms!5321
 2022-12-28 10:01:46 +00:00
Rafael Ameijeiras 7c0b6330bd Merge branch 'ent-9997-quitar-using-module-component-de-la-edicion-de-modulo' into 'develop' 
Ent 9997 quitar using module component de la edicion de modulo

See merge request artica/pandorafms!5354
 2022-12-28 09:49:42 +00: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
Rafael Ameijeiras db7205fed3 Merge branch 'ent-9996-descripcion-incorrecta-al-crear-modulo-ssh' into 'develop' 
Ent 9996 descripcion incorrecta al crear modulo ssh

See merge request artica/pandorafms!5351
 2022-12-28 09:37:04 +00:00
Pablo Aragon bbdc5b3e93 9664 Exclude pendingdelete modules from scheduled downtime 2022-12-27 15:22:39 +01: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
Daniel Rodriguez 05687a9ef2 Merge branch 'ent-1841-filtro-por-so-en-politicas-cepsa' into 'develop' 
SO filter on policy

See merge request artica/pandorafms!5331
 2022-12-23 09:38:29 +00:00
Jonathan c89d80e7e7 #9997 Module agent on edit don't show template 2022-12-23 09:44:15 +01:00
Rafael Ameijeiras 925749dc5f Merge branch 'ent-9052-lista-de-modulos-de-un-agente-ordenar-filtros-y-controles' into 'develop' 
Ent 9052 lista de modulos de un agente ordenar filtros y controles

See merge request artica/pandorafms!5327
 2022-12-22 09:35:41 +00:00
Pablo Aragon d83abafaaa 9996 Edit description when create ssh module 2022-12-21 17:05:01 +01:00
Rafael Ameijeiras 64510a6e31 Merge branch 'ent-9059-vista-de-grupos-de-agentes-acortar-y-ordenar-filtro' into 'develop' 
Ent 9059 vista de grupos de agentes acortar y ordenar filtro

See merge request artica/pandorafms!5322
 2022-12-21 13:41:31 +00:00
daniel 47c503bdab Merge remote-tracking branch 'origin/develop' into ent-9554-nuevas-graficas-de-tarta-que-reemplazar-a-las-actuales-3 2022-12-21 12:51:18 +01:00
Rafael Ameijeiras 9ad2556201 Merge branch 'ent-1270-borrado-de-modulos-hijos-automatico' into 'develop' 
Ent 1270 borrado de modulos hijos automatico

See merge request artica/pandorafms!5340
 2022-12-21 11:49:39 +00:00
Daniel Rodriguez cc2da2d4a4 Merge branch 'ent-8535-Monitorizacion-de-clusters-Pasar-de-Enterprise-a-Open' into 'develop' 
implement cluster in open project

See merge request artica/pandorafms!5204
 2022-12-21 09:05:01 +00:00
Jonathan f62116bf92 #1270 deleche children modules on checked 2022-12-21 08:44:11 +01:00
Rafael Ameijeiras 5934b02738 Merge branch 'ent-10018-Vulnerabilidad-CSRF' into 'develop' 
fixed csrf

See merge request artica/pandorafms!5336
 2022-12-20 17:50:21 +00:00
Rafael Ameijeiras 7091654e65 Merge branch 'ent-9844-bug-en-el-filtro-de-alertas' into 'develop' 
Fix alert list view search bug

See merge request artica/pandorafms!5319
 2022-12-20 17:49:07 +00:00
Rafael Ameijeiras e0b5abba31 Merge branch 'ent-9738-14457-Cambio-de-nodo-en-Informe-SQL-no-funciona-tras-edicion-META' into 'develop' 
fixed report update

See merge request artica/pandorafms!5334
 2022-12-20 13:38:54 +00:00
alejandro.campos@artica.es 47cb138d9b path fix 2022-12-20 14:15:33 +01:00
Rafael Ameijeiras 96d08a3c7a Merge branch 'ent-9978-permission-for-massive-operation-in-enterpriseacl-does-not-work' into 'develop' 
Ent 9978 permission for massive operation in enterpriseacl does not work

See merge request artica/pandorafms!5316
 2022-12-20 11:49:08 +00:00
Rafael Ameijeiras 9e0cff685a Merge branch 'ent-9953-No-se-puede-añadir-informacion-GIS-de-los-agentes-manualmente-desde-a-consola-php8' into 'develop' 
minor fix

See merge request artica/pandorafms!5333
 2022-12-20 11:47:43 +00:00
Daniel Barbero 3e071a7d33 remove phamtomjs pandora_enterprise#9554 2022-12-20 12:23:18 +01:00
Jonathan e694d6468f 1270 Delete modules on cascade 2022-12-19 17:04:49 +01:00
alejandro.campos@artica.es 8f3f8679d5 Merge remote-tracking branch 'origin/develop' into ent-8535-Monitorizacion-de-clusters-Pasar-de-Enterprise-a-Open 2022-12-16 11:29:00 +01:00
Jonathan 97c967ede8 Disable enter on profiles create/edit for duplicate profile name check 2022-12-16 09:53:10 +01:00
Jonathan 14b884b53d Trim duplicate profile before post to save 2022-12-15 15:37:46 +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 960d8be258 Merge branch 'develop' into 'ent-8535-Monitorizacion-de-clusters-Pasar-de-Enterprise-a-Open' 
# Conflicts:
#   pandora_console/extras/delete_files/delete_files.txt
 2022-12-15 14:05:27 +00:00
Rafael Ameijeiras bd509ea4f0 Merge branch 'ent-9780-14458-No-se-ve-informacion-en-tareas-Discovery' into 'develop' 
fix task summary

See merge request artica/pandorafms!5313
 2022-12-15 13:35:58 +00:00
alejandro.campos@artica.es 26426c1bfa fixed csrf 2022-12-15 08:48:48 +01:00
alejandro.campos@artica.es b9c49fed84 fixed report update 2022-12-14 12:16:48 +01:00
alejandro.campos@artica.es 2106cac36a minor fix 2022-12-14 11:23:32 +01:00
Luis 897bca7807 SO filter on policy 2022-12-14 09:11:29 +01:00
Rafael Ameijeiras e510460399 Merge branch 'ent-9983-500-en-operaciones-masivas-767-y-error-php-8' into 'develop' 
Fix alerts bulk operations error 500

See merge request artica/pandorafms!5326
 2022-12-13 10:52:02 +00:00
Daniel Barbero a0ddad63b8 Merge remote-tracking branch 'origin/develop' into ent-9135-buscar-por-nombre-de-usuario-en-eventos 
Conflicts:
	pandora_console/extras/mr/59.sql
 2022-12-13 09:17:39 +01:00
Pablo Aragon 030c50e533 9052 Edit styles of Manage agents / Modules 2022-12-12 18:53:11 +01:00
Calvo af53d63457 Fix alerts bulk operations error 500 2022-12-12 16:51:37 +01:00
Rafael Ameijeiras 44655d7ae3 Merge branch 'ent-9152-Opcion-de-habilitar-modulos-en-grupos-en-la-vista-de-agente' into 'develop' 
add enable modules massive option

See merge request artica/pandorafms!5215
 2022-12-12 11:57:27 +00:00
Rafael Ameijeiras bb22bf87a9 Merge branch 'ent-8755-Poder-editar-plugins-de-servidor' into 'develop' 
change update constraints for server plugins

See merge request artica/pandorafms!5261
 2022-12-12 11:49:39 +00:00
Pablo Aragon 33c10f3c1a #9059 Change sizes search 2022-12-12 11:22:28 +01:00
Jonathan b11f047332 Change "safe" for "save" on profile duplicate 2022-12-12 10:50:59 +01:00
Diego Muñoz-Reja 31919d4d2c Merge branch 'ent-9801-bloqueo-de-boton-en-generacion-de-ficheros-pdf-csv-json-varias-secciones' into 'develop' 
Prepare download control

See merge request artica/pandorafms!5276
 2022-12-12 08:29:51 +00:00