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

31069 Commits

Author SHA1 Message Date
vgilc 7eb7ccefc1 Merge branch 'ent-9572-Traducciones-2' into 'develop' 
translate pandora_enterprise#9572

See merge request artica/pandorafms!5162
 2022-09-30 07:36:48 +00:00
Daniel Barbero 23f9636540 translate pandora_enterprise#9572 2022-09-30 09:32:50 +02:00
artica af7cbc5901 Auto-updated build strings. 2022-09-30 01:00:20 +02:00
Diego Muñoz-Reja a0201eb9b2 Merge branch 'ent-9589-Error-registro-IPs-bloqueadas' into 'develop' 
Fix mistake with User IP and User name

See merge request artica/pandorafms!5160
 2022-09-29 15:56:51 +00:00
José González 6cdb1b0441 Fix mistake with User IP and User name 2022-09-29 17:46:39 +02:00
vgilc 9171bb2a8e Merge branch 'ent-9572-traducciones' into 'develop' 
translates pandora_enterprise#9572

See merge request artica/pandorafms!5158
 2022-09-29 13:45:59 +00:00
Daniel Barbero 81ed331688 translates pandora_enterprise#9572 2022-09-29 15:19:11 +02:00
Daniel Rodriguez 637fae3e8d Merge branch 'ent-8898-anida-mapas-de-red-no-actualizan-bien' into 'develop' 
Ent 8898 anida mapas de red no actualizan bien

See merge request artica/pandorafms!5143
 2022-09-29 12:36:37 +00:00
Diego Muñoz-Reja 5de7d9e413 Merge branch 'ent-9583-fallos-en-vista-repositorio-de-agentes' into 'develop' 
Fix datatable var scope

See merge request artica/pandorafms!5154
 2022-09-29 12:00:26 +00:00
Daniel Rodriguez c784e03883 Merge branch 'ent-9119-Metaconsola-Error-paginacion-vista-monitores' into 'develop' 
Ready

See merge request artica/pandorafms!5084
 2022-09-29 11:25:40 +00:00
Calvo e2f4f4df34 Fix datatable var scope 2022-09-29 12:31:33 +02:00
Daniel Rodriguez 1b8f9a613e Merge branch 'ent-9143-implementar-sistema-de-identificacion-de-satelite-para-descarga-del-key' into 'develop' 
Ent 9143 implementar sistema de identificacion de satelite para descarga del key

See merge request artica/pandorafms!5120
 2022-09-29 09:58:45 +00:00
Daniel Maya c650e7df6c #9143 Fixed empty license encryption key 2022-09-29 11:46:29 +02:00
artica 2855e6ac48 Auto-updated build strings. 2022-09-29 01:00:21 +02:00
José González a4be805ba4 Fix 2022-09-29 00:24:31 +02:00
Daniel Rodriguez 969dd19c4d Merge branch 'ent-fix-goliat-lwp-get-content' into 'develop' 
fix GoliatLWP's get_content

See merge request artica/pandorafms!5066
 2022-09-28 14:35:16 +00:00
José González f8efbc5fce Fixed issue with module name 2022-09-28 16:29:18 +02:00
Diego Muñoz-Reja 9aa1d4d82f Merge branch 'ent-9395-14081-Politicas-no-aplican-a-grupos-secundarios' into 'develop' 
removed mr

See merge request artica/pandorafms!5150
 2022-09-28 14:02:06 +00:00
alejandro.campos@artica.es 4dd0075b72 removed mr 2022-09-28 15:53:44 +02:00
Jimmy Olano 3ec710a62f Merge branch 'ent-9229-revisar-comportamiento-de-widgets-con-elementos-eliminados' into 'develop' 
fixed widget dashboards no exist item pandora_enterprise#9229

pandora_enterprise#9229

See merge request artica/pandorafms!5035
 2022-09-28 00:55:09 +00:00
artica dde27c12b1 Auto-updated build strings. 2022-09-28 01:00:20 +02:00
Diego Muñoz-Reja 099bfe2e61 Merge branch 'ent-9395-14081-Politicas-no-aplican-a-grupos-secundarios' into 'develop' 
make policy group application optional

See merge request artica/pandorafms!5138
 2022-09-27 16:16:36 +00:00
Alejandro Campos b11839dde5 Merge branch 'develop' into 'ent-9395-14081-Politicas-no-aplican-a-grupos-secundarios' 
# Conflicts:
#   pandora_console/extras/mr/57.sql
 2022-09-27 15:24:28 +00:00
alejandro.campos@artica.es 9c7e70c7de changes to mr 2022-09-27 17:19:10 +02:00
Diego Muñoz-Reja 35ee6936d6 Merge branch 'ent-9124-paradas-planificadas-no-se-borran-de-db' into 'develop' 
Delete old data from tplanned_downtime.

See merge request artica/pandorafms!5091
 2022-09-27 14:11:39 +00:00
Jimmy Olano 09e934395f Merge branch 'ent-9456-giss-errores-en-la-paginacion-vista-alertas-metaconsola' into 'develop' 
Fix alerts list pagination on meta

