22131 Commits

Author SHA1 Message Date
fbsanchez
0cabc4d4da Azure discovery task form completed 2019-07-09 12:02:29 +02:00
fbsanchez
bd80e013f5 minor fix to avoid log messages 2019-07-09 12:02:07 +02:00
Daniel Rodriguez
7fa79f2043 Merge branch 'ent-4227-Componentes_de_red_no_funcionan_bien' into 'develop'
fixed error network component plugin

See merge request artica/pandorafms!2581
2019-07-09 10:27:08 +02:00
Daniel Rodriguez
2f69bff9d7 Merge branch 'ent-3693-pete-php-pantalla-en-blanco-con-auth-saml-2' into 'develop'
add message no acces saml without saml.php file

See merge request artica/pandorafms!2587
2019-07-09 10:08:54 +02:00
Daniel Rodriguez
972e7447ea Merge branch 'ent-4195-Status-sets-Visual' into 'develop'
Changed default images status set for css - #4195

See merge request artica/pandorafms!2530
2019-07-09 10:01:09 +02:00
fbsanchez
297bd7c107 Merge remote-tracking branch 'origin/develop' into 3545-8250-7558-7882-monitorizar-servicios-de-azure 2019-07-09 09:53:04 +02:00
Tatiana Llorente
0f280494a0 Changed images for divs to show preview in visual styles - #4195 2019-07-09 09:33:49 +02:00
artica
729fb32ffb Auto-updated build strings. 2019-07-09 00:01:10 +02:00
Daniel Barbero
127f67f2ac fixed error in network component 2019-07-08 19:33:54 +02:00
Tatiana Llorente
6d6c8fe197 Added filter by agent - #4318 2019-07-08 17:57:23 +02:00
Daniel Rodriguez
e43469954a Merge branch 'ent-4109-Bug-en-utilizacion-de-macro-en-report-a-traves-de-plantillas' into 'develop'
fix item name macros when using report templates

See merge request artica/pandorafms!2570
2019-07-08 17:13:13 +02:00
marcos.alconada
09e5feef05 add message no acces saml without saml.php file 2019-07-08 17:02:28 +02:00
alejandro-campos
95d264059a conflict resolution 2019-07-08 16:15:47 +02:00
alejandro-campos
d5362c1d5d fix bug: label macros not being replaced in view report 2019-07-08 16:07:22 +02:00
Alejandro Fraguas
a295c9b789 Merge branch 'ent-3962-notification-timeout-session' into 'develop'
Session expiration ignoring notifications checks

See merge request artica/pandorafms!2561
2019-07-08 15:57:02 +02:00
Daniel Barbero
b70c904ec3 fixed minor error network components 2019-07-08 13:40:52 +02:00
Daniel Barbero
58cb113d40 fixed error in pdf 2019-07-08 13:23:35 +02:00
vgilc
fbe1b4ff7a Merge branch '207-cliente-smpp' into 'develop'
New SMPP client

See merge request artica/pandorafms!2584
2019-07-08 12:25:42 +02:00
Kike
f444f639bd New SMPP client 2019-07-08 12:17:48 +02:00
Tatiana Llorente
0cccafc7be Heartbeat gifs with black background - #4194 2019-07-08 10:37:34 +02:00
Daniel Barbero
8ea9b67326 fixed graph in mobile view metaconsole 2019-07-08 10:20:43 +02:00
Tatiana Llorente
b6d551d583 Changed images with white background - #4194 2019-07-08 10:08:04 +02:00
artica
034181037d Auto-updated build strings. 2019-07-08 00:01:17 +02:00
artica
90497410c7 Auto-updated build strings. 2019-07-07 00:01:07 +02:00
artica
d0f3a6bc0b Auto-updated build strings. 2019-07-06 00:01:19 +02:00
Alejandro Fraguas
1185806ca5 Merge branch 'revert-8c1d1198' into 'develop'
Revert "Merge branch 'ent-3693-pete-php-pantalla-en-blanco-con-auth-saml' into 'develop'"

