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

28258 Commits

Author SHA1 Message Date
Daniel Rodriguez 76ead757b0 Merge branch 'ent-7689-busqueda-de-usuarios-con-paginacion' into 'develop' 
fixed error with pagination user filter

See merge request artica/pandorafms!4209
 2021-08-23 10:48:46 +00:00
fbsanchez 4ff6b8a1bb Re-enabled user management in MC while not in centralised environment 2021-08-23 12:29:17 +02:00
fbsanchez f0c68a0f54 Ensure latest slash in console url 2021-08-23 12:17:03 +02:00
Daniel Rodriguez 8a7dbf653b Merge branch 'ent-7909-campos-Data-no-muestran-valores-String' into 'develop' 
Fix issues with string values

Closes pandora_enterprise#7909

See merge request artica/pandorafms!4366
 2021-08-23 08:37:58 +00:00
José González 9c508e05c1 Fix visual issue with position 2021-08-23 10:04:34 +02:00
marcos 4d270a3559 set first option select2 all to none if not condition is enabled 2021-08-23 09:52:42 +02:00
marcos 61409b72b4 Merge remote-tracking branch 'origin/develop' into ent-6885-11172-añadir-opcion-de-nor-en-monitor-detail 2021-08-23 08:52:17 +02:00
marcos 244d7f6c8b solved conflicts 2021-08-23 08:25:12 +02:00
artica e3619915cc Auto-updated build strings. 2021-08-23 01:00:21 +02:00
artica a8ae80f8a6 Auto-updated build strings. 2021-08-22 01:00:15 +02:00
artica 0f34554ba6 Auto-updated build strings. 2021-08-21 01:00:32 +02:00
José González 2f0681c29b Fix issues with string values 2021-08-20 14:11:03 +02:00
Daniel Rodriguez 8b9cb51d1e Merge branch 'ent-7884-metaconsola-no-se-pueden-crear-items-en-consola-visual' into 'develop' 
Fix issue with redeclaration of functions_metaconsole.php

Closes pandora_enterprise#7884

See merge request artica/pandorafms!4362
 2021-08-20 09:13:38 +00:00
artica 7e71b6537f Auto-updated build strings. 2021-08-20 01:00:19 +02:00
Jose Gonzalez 7c89b271ac Merge remote-tracking branch 'origin' into ent-7666-boxes-relations-nodo-mapa-red-no-funcionan 2021-08-19 14:31:14 +02:00
Daniel Maya 9488ce873b #7887 Fixed xss in massive modules 2021-08-19 12:57:16 +02:00
Rafael Ameijeiras 0abf39cadc adding open stack plugin 2021-08-19 11:56:41 +02:00
Daniel Rodriguez ffa2aa717b Merge branch 'ent-7908-error-visual-grave-menu-principal-consola' into 'develop' 
Fix issue with initial visual problems

See merge request artica/pandorafms!4363
 2021-08-19 08:21:08 +00:00
José González b515bfe443 Fix merge 2021-08-19 09:39:13 +02:00
Jose Gonzalez 20c0d87165 Fix issue with initial visual problems 2021-08-19 08:18:06 +02:00
artica 38c044f2ae Auto-updated build strings. 2021-08-19 01:00:34 +02:00
Jose Gonzalez 1bba211086 Fix issue with redeclaration of functions_metaconsole.php 2021-08-18 15:07:34 +02:00
Daniel Maya fc4074b70b Fixed xss vulnerability 2021-08-18 13:57:47 +02:00
artica a1942147e4 Auto-updated build strings. 2021-08-18 01:00:49 +02:00
Daniel Rodriguez 8621d8cbb8 Merge branch 'ent-7824-problemas-vista-mobile' into 'develop' 
Fixed issues

Closes pandora_enterprise#7824

See merge request artica/pandorafms!4315
 2021-08-17 12:20:18 +00:00
Daniel Rodriguez fe30b9c785 Merge branch 'ent-7445-Fallo-al-almacenar-dato-string-en-tevento-dentro-de-un-evento-Alert-fired' into 'develop' 
implemented capacity to handle string data for event data

See merge request artica/pandorafms!4184
 2021-08-17 12:19:54 +00:00