Ref: pandora_enterprise#9456

See merge request artica/pandorafms!5095
 2022-09-27 14:10:47 +00:00
Daniel Rodriguez c10f020b1b Merge branch 'ent-7146-parametros-para-el-control-de-ficheros-de-buffer-xml' into 'develop' 
Add support for temporal_max_size and temporal_max_files.

See merge request artica/pandorafms!5110
 2022-09-27 14:02:48 +00:00
Jimmy Olano 84d9b272c3 Merge branch 'ent-8217-Comando-Accion-de-alerta-para-enviar-informes' into 'develop' 
implemented alert commands and actions to send report by email

Ref pandora_enterprise#8217

See merge request artica/pandorafms!5104
 2022-09-27 12:26:24 +00:00
Daniel Rodriguez 5047f8afb9 Merge branch 'ent-8659-mostrar-nombre-completo-del-usuario-para-el-owner-de-un-evento' into 'develop' 
Ent 8659 mostrar nombre completo del usuario para el owner de un evento

See merge request artica/pandorafms!5114
 2022-09-27 10:50:17 +00:00
Daniel Rodriguez 5d0a40f790 Merge branch 'ent-8359-casque-de-web-server-cuando-no-hay-memoria' into 'develop' 
Improved error detection when calling curl.

See merge request artica/pandorafms!5146
 2022-09-27 10:49:41 +00:00
José González 1ae6267acc Fix issue with agent_alias 2022-09-27 11:14:18 +02:00
artica fa8386194c Auto-updated build strings. 2022-09-27 01:00:21 +02:00
Diego Muñoz-Reja 10d97c8cfa Merge branch 'ent-9420-eventos-agrupados-no-muestran-estado-del-ultimo-elemento' into 'develop' 
fixed group by order event_get_all pandora_enterprise#9420

See merge request artica/pandorafms!5106
 2022-09-26 15:16:15 +00:00
Diego Muñoz-Reja 4fba7077ec Merge branch 'ent-9255-error-en-notificacion-consola-php-8-y-mysql-8' into 'develop' 
Ent 9255 error en notificacion consola php 8 y mysql 8

See merge request artica/pandorafms!5081
 2022-09-26 13:07:50 +00:00
Diego Muñoz-Reja aea77db9e9 Merge branch 'ent-7827-Control-de-acceso-a-la-consola-por-IP' into 'develop' 
Ent 7827 control de acceso a la consola por ip

See merge request artica/pandorafms!5098
 2022-09-26 11:03:52 +00:00
Daniel Maya 67c8a945bf resolved conflict 2022-09-26 11:08:18 +02:00
Daniel Rodriguez e5cd925925 Merge branch 'ent-9167-cepsa-error-modulo-plugin-server-masivas-y-actualizar-modulo' into 'develop' 
Ent 9167 cepsa error modulo plugin server masivas y actualizar modulo

See merge request artica/pandorafms!5101
 2022-09-26 08:41:26 +00:00
Calvo 2a4176085f Fix alerts meta datatables 2022-09-26 09:22:19 +02:00
artica 4db9df6df5 Auto-updated build strings. 2022-09-26 01:00:17 +02:00
artica d7b4a8f248 Auto-updated build strings. 2022-09-25 01:00:16 +02:00
artica 0ce954af56 Auto-updated build strings. 2022-09-24 01:00:20 +02:00
Daniel Rodriguez 30edbc81ad Merge branch 'ent-8934-Macros-para-fechas-en-custom-SQL' into 'develop' 
Added new macros

See merge request artica/pandorafms!5103
 2022-09-23 13:03:48 +00:00
alejandro.campos@artica.es 520a820625 Merge branch 'ent-8217-Comando-Accion-de-alerta-para-enviar-informes' of brutus.artica.es:artica/pandorafms into ent-8217-Comando-Accion-de-alerta-para-enviar-informes 2022-09-23 13:00:40 +02:00
alejandro.campos@artica.es 23bb4d0750 minor fix 2022-09-23 13:00:28 +02:00
José González e14240cca7 Merge branch 'ent-9119-Metaconsola-Error-paginacion-vista-monitores' of https://brutus.artica.es:8081/artica/pandorafms into ent-9119-Metaconsola-Error-paginacion-vista-monitores 2022-09-23 12:55:25 +02:00
José González 09c6c5a0f9 Fix 2022-09-23 12:54:51 +02:00
Ramon Novoa 6c506e9dd0 Improved error detection when calling curl. 
Ref. pandora_enterprise#8359.
 2022-09-23 11:36:44 +02:00
alejandro.campos@artica.es 8918682f67 minor change 2022-09-23 09:58:37 +02:00
alejandro.campos@artica.es 3bf2dd1b5c make policy group application optional 2022-09-23 09:50:38 +02:00
Alejandro Campos 9301b46f41 Merge branch 'develop' into 'ent-8217-Comando-Accion-de-alerta-para-enviar-informes' 
# Conflicts:
#   pandora_console/extras/mr/57.sql
 2022-09-23 06:41:57 +00:00