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

16942 Commits

Author SHA1 Message Date
artica 94ba216f81 Updated version and build strings. 2022-11-08 13:01:55 +01:00
Rafael Ameijeiras 43690d3aa6 Merge branch 'ent-9745-XSS' into 'develop' 
fixed vulnerability in load of help iframes

See merge request artica/pandorafms!5245
 2022-11-08 11:49:46 +00:00
Daniel Maya 53ef84c7e5 #9765 Fixed check connection 2022-11-08 08:20:32 +01:00
artica 778501d4bf Auto-updated build strings. 2022-11-08 01:00:31 +01:00
Daniel Rodriguez 038195146e Merge branch 'ent-9774-XSS-reporting-dashboard-module' into 'develop' 
fix xss

See merge request artica/pandorafms!5249
 2022-11-07 16:06:29 +00:00
Daniel Rodriguez 3417ec9421 Merge branch 'ent-9526-Rendimiento-al-editar-informes-sql-query' into 'develop' 
fix performance issue

See merge request artica/pandorafms!5199
 2022-11-07 16:05:58 +00:00
Diego Muñoz-Reja f637bc12b8 Merge branch 'ent-9762-14476-reporte-de-eventos-de-todos-los-nodos-desde-metaconsola' into 'develop' 
fix report agent groups pandora_enterprise#9762

See merge request artica/pandorafms!5250
 2022-11-07 15:55:54 +00:00
Daniel Rodriguez 4f99d94dc0 Merge branch 'ent-9714-traducciones' into 'develop' 
translates pandora_enterprise#9714

See merge request artica/pandorafms!5228
 2022-11-07 13:27:51 +00:00
alejandro.campos@artica.es e3d01930b1 minor change 2022-11-07 14:13:04 +01:00
Daniel Rodriguez 7646f0629b Merge branch 'ent-8733-giss-anadir-alertas-externas-desde-varias-politicas-sin-pisar-las-anteriores' into 'develop' 
multiple external alert policies pandora_enterprise#8733

See merge request artica/pandorafms!5205
 2022-11-07 12:44:23 +00:00
Daniel Barbero 0b3b1c4ec0 fix report agent groups pandora_enterprise#9762 2022-11-07 11:37:26 +01:00
alejandro.campos@artica.es 75fe9dd8d3 fix xss 2022-11-07 11:26:00 +01:00
artica 883b2067db Auto-updated build strings. 2022-11-07 01:00:19 +01:00
artica f05015ab16 Auto-updated build strings. 2022-11-06 01:00:18 +01:00
artica 5c7862c4e1 Auto-updated build strings. 2022-11-05 01:00:22 +01:00
edu.corral 341fe37def ent 7914 status scaling based on time 2022-11-04 12:13:38 +01:00
Daniel Barbero 39df7fe13a Merge remote-tracking branch 'origin/develop' into ent-9714-traducciones 
Conflicts:
	pandora_console/include/visual-console-client/maintenanceMode.png
	visual_console_client/src/lib/maintenanceMode.png
 2022-11-04 11:14:20 +01:00
Jimmy Olano a548d2a798 Merge branch 'ent-9722-cartel-de-licencia-expirada' into 'develop' 
Ent 9722 cartel de licencia expirada

#9722

https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/9722

See merge request artica/pandorafms!5237
 2022-11-04 10:07:56 +00:00
edu.corral 1ff9b8c420 ent 7914 time based status scaling components 2022-11-04 09:45:06 +01:00
artica dce2b3f915 Auto-updated build strings. 2022-11-04 01:00:24 +01:00
alejandro.campos@artica.es 514b350e14 fixed performance problems 2022-11-03 18:20:39 +01:00
edu.corral fb4b42e6c5 ent 9722 expired license notifications 2022-11-03 13:55:06 +01:00
alejandro.campos@artica.es 2c7d7e4044 fixed vulnerability in load of help iframes 2022-11-03 13:53:10 +01:00
edu.corral 5eee3ade4a ent 9722 expired license 2022-11-03 11:36:28 +01:00
Daniel Rodriguez e52da7d379 Merge branch 'ent-9105-poder-anadir-colecciones-al-satellite-server' into 'develop' 
Ent 9105 poder anadir colecciones al satellite server

See merge request artica/pandorafms!5202
 2022-11-03 10:28:32 +00:00
