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

27011 Commits

Author SHA1 Message Date
Daniel Barbero Martin 8e57e1645c fixed minor error 2021-03-26 10:34:07 +01:00
Daniel Rodriguez b9f0ac8239 Merge branch 'ent-7205-fallos-visuales-en-monitoring' into 'develop' 
fixed visual error

See merge request artica/pandorafms!3955
 2021-03-26 09:32:30 +00:00
Marcos Alconada 3d350ba481 fixed visual error 2021-03-26 09:32:30 +00:00
Daniel Rodriguez 17c923a68b Merge branch 'ent-7204-error-visual-en-agents-module' into 'develop' 
fixed visual error

See merge request artica/pandorafms!3954
 2021-03-26 09:32:08 +00:00
Daniel Rodriguez 20bc1fdaec Merge branch 'ent-7213-Barras-de-desplazamiento-en-consolas-visuales' into 'develop' 
fixed minor error

See merge request artica/pandorafms!3956
 2021-03-26 08:26:26 +00:00
Daniel Barbero Martin 9dd7ee7cbc fixed minor error 2021-03-26 09:15:05 +01:00
Junichi Satoh d4b8916c54 Fixed following problems. 
- alert actions cannot be copied/removed by any users
- alert actions cannot be modified by users with 'LM' even if alerts belong to the same group of users.

And users with 'LM' can now copy alert actions/templates in All group to the group to which the user belongs.
 2021-03-26 17:11:10 +09:00
artica c10c1b09cf Auto-updated build strings. 2021-03-26 01:00:18 +01:00
Daniel Rodriguez 6413f6d551 Merge branch 'ent-4755-base-de-datos-historico-revision' into 'develop' 
DBMainainer, fixed Websockets library placement

See merge request artica/pandorafms!3797
 2021-03-25 14:33:31 +00:00
Daniel Rodriguez 26577095d7 Merge branch 'ent-7193-submenu-ocultado-en-arbol-de-discovery' into 'develop' 
fixed visual error

See merge request artica/pandorafms!3939
 2021-03-25 14:08:35 +00:00
marcos b8a72f0583 fixed visual error 2021-03-25 14:42:34 +01:00
marcos ec4f23e502 fixed visual error 2021-03-25 14:36:51 +01:00
marcos b7f845a64d fixed visual error 2021-03-25 14:27:41 +01:00
fbsanchez 7b7ef3a757 minor improvement (err. messages) 2021-03-25 14:25:09 +01:00
marcos a6b9998bbe fixed visual error 2021-03-25 13:42:21 +01:00
Calvo d9d98fe1e3 Fixed mixed response from event datatables 2021-03-25 13:20:30 +01:00
Daniel Rodriguez 29e7e3c844 Merge branch 'ent-7196-tabla-de-list-sla-no-se-muestra' into 'develop' 
fixed visual error

See merge request artica/pandorafms!3946
 2021-03-25 11:55:33 +00:00
Daniel Rodriguez c4b6f709c9 Merge branch 'ent-6979-fallo-discovery-contraseñas-caracteres-especiales' into 'develop' 
Fix issue

Closes pandora_enterprise#6979

See merge request artica/pandorafms!3821
 2021-03-25 11:54:45 +00:00
marcos f5ceb2384e fixed visual error 2021-03-25 12:35:40 +01:00
marcos 823bf52372 fixed visual error 2021-03-25 11:49:32 +01:00
Daniel Rodriguez 1d374fca46 Merge branch 'ent-2561-llamadas-api-para-modulos-de-politicas' into 'develop' 
minor changes

See merge request artica/pandorafms!3779
 2021-03-25 09:57:53 +00:00
Daniel Rodriguez f99e4763e2 Merge branch 'ent-7197-estilos-log-viewer' into 'develop' 
Fix some documentary issues

Closes pandora_enterprise#7197

See merge request artica/pandorafms!3948
 2021-03-25 09:53:41 +00:00
Daniel Rodriguez effda26dc6 Merge branch 'ent-7201-no-se-muestra-el-modal-de-detalle-de-modulos-en-la-vista-de-agent-detail' into 'develop' 
resolved error with modal module detail on agent detail

