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

22351 Commits

Author SHA1 Message Date
marcos 24a66f0173 updates 2021-08-24 13:30:50 +02:00
José González a930dc1d8a Merge branch 'ent-7666-boxes-relations-nodo-mapa-red-no-funcionan' of https://brutus.artica.es:8081/artica/pandorafms into ent-7666-boxes-relations-nodo-mapa-red-no-funcionan 2021-08-24 11:52:51 +02:00
José González 64982ee292 Fix issues with select inputs 2021-08-24 11:52:37 +02:00
Daniel Rodriguez 4d5926e427 Merge branch 'ent-7612-implementar-sistema-de-mensajeria-en-la-meta' into 'develop' 
Ent 7612 implementar sistema de mensajeria en la meta

See merge request artica/pandorafms!4353
 2021-08-24 08:13:02 +00:00
artica 5163f2831d Auto-updated build strings. 2021-08-24 01:00:38 +02:00
fbsanchez 9bdbad17db Merge remote-tracking branch 'origin/develop' into ent-7786-agentes-asignados-a-politicas-en-metaconsola 2021-08-23 15:40:23 +02:00
José González 6358f3fc9b Fixed issues with files upload 2021-08-23 15:35:47 +02:00
Daniel Rodriguez 3dc6db320e Merge branch 'ent-7725-bug-en-creacion-de-itmes-sla' into 'develop' 
Fixed SLA report items creating empty extra item

See merge request artica/pandorafms!4253
 2021-08-23 10:50:10 +00:00
Daniel Rodriguez 9cf9d99e7b Merge branch 'ent-7908-BIS-Error-visual-menu-principal-consola' into 'develop' 
Fix visual issue with position

Closes pandora_enterprise#7908

See merge request artica/pandorafms!4367
 2021-08-23 10:49:39 +00:00
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
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
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 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
Daniel Rodriguez 28905d2901 Merge branch 'ent-7894-12305-widget-agent-module-no-funciona-bien-dashboards' into 'develop' 
Retro-compability

See merge request artica/pandorafms!4350
 2021-08-11 12:59:33 +00:00
Daniel Rodriguez 03306454e0 Merge branch 'ent-7883-aplicacion-de-parches-offline-en-la-open' into 'develop' 
Allowed UMC offline for opensource installations, fixed issue while accessing settings

See merge request artica/pandorafms!4349
 2021-08-11 12:20:32 +00:00
fbsanchez 3662d8b8a0 Added offline entry to menu in community ed 2021-08-11 14:12:49 +02:00
fbsanchez 3afeb47676 Width-height auto for images in tables - agent_module widget improvement 2021-08-11 14:09:18 +02:00
fbsanchez 4595b1ec11 Retro-compability 2021-08-11 14:02:56 +02:00
Daniel Rodriguez d2cc7d2f31 Merge branch 'ent-7861-fallo-umc-cuando-hay-db-historico' into 'develop' 
Fix searchpath for MR while updating

See merge request artica/pandorafms!4334
 2021-08-11 11:16:06 +00:00
fbsanchez c69c326bc5 Warning to be careful with offline patches 2021-08-11 11:34:29 +02:00
fbsanchez 97afb02ba6 Allowed UMC offline for opensource installations, fixed issue while accessing settings 2021-08-11 11:28:33 +02:00
Daniel Rodriguez 9b684ab9ef Merge branch 'ent-7568-11898-Problemas-de-configuración-consolas-visuales' into 'develop' 
Ent 7568 11898 problemas de configuración consolas visuales

See merge request artica/pandorafms!4278
 2021-08-11 08:33:24 +00:00
fbsanchez cf976f9622 Merge remote-tracking branch 'origin/develop' into ent-7861-fallo-umc-cuando-hay-db-historico 
Conflicts:
	pandora_console/godmode/um_client/index.php
 2021-08-11 09:56:02 +02:00
fbsanchez d492b055da Merge remote-tracking branch 'origin/develop' into ent-7786-agentes-asignados-a-politicas-en-metaconsola 2021-08-11 09:25:26 +02:00
Daniel Rodriguez 089b981f7f Merge branch 'ent-7397-Bug-en-item-module-graph-de-cv' into 'develop' 
fixed several issues in item module graph of visual consoles