artica 08f0d416cd Auto-updated build strings. 2022-11-03 01:00:24 +01:00
edu.corral 8d34ef88c5 ent 9722 expired licence notification 2022-11-02 09:19:15 +01:00
Daniel Barbero 19109a682e fix images maintenance mode 2022-11-02 08:14:11 +01:00
Junichi Satoh 98cc59a136 Updated Japanese console translations. 2022-11-02 15:55:00 +09:00
artica 42db6497aa Auto-updated build strings. 2022-11-02 01:00:18 +01:00
artica 91795a3078 Auto-updated build strings. 2022-11-01 01:00:24 +01:00
Daniel Rodriguez d99ccaba9e Merge branch 'ent-9729-xss-en-busqueda-de-libreria-de-modulos' into 'develop' 
Fix module library XSS

See merge request artica/pandorafms!5233
 2022-10-31 14:12:46 +00:00
Daniel Barbero 331219ba16 Merge remote-tracking branch 'origin/develop' into ent-8733-giss-anadir-alertas-externas-desde-varias-politicas-sin-pisar-las-anteriores 
Conflicts:
	pandora_console/extras/mr/58.sql
 2022-10-31 14:13:45 +01:00
Daniel Rodriguez a1210c7814 Merge branch 'ent-9233-Historico-de-traps' into 'develop' 
implemented trap history

See merge request artica/pandorafms!5116
 2022-10-31 11:17:29 +00:00
Daniel Rodriguez 0be07d1bb4 Merge branch 'ent-9536-autoincremento-de-indices-en-la-sync-de-meta-nodo' into 'develop' 
force insert with primary key pandora_enterprise#9536

See merge request artica/pandorafms!5171
 2022-10-31 10:06:15 +00:00
Daniel Rodriguez 41946bfda7 Merge branch 'ent-4822-estado-de-consola-visual-mantenimiento' into 'develop' 
add mode maintenance VC pandora_enterprise#4822

See merge request artica/pandorafms!5191
 2022-10-31 10:02:44 +00:00
Calvo 7bdf103725 Fix module library XSS 2022-10-31 10:19:13 +01:00
artica 1288a3c00b Auto-updated build strings. 2022-10-31 01:00:17 +01:00
artica c1290bd7d0 Auto-updated build strings. 2022-10-30 01:00:19 +02:00
artica 0eb3c12cd9 Auto-updated build strings. 2022-10-29 01:00:22 +02:00
Jimmy Olano 15955d2329 Merge branch 'ent-5584-9778-nuevo-editor-masivo-de-usuarios-meta-y-nodo-post' into 'develop' 
Ent 5584 9778 nuevo editor masivo de usuarios meta y nodo post

https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/5584

See merge request artica/pandorafms!5153
 2022-10-28 15:18:15 +00:00
Jimmy Olano af73da2291 Merge branch 'ent-4043-proyectos-banco-de-credenciales-contrasenas-para-modulos' into 'develop' 
Ent 4043 proyectos banco de credenciales contrasenas para modulos

https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/4043

See merge request artica/pandorafms!5172
 2022-10-28 14:00:46 +00:00
Daniel Barbero 10750e2464 translates pandora_enterprise#9714 2022-10-28 08:35:21 +02:00
artica 0da1247d68 Auto-updated build strings. 2022-10-28 01:00:26 +02:00
Daniel Maya 382e74ae36 resolved conflict 2022-10-27 09:42:40 +02:00
artica bf6f5479e8 Auto-updated build strings. 2022-10-27 01:00:24 +02:00
Jimmy Olano d9c5b59eff Merge branch 'ent-9630-Bug-en-codigo-de-functions-api-php' into 'develop' 
fix typo in code

Ref pandora_enterprise#9630

See merge request artica/pandorafms!5189
 2022-10-26 11:02:42 +00:00
Daniel Barbero 17889c51c1 new image pandora_enterprise#4822 2022-10-26 09:54:55 +02:00
Diego Muñoz-Reja 00a1e74473 Merge branch 'ent-9332-13917-fallos-al-autenticarse-con-ldap-cuando-tenemos-la-contrasena-encriptada' into 'develop' 
Fix entities ldap admin pass

See merge request artica/pandorafms!5217
 2022-10-26 07:53:31 +00:00
Daniel Barbero 3273fc23ed Merge remote-tracking branch 'origin/develop' into ent-4822-estado-de-consola-visual-mantenimiento 
Conflicts:
	pandora_console/extras/mr/58.sql
 2022-10-26 09:42:02 +02:00