See merge request artica/pandorafms!2582
2019-07-05 15:04:08 +02:00
Alejandro Fraguas
8242bf34b8 Revert "Merge branch 'ent-3693-pete-php-pantalla-en-blanco-con-auth-saml' into 'develop'"
This reverts merge request !2562
2019-07-05 14:55:22 +02:00
Tatiana Llorente
745ab711de Created green theme - #4194 2019-07-05 14:02:59 +02:00
Tatiana Llorente
d1bc6cc2ff Created green theme - #4194 2019-07-05 13:59:48 +02:00
Daniel Barbero
6e7dfb38fd fixed error network component plugin 2019-07-05 13:46:48 +02:00
Alejandro Fraguas
da110f1d33 Merge branch 'ent-4315-No-funcionan-las-politicas-en-meta' into 'develop'
fix bug in api function that removes an agent from a policy

See merge request artica/pandorafms!2579
2019-07-05 10:36:15 +02:00
Daniel Barbero
7175d716f0 fixed translate 2019-07-05 10:32:10 +02:00
Tatiana Llorente
31b19ab970 Fix pagination blank page - #4306 2019-07-05 09:31:23 +02:00
artica
8229f634e0 Auto-updated build strings. 2019-07-05 00:01:09 +02:00
fbsanchez
0e3fd848f7 minor fixes and visual change in azure credentials 2019-07-04 19:34:03 +02:00
alejandro-campos
a10945d209 fix bug in api function that removes an agent from a policy 2019-07-04 18:33:12 +02:00
Alejandro Fraguas
d269f3b69c Merge branch 'ent-3714-Eliminar-opciones-template-y-wizard-en-la-visual-console-open' into 'develop'
Hidden buttons template and wizard in the open visual console

See merge request artica/pandorafms!2264
2019-07-04 17:10:05 +02:00
Tatiana Llorente
de6a0c2192 Changed disabled to readonly in agent name and id- #4307 2019-07-04 16:20:01 +02:00
Alejandro Fraguas
8c1d119819 Merge branch 'ent-3693-pete-php-pantalla-en-blanco-con-auth-saml' into 'develop'
Add message for autenticaition error SAML

See merge request artica/pandorafms!2562
2019-07-04 14:45:45 +02:00
fbsanchez
26464651c8 Changed from XML::Parser to XML::SAX::ExpatXS 2019-07-04 13:24:31 +02:00
Daniel Barbero Martin
000cdfdcfd WIP failover 2019-07-04 12:09:08 +02:00
Daniel Barbero Martin
c25b7155fa WIP failover 2019-07-04 11:17:12 +02:00
Alejandro Fraguas
e0a1f1b8b9 Merge branch 'ent-3360-fallo-en-agrupacion-de-agentes-con-mismo-alias-en-reports-2' into 'develop'
final merge 3360 ticket

See merge request artica/pandorafms!2575
2019-07-04 10:21:23 +02:00
artica
f4b8b39704 Auto-updated build strings. 2019-07-04 00:01:09 +02:00
Daniel Barbero Martin
22734a4ea2 WIP failover 2019-07-03 17:51:47 +02:00
marcos.alconada
2ad44fcf90 final merge 3360 ticket 2019-07-03 17:07:31 +02:00
Alejandro Fraguas
04cd368410 Merge branch 'ent-4152-excec-satellite-serever-warn-remote-conf-needed' into 'develop'
Added satellite remote conficg check in snmp wizard

See merge request artica/pandorafms!2539
2019-07-03 16:54:39 +02:00
fbsanchez
07edee619a CS filtering and constant 2019-07-03 16:38:26 +02:00
fbsanchez
18d8f90f90 Credential store upgrade Azure 2019-07-03 16:04:40 +02:00
Tatiana Llorente
2298019e6b Dont show empty custom fields in agent view - #4201 2019-07-03 12:41:22 +02:00