tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-08-19 00:39:38 +02:00
Code Issues Packages Projects Releases Wiki Activity
28,526 Commits 34 Branches 30 Tags
Commit Graph

15166 Commits

Author SHA1 Message Date
Jose Gonzalez
18cdc49b88 bad intentions directory creation avoided and solved some issues 2021-08-25 17:13:07 +02:00
Daniel Rodriguez
d701e50b9f Merge branch 'ent-7684-mostrar-campo-con-el-nombre-de-nodo-que-viene-en-metaconsola-en-la-vista-de-detalle-del-evento' into 'develop' 
add node name on event details

See merge request artica/pandorafms!4274
 2021-08-25 13:01:02 +00:00
Daniel Rodriguez
22587a0dde Merge branch 'ent-7036-11346-Introducir-el-campo-de-IP-del-agente-en-la-vista-de-eventos' into 'develop' 
Ent 7036 11346 introducir el campo de ip del agente en la vista de eventos

See merge request artica/pandorafms!4275
 2021-08-25 13:00:42 +00:00
Daniel Rodriguez
e6c5d1a6ef Merge branch 'ent-7392-aviso-configuracion-cron' into 'develop' 
Change time check for cron

Closes pandora_enterprise#7392

See merge request artica/pandorafms!4296
 2021-08-25 12:57:40 +00:00
fbsanchez
8b941b4d30 Merge remote-tracking branch 'origin/develop' into ent-7786-agentes-asignados-a-politicas-en-metaconsola 2021-08-25 11:13:35 +02:00
José González
8982e3d49b Fixed typo 2021-08-25 10:38:22 +02:00
José González
357b47a6d5 Merge remote-tracking branch 'origin' into ent-7666-boxes-relations-nodo-mapa-red-no-funcionan 2021-08-25 10:27:56 +02:00
artica
f63fa5ab96 Auto-updated build strings. 2021-08-25 01:00:39 +02:00
Jose Gonzalez
1bbcc47344 Merge remote-tracking branch 'origin' into ent-7911-errores-file-manager 2021-08-24 16:17:33 +02:00
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
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
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
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
alejandro.campos@artica.es
c07a112f4b migrate histrogram report items 2021-08-19 16:23:52 +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 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 Maya
0fd076810d Added services view widget 2 2021-08-17 13:32:54 +02: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
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
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
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
alejandro.campos@artica.es
54ae7e5783 modified availability report 2021-08-16 09:43:11 +02: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
Daniel Maya
d70752baa1 Added services view widget 2021-08-13 14:12:21 +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