Calvo
19fe7ffe73
Fix minor bug
2022-12-30 15:04:07 +01:00
Calvo
867749f9d3
Fix inventory blacklist open
2022-12-29 18:14:43 +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
Jonathan
707763f5e2
#10074 snmp alert edit content_type
2022-12-29 14:55:30 +01:00
Calvo
fc7187ed0c
Merge remote-tracking branch 'origin/develop' into ent-8558-inventario-pasa-de-enterprise-open
2022-12-28 18:32:49 +01:00
Calvo
0e2829eca0
Fix inventory blacklist js
2022-12-28 18:28:03 +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
Calvo
566344ef0e
Merge remote-tracking branch 'origin/develop' into ent-8558-inventario-pasa-de-enterprise-open
2022-12-28 11:00:44 +01: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
Calvo
f8b3183ad3
Moved inventory blacklist to open
2022-12-27 13:02:03 +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
Calvo
8f53ec448f
Fix button delete inventory modules
2022-12-22 17:48:37 +01:00
Calvo
fd59061800
Fix wrong link to inventory modules form
2022-12-22 17:43:49 +01:00
Calvo
b46f9c9319
Move inventory to open
2022-12-22 12:47:03 +01:00
Calvo
2ad8fac652
Merge remote-tracking branch 'origin/develop' into ent-8558-inventario-pasa-de-enterprise-open
2022-12-22 11:35:25 +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
Jose Gonzalez
ffa4ec756c
Agent Group icons adding
2022-12-20 17:22:35 +01: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
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
Jonathan
e694d6468f
1270 Delete modules on cascade
2022-12-19 17:04:49 +01:00
Jose Gonzalez
b0997850f4
Fix server type icon definition
2022-12-19 16:38:47 +01:00
Jose Gonzalez
977c358fa0
Grouped somethings
2022-12-19 15:08:53 +01:00
Calvo
63840b1d55
Merge remote-tracking branch 'origin/develop' into ent-8558-inventario-pasa-de-enterprise-open
2022-12-19 11:31:02 +01:00
Jose Gonzalez
fd48f54f66
Minor fix
2022-12-19 11:06:21 +01:00
jose.gonzalez@pandorafms.com
2b896bcd17
Minor fixes over module data tables
2022-12-16 12:55:56 +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
jose.gonzalez@pandorafms.com
4fd0115d80
Adapt views
2022-12-15 12:42:35 +01: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
jose.gonzalez@pandorafms.com
744a7b47fe
Minor changes
2022-12-12 11:13:33 +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
Rafael Ameijeiras
cedee1a3fa
Merge branch 'ent-9557-14267-eliminar-dashboards-privados-cuando-se-borra-el-usuario-asignado' into 'develop'
...
Ent 9557 14267 eliminar dashboards privados cuando se borra el usuario asignado
See merge request artica/pandorafms!5258
2022-12-12 08:21:16 +00:00
Rafael Ameijeiras
f9bb893aae
Merge branch 'ent-8849-13468-Anadir-links-web-en-los-custom-fileds-de-agente' into 'develop'
...
implemented custom field
See merge request artica/pandorafms!5271
2022-12-12 08:20:08 +00:00
jose.gonzalez@pandorafms.com
caad626c39
Minor changes
2022-12-10 14:39:17 +01:00
Jonathan
0b6d1a7840
#9903 Duplicate control profile
2022-12-09 11:37:08 +01:00
Luis Calvo
cdd1569364
Fix list all private dashboards on user edition
2022-12-09 09:54:20 +01:00
Luis Calvo
aa85c73a3c
Fix alert list view search bug
2022-12-09 08:59:03 +01:00
jose.gonzalez@pandorafms.com
5a2e969b85
Module type changes
2022-12-07 18:17:11 +01:00
KANAYAMA Akihiro
63e649be85
Removed unnecessary escape of ampersand.
2022-12-07 19:25:27 +09:00
jose.gonzalez@pandorafms.com
e57f9b8794
Some changes
2022-12-05 17:31:08 +01:00
alejandro.campos@artica.es
10d3b67bfa
fix task summary
2022-12-05 14:09:12 +01:00
jose.gonzalez@pandorafms.com
912f1d0d7a
Module manager upgrade
2022-12-05 13:39:51 +01:00
jose.gonzalez@pandorafms.com
445a8161cf
Merge
2022-12-05 09:44:35 +01:00
Calvo
718be360d5
Download wait message
2022-12-02 15:40:47 +01:00
jose.gonzalez@pandorafms.com
4278ffff26
Module editor improvements
2022-12-02 14:25:22 +01:00
Calvo
d525cb594c
WIP: Download wait message
2022-12-02 09:42:24 +01:00
Daniel Maya
755b9ec2a3
#9960 Fixed array_unique and array_reverse in pandora open
2022-12-01 09:40:46 +01:00
Daniel Maya
5bca791021
#9954 Fixed table
2022-11-30 15:57:49 +01:00
jose.gonzalez@pandorafms.com
dccd950e9e
Changes
2022-11-30 10:14:42 +01:00
alejandro.campos@artica.es
2925df80e9
changed wrong count
2022-11-29 12:04:03 +01:00
alejandro.campos@artica.es
6243229345
changed wrong count
2022-11-29 11:54:25 +01:00
jose.gonzalez@pandorafms.com
9d0f465874
Minor improvements
2022-11-24 10:00:42 +01:00
jose.gonzalez@pandorafms.com
6eb9319a7a
Minor fixes
2022-11-23 17:42:53 +01:00
alejandro.campos@artica.es
b9242b17d8
fixed bugs in meta profiles management
2022-11-23 16:29:27 +01:00
jose.gonzalez@pandorafms.com
df11d70f12
Fix custom columns events view
2022-11-23 13:41:38 +01:00
Jimmy Olano
38a6e59e6b
Merge branch 'ent-9865-en-metaconsola-actualizar-la-notificacion-del-warp-update-para-php-8-a-partir-de-la-version-767' into 'develop'
...
Ent 9865 en metaconsola actualizar la notificacion del warp update para php 8 a partir de la version 767
Ref: pandora_enterprise#9865
See merge request artica/pandorafms!5285
2022-11-23 11:15:04 +00:00
Rafael Ameijeiras
ce18775ac0
Merge branch 'ent-9501-tenencia-de-mismos-permisos-de-manera-simultanea' into 'develop'
...
Ent 9501 tenencia de mismos permisos de manera simultanea
See merge request artica/pandorafms!5218
2022-11-23 10:03:19 +00:00
Daniel Rodriguez
0fb90e3383
Merge branch 'ent-9861-stored-cross-site-scripting-vulnerability-in-create-event-section' into 'develop'
...
Fix events view XSS vulnerabilities
See merge request artica/pandorafms!5284
2022-11-23 09:46:52 +00:00
alejandro.campos@artica.es
743fef7d58
Merge remote-tracking branch 'origin/develop' into ent-9501-tenencia-de-mismos-permisos-de-manera-simultanea
2022-11-23 10:30:59 +01:00
alejandro.campos@artica.es
5accae9d47
minor changes
2022-11-23 10:30:53 +01:00
alejandro.campos@artica.es
f03cd5ec8c
implemented link type custom field
2022-11-22 20:40:22 +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
jose.gonzalez@pandorafms.com
bf1a997498
Clean footer
2022-11-22 17:41:14 +01:00
alejandro.campos@artica.es
b097046fc4
constraint when creating existing profiles
2022-11-22 17:09:13 +01:00
Calvo
4e9bc2d6ef
Update messages to php8
2022-11-22 16:31:09 +01:00
Calvo
5aa51f28de
Fix events view XSS vulnerabilities
2022-11-22 15:54:19 +01:00
Daniel Rodriguez
49d0f336fd
Merge branch 'ent-9514-14202-Problemas-ACL-Enterprise-no-deja-borrar-alertas' into 'develop'
...
fix alert deletion from agent alerts
See merge request artica/pandorafms!5192
2022-11-22 14:04:08 +00:00