See merge request artica/pandorafms!4279
 2021-08-11 07:16:19 +00:00
Daniel Rodriguez 7673e40613 Merge branch 'ent-7737-Pandora-recien-instalado-mensaje-de-advertencia-de-fuente-por-defecto-no-definida' into 'develop' 
fixed font reference

See merge request artica/pandorafms!4238
 2021-08-11 07:12:13 +00:00
Daniel Rodriguez 3f4e0ee0f4 Merge branch 'ent-7692-selector-de-cambio-de-propietario-muy-estrecho-en-modal-de-eventos-metaconsola' into 'develop' 
more size for select owner modal events

See merge request artica/pandorafms!4222
 2021-08-11 07:11:18 +00:00
Daniel Rodriguez f8e9bd38ec Merge branch 'ent-7633-selector-de-grupos-en-el-graph-builder-de-las-custom-graphs-ocupa-todo-el-ancho-de-la-pantalla' into 'develop' 
colspan 1 to group selector custom graph

See merge request artica/pandorafms!4223
 2021-08-11 07:10:50 +00:00
artica 568bdfb5c0 Auto-updated build strings. 2021-08-11 01:00:19 +02:00
Daniel Rodriguez ac23d187a1 Merge branch 'ent-7589-black-theme-y-edicion-de-usuario' into 'develop' 
fixed visual error

See merge request artica/pandorafms!4212
 2021-08-10 12:23:42 +00:00
Daniel Rodriguez 3e1208d5b2 Merge branch 'ent-7443-Metaconsola-Nodo-Dashboard-Top-N-events-de-todos-ninguno-saca-informacion' into 'develop' 
fixed top n widgets in meta

See merge request artica/pandorafms!4255
 2021-08-10 12:22:46 +00:00
Daniel Rodriguez 3ed53fbbea Merge branch 'ent-7642-error-de-sintaxis-sql-horizontal' into 'develop' 
Solve typo

Closes pandora_enterprise#7642

See merge request artica/pandorafms!4216
 2021-08-10 12:22:09 +00:00
Daniel Rodriguez a936deb255 Merge branch 'ent-7489-11802-iconos-desfasados-en-dashboard' into 'develop' 
fixed error with name on agent module view

See merge request artica/pandorafms!4257
 2021-08-10 12:20:39 +00:00
Daniel Rodriguez 00ed8233d0 Merge branch 'ent-7755-graficas-adjuntas-tienen-fuentes-muy-pequeñas' into 'develop' 
set default font size on graph modules when is send in mails

See merge request artica/pandorafms!4264
 2021-08-10 12:19:54 +00:00
Daniel Rodriguez b3336cdc4f Merge branch 'ent-7563-bug-carga-dinamica-icono-grupos-creacion-agente' into 'develop' 
Fixed group icon on agent creation

See merge request artica/pandorafms!4145
 2021-08-10 07:00:56 +00:00
Daniel Rodriguez cb498a9fe9 Merge branch 'ent-7441-Tree-View-Widget-no-coge-los-no-inicializados' into 'develop' 
Ent 7441 tree view widget no coge los no inicializados

See merge request artica/pandorafms!4277
 2021-08-10 07:00:12 +00:00
Daniel Rodriguez dca52dca6a Merge branch 'ent-7702-vista-de-agentes-sin-color-en-grafica-circulo-estado-agente' into 'develop' 
Fixes in pie coauth: daniel

See merge request artica/pandorafms!4210
 2021-08-10 06:59:29 +00:00
Daniel Rodriguez 9f754efc05 Merge branch 'ent-7648-Entities-en-nombre-de-ticket-de-Integria-creado-en-Pandora' into 'develop' 
fixed entities

See merge request artica/pandorafms!4207
 2021-08-10 06:58:32 +00:00
artica 2951bf2871 Auto-updated build strings. 2021-08-10 01:00:12 +02:00
Daniel Rodriguez 77d00fd9e2 Merge branch 'ent-7647-vulnerabilidad-xss-en.nombre.filtro-eventos' into 'develop' 
Fixedd XSS on load filter event name

See merge request artica/pandorafms!4174
 2021-08-09 09:00:15 +00:00