Daniel Rodriguez 3cce0dbe4d Merge branch 'ent-fix-freebsd-daemon-launcher' into 'develop' 
Added PATH configuration.

See merge request artica/pandorafms!4358
 2021-08-17 09:05:35 +00:00
Junichi Satoh 54830f5eea Added PATH configuration. 2021-08-17 16:18:04 +09:00
Daniel Rodriguez cf963992b0 Merge branch 'ent-7876-Datos-webserver-String-no-se-visualizan-en-botón-101' into 'develop' 
Ent 7876 datos webserver string no se visualizan en botón 101

See merge request artica/pandorafms!4341
 2021-08-17 07:10:04 +00:00
Daniel Rodriguez 44dcdb03bc Merge branch 'ent-7542-11882-Buscador-de-acciones-no-funciona' into 'develop' 
Ent 7542 11882 buscador de acciones no funciona

See merge request artica/pandorafms!4343
 2021-08-17 07:09:26 +00:00
Daniel Rodriguez af6319eeb4 Merge branch 'ent-7531-menu-lateral-no-se-oculta-correctamente' into 'develop' 
Clean code and fix issue with lateral main menu

Closes pandora_enterprise#7531

See merge request artica/pandorafms!4213
 2021-08-17 07:08:34 +00:00
Daniel Rodriguez e75db62389 Merge branch 'ent-7124-vulnerabilidad-en-libreria-jquery' into 'develop' 
Upgraded jquery to 3.6.0, without npm

See merge request artica/pandorafms!4351
 2021-08-17 06:39:49 +00:00
artica 9f65e8deb0 Auto-updated build strings. 2021-08-17 01:00:44 +02:00
José González 1aa788bd83 Fix issue with colours in mobile view 2021-08-16 16:32:20 +02:00
José González 596a2d63f9 Merge remote-tracking branch 'origin' into ent-7824-problemas-vista-mobile 2021-08-16 11:33:40 +02:00
José González baa49edd24 Merge branch 'develop' into 'ent-7666-boxes-relations-nodo-mapa-red-no-funcionan' 
# Conflicts:
#   pandora_console/include/functions_html.php
 2021-08-16 09:18:54 +00:00
alejandro.campos@artica.es 21e15752cf fixed select2 search in action update 2021-08-16 11:04:52 +02:00
José González 66ebe2ebf4 Merge branch 'develop' into 'ent-7531-menu-lateral-no-se-oculta-correctamente' 
# Conflicts:
#   pandora_console/index.php
 2021-08-16 08:12:40 +00:00
artica 18698827a6 Auto-updated build strings. 2021-08-16 01:00:21 +02:00
artica 4e17c0ecf4 Auto-updated build strings. 2021-08-15 01:00:22 +02:00
artica ce2c4afbb5 Auto-updated build strings. 2021-08-14 01:00:24 +02:00
artica 6a471546d5 Auto-updated build strings. 2021-08-13 01:00:30 +02:00
fbsanchez 486abde989 tree event graphs 2021-08-12 14:24:16 +02:00
fbsanchez c0b64735a5 Merge remote-tracking branch 'origin/develop' into ent-7124-vulnerabilidad-en-libreria-jquery 2021-08-12 13:32:30 +02:00
Manuel Montes 10f260c639 Merge branch 'ent-7894-12305-widget-agent-module-no-funciona-bien-dashboards' into 'develop' 
Fix in style table with images limited to dashboard agent_module widget

See merge request artica/pandorafms!4352
 2021-08-12 10:44:04 +00:00
fbsanchez 3109975e7d Notifications in MC 2021-08-12 12:01:24 +02:00
fbsanchez 93636aef96 Avoid warning phpcs 2021-08-12 12:00:53 +02:00
fbsanchez 6c8d002b12 Fix in style table with images limited to dashboard agent_module widget 2021-08-12 10:38:44 +02:00
fbsanchez 034e921e35 Upgraded jquery to 3.6.0, without npm 2021-08-12 09:30:43 +02:00
artica 3bb4c2ac09 Auto-updated build strings. 2021-08-12 01:00:45 +02:00