25445 Commits

Author SHA1 Message Date
Daniel Barbero Martin
9b81da193b fix charts 2020-10-28 12:50:15 +01:00
Daniel Rodriguez
5278a80d4c Merge branch 'ent-6512-error-en-acls-de-alertas' into 'develop'
Ent 6512 error en acls de alertas

See merge request artica/pandorafms!3538
2020-10-28 11:41:30 +01:00
Marcos Alconada
94cfd51501 Ent 6512 error en acls de alertas 2020-10-28 11:41:30 +01:00
Daniel Rodriguez
0a24fedb5a Merge branch 'ent-6606-mostrar-descripcion-de-servicios-en-vista-de-arbol' into 'develop'
Use service description instead of name in tree view

See merge request artica/pandorafms!3570
2020-10-28 11:19:49 +01:00
Daniel Rodriguez
fa9f4bca95 Merge branch 'ent-6580-bug-en-la-edicion-de-grupos-asignando-como-padre-a-si-mismo' into 'develop'
exclude branch from select_for_Groups given group_id

See merge request artica/pandorafms!3550
2020-10-28 11:19:05 +01:00
artica
288b81dcc4 Auto-updated build strings. 2020-10-28 01:00:18 +01:00
Daniel Rodriguez
b3e6ef58bd Merge branch 'ent-6641-Recon-task-no-admite-SNMP' into 'develop'
Snmp and WMI in recon task move open

See merge request artica/pandorafms!3579
2020-10-27 17:37:12 +01:00
fbsanchez
f744261821 minor fix 2020-10-27 16:03:35 +01:00
Daniel Rodriguez
8ea3a5a578 Merge branch 'ent-6604-Perdida-de-conexion-con-el-servidor-en-consolas-visuales-con-link-publico-y-autorefresco' into 'develop'
fixed connection check in public link of visual consoles

See merge request artica/pandorafms!3573
2020-10-27 15:58:13 +01:00
Daniel Rodriguez
e2abe65035 Merge branch 'ent-6413-check-secciones-wizards-no-funcionan' into 'develop'
Solved issue

See merge request artica/pandorafms!3554
2020-10-27 15:56:56 +01:00
Daniel Barbero Martin
2b2acefa31 Snmp and WMI in recon task move open 2020-10-27 15:02:05 +01:00
alejandro-campos
7c882d3723 fixed connection check 2020-10-27 12:53:54 +01:00
Jose Gonzalez
8ba92a683a Fix some errors 2020-10-27 07:51:30 +01:00
Jose Gonzalez
a9075f0068 Fix 2020-10-27 07:49:33 +01:00
artica
3b9558c7a0 Auto-updated build strings. 2020-10-27 01:00:21 +01:00
alejandro-campos
6ff11239e4 fixed connection check in public link of visual consoles 2020-10-26 14:44:05 +01:00
Kike
3287223b4d Use service description instead of name in tree view 2020-10-26 12:05:37 +01:00
artica
76324679ec Auto-updated build strings. 2020-10-26 01:00:14 +01:00
artica
89fc211e6f Auto-updated build strings. 2020-10-25 01:00:15 +02:00
artica
bd95c0a4f0 Auto-updated build strings. 2020-10-24 01:00:16 +02:00
artica
002509500c Auto-updated build strings. 2020-10-23 01:00:18 +02:00
fbsanchez
ef50b47269 avoid useless messages 2020-10-22 15:15:46 +02:00
Jose Gonzalez
f09e864569 Solved issue 2020-10-22 12:47:25 +02:00
fbsanchez
3220217ec8 exclude branch from select_for_Groups given group_id 2020-10-21 18:31:10 +02:00
artica
7bd7d190c5 Auto-updated build strings. 2020-10-21 01:02:12 +02:00
artica
fbccb4ac6b Auto-updated build strings. 2020-10-20 01:00:17 +02:00
artica
c560fa6125 Auto-updated build strings. 2020-10-18 01:00:15 +02:00
artica
880c20dcab Auto-updated build strings. 2020-10-17 01:00:17 +02:00
Rafael Ameijeiras
524c15ac51 Merge branch 'ent-6480-docker-pandoraopen-centos8' into 'develop'
Ent 6480 docker pandoraopen centos8