Daniel Rodriguez 46b17e5156 Merge branch 'ent-7657-Vulnerabilidad-xss-en-nombre-de-modulos' into 'develop' 
fixed xss vulnerability

See merge request artica/pandorafms!4196
 2021-08-09 08:59:44 +00:00
Daniel Maya 7c5b2c8f2c resolved conflict 2021-08-09 09:55:11 +02:00
Alejandro Campos ff93169049 Merge branch 'develop' into 'ent-7445-Fallo-al-almacenar-dato-string-en-tevento-dentro-de-un-evento-Alert-fired' 
# Conflicts:
#   pandora_console/extras/mr/48.sql
 2021-08-09 06:45:46 +00:00
artica 8b36a96867 Auto-updated build strings. 2021-08-09 01:00:08 +02:00
artica 7a36b18fc0 Auto-updated build strings. 2021-08-08 01:00:11 +02:00
artica 9ea746991b Auto-updated build strings. 2021-08-07 01:00:19 +02:00
Daniel Rodriguez 2224709814 Merge branch 'ent-7543-11772-command-snapshot-view-fondo-blanco-en-tema-oscuro' into 'develop' 
se command sanpshot black theme

See merge request artica/pandorafms!4232
 2021-08-06 12:57:05 +00:00
Daniel Rodriguez 7ae7f8ba2d Merge branch 'ent-7816-12139-no-devuelve-eventos-en-db-historico-informe-eventos-desde-metaconsola' into 'develop' 
Metaconsole shows historical events on reports

See merge request artica/pandorafms!4328
 2021-08-06 12:54:29 +00:00
Daniel Rodriguez 0c4b5619f5 Merge branch 'ent-7738-Pandora-recien-instalado-via-cloud-enlaces-a-mensajes-del-sistema-son-url-invalida' into 'develop' 
set urls as macros in console supervisor

See merge request artica/pandorafms!4234
 2021-08-06 12:53:54 +00:00
Daniel Rodriguez 604ef4bc89 Merge branch 'ent-7442-Metaconsole-Dashboard-WUX-Transaction-Stats-no-encuentra-trans' into 'develop' 
Ent 7442 metaconsole dashboard wux transaction stats no encuentra trans

Closes pandora_enterprise#7442

See merge request artica/pandorafms!4295
 2021-08-06 12:53:06 +00:00
Daniel Rodriguez cd500fe67b Merge branch 'ent-7857-12238-No-se-visualiza-Odómetro-en-Dashboard' into 'develop' 
Ent 7857 12238 no se visualiza odómetro en dashboard

See merge request artica/pandorafms!4342
 2021-08-06 08:31:29 +00:00
Daniel Rodriguez 01dcfbd919 Merge branch 'ent-7881-Alertas-SNMP-en-v756-rotas' into 'develop' 
Ent 7881 alertas snmp en v756 rotas

See merge request artica/pandorafms!4344
 2021-08-06 06:48:43 +00:00
artica 14688908e2 Auto-updated build strings. 2021-08-06 01:00:21 +02:00
Daniel Maya a5f9e74b50 #7881 Fixed snmp alert 2021-08-05 15:53:44 +02:00
Daniel Rodriguez f93b7fcd7a Merge branch 'ent-7817-ventana-de-registro-pequena' into 'develop' 
fixed licence modal size

See merge request artica/pandorafms!4308
 2021-08-05 11:59:01 +00:00
Daniel Rodriguez e623fa1822 Merge branch 'ent-7854-warning-por-memoria-php-umc-cuando-vale-1' into 'develop' 
Minor fix in memory detection UMC

See merge request artica/pandorafms!4327
 2021-08-05 11:51:39 +00:00
Daniel Rodriguez 45abf89e6b Merge branch 'ent-7667-12011-bug-de-mostrado-de-comentarios-en-eventos-con-filtrado' into 'develop' 
fixed minnor error when show event comment with filters

See merge request artica/pandorafms!4241
 2021-08-05 11:08:41 +00:00
Daniel Rodriguez fa2cec2878 Merge branch 'ent-7387-fallos-netflow-live-view' into 'develop' 
Fixed issues with views in Netflow live view

Closes pandora_enterprise#7387

See merge request artica/pandorafms!4240
 2021-08-05 11:08:04 +00:00