See merge request artica/pandorafms!3950
 2021-03-25 09:51:43 +00:00
fbsanchez fdc4133eaa Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 2021-03-25 10:20:02 +01:00
artica 1934c04388 Auto-updated build strings. 2021-03-25 01:00:21 +01:00
fbsanchez f046069de1 old-school style setup 2021-03-24 17:49:42 +01:00
fbsanchez 12767683dc minor fixes 2021-03-24 16:25:27 +01:00
Daniel Rodriguez 8b12576c62 Merge branch 'ent-6850-quitar-nta' into 'develop' 
Ent 6850 quitar nta

See merge request artica/pandorafms!3772
 2021-03-24 15:16:13 +00:00
Daniel Maya 79914082e9 Ent 6850 quitar nta 2021-03-24 15:16:13 +00:00
fbsanchez ac1c3398fe Merge remote-tracking branch 'origin/develop' into ent-2561-llamadas-api-para-modulos-de-politicas 2021-03-24 16:05:08 +01:00
marcos b4cc075870 resolved error with modal module detail on agent detail 2021-03-24 14:10:46 +01:00
fbsanchez d312f764ed Hack to use old functions from PandoraDB 2021-03-24 13:43:14 +01:00
fbsanchez 0179e89740 Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 2021-03-24 13:16:54 +01:00
marcos eaed8aa09a fixed visual error 2021-03-24 13:10:29 +01:00
Daniel Rodriguez 9f22c061f5 Merge branch 'ent-5929-revision-general-logstash' into 'develop' 
Deleted logstash references

Closes pandora_enterprise#5929

See merge request artica/pandorafms!3729
 2021-03-24 11:57:47 +00:00
Jose Gonzalez af98637680 Fix some documentary issues 2021-03-24 12:45:25 +01:00
Daniel Rodriguez ce2f4ec7cc Merge branch 'ent-7112-bugs-consola-visual-y-dashboards' into 'develop' 
Command center

See merge request artica/pandorafms!3887
 2021-03-24 11:43:52 +00:00
daniel 774fc9ebe5 Command center 2021-03-24 11:43:51 +00:00
fbsanchez 6cd393edef Style fix 2021-03-24 12:33:36 +01:00
Daniel Rodriguez 22492f39a8 Merge branch 'ent-7010-nexcon-mejoras-widget-de-eventos' into 'develop' 
Event widget and some notices fixed

See merge request artica/pandorafms!3828
 2021-03-24 11:28:39 +00:00
fbsanchez 9c693e309c AWS.S3 monitoring RC1 2021-03-24 11:52:47 +01:00
fbsanchez c3232b0f2a Merge remote-tracking branch 'origin/develop' into ent-7010-nexcon-mejoras-widget-de-eventos 
Conflicts:
	pandora_console/include/class/ConsoleSupervisor.php
 2021-03-24 09:55:31 +01:00
artica 00375710c2 Auto-updated build strings. 2021-03-24 01:00:25 +01:00
José González 561060cdda Reverted change over mysqldriver 2021-03-23 20:37:28 +00:00
Daniel Rodriguez 2597c2c7fc Merge branch 'ent-7188-bug-visual-en-tactical-view-metaconsola' into 'develop' 
fixed visual error

See merge request artica/pandorafms!3940
 2021-03-23 15:56:02 +00:00
Daniel Rodriguez 61ae461ffe Merge branch 'ent-6660-vistas-de-servicios-por-nombre-o-descripcion' into 'develop' 
add tooltip service name

See merge request artica/pandorafms!3783
 2021-03-23 15:55:28 +00:00
Marcos Alconada 302df228cc add tooltip service name 2021-03-23 15:55:28 +00:00
Jose Gonzalez 910154389e Fix 2021-03-23 16:15:57 +01:00
marcos 90c825888a fixed visual error 2021-03-23 15:12:57 +01:00
Daniel Rodriguez fbd41b086d Merge branch 'ent-7102-ventana-de-refresco-visual-console-no-desaparece' into 'develop' 
Fixed refresh auto hide on visual console

See merge request artica/pandorafms!3883
 2021-03-23 12:04:28 +00:00