See merge request artica/pandorafms!3532
2020-10-16 10:28:59 +02:00
rafael
53babfb8f7 Merge 2020-10-16 10:26:46 +02:00
rafael
75cab7136b Adding Readme files 2020-10-16 10:20:07 +02:00
artica
dc41879a2c Auto-updated build strings. 2020-10-16 01:00:21 +02:00
Rafael Ameijeiras
63a24ad286 Merge branch 'ent-6480-docker-pandoraopen-centos8' into 'develop'
Adding dockerfiles for pandora stack centos 8 and percona

See merge request artica/pandorafms!3531
2020-10-15 18:48:29 +02:00
Rafael Ameijeiras
541c9ff1b4 Adding dockerfiles for pandora stack centos 8 and percona 2020-10-15 18:48:29 +02:00
rafael
5a48525ff3 Adding dockerfiles for pandora stack centos 8 and percona 2020-10-15 13:56:36 +02:00
artica
3a890dc8b8 Updated version and build strings. 2020-10-15 10:19:42 +02:00
artica
6aaa4802e5 Auto-updated build strings. 2020-10-15 01:00:18 +02:00
Daniel Rodriguez
609ec5de37 Merge branch 'ent-6472-graficas-con-phantomjs-y-saml' into 'develop'
Include SAML in pandora standard session handler (php)

See merge request artica/pandorafms!3528
2020-10-14 14:06:50 +02:00
Daniel Rodriguez
d1ff72e32b Merge branch 'ent-6466-borrado-de-eventos-con-pandora-DB' into 'develop'
Ent 6466 borrado de eventos con pandora db

See merge request artica/pandorafms!3524
2020-10-14 11:48:34 +02:00
Daniel Maya
7cd56b6f94 Ent 6466 borrado de eventos con pandora db 2020-10-14 11:48:34 +02:00
Daniel Rodriguez
be011424ff Merge branch 'ent-6463-Bug-visual-en-item-SQL-vertical-bar-graph-PDF' into 'develop'
fixed sql grph

See merge request artica/pandorafms!3525
2020-10-14 11:17:05 +02:00
daniel
510a96af8f fixed sql grph 2020-10-14 11:17:05 +02:00
fbsanchez
b97e8697f9 Include SAML in pandora standard session handler (php) 2020-10-14 10:31:46 +02:00
Daniel Rodriguez
5b1d29e4cb Merge branch 'ent-6467-No-funciona-el-select-de-nodos-en-los-items-de-graficas-sql' into 'develop'
fixed sql graph pie

See merge request artica/pandorafms!3523
2020-10-14 10:29:53 +02:00
artica
4c67e17e84 Auto-updated build strings. 2020-10-14 01:00:19 +02:00
Daniel Rodriguez
7b4395c537 Merge branch 'ent-6459-MEjoras-phantomjs' into 'develop'
phantomjs performance

See merge request artica/pandorafms!3519
2020-10-13 18:24:11 +02:00
daniel
148384f8fb phantomjs performance 2020-10-13 18:24:10 +02:00
Daniel Rodriguez
1134113cf3 Merge branch 'ent-6468-fallo-plantillas-automaticas-discovery' into 'develop'
OID naming compatibility when starts with "." or not

See merge request artica/pandorafms!3522
2020-10-13 15:48:59 +02:00
Daniel Barbero Martin
8c6c4d99a0 fixed sql graph pie 2020-10-13 09:32:28 +02:00
artica
2b06c5babc Auto-updated build strings. 2020-10-13 01:00:16 +02:00