Daniel Barbero
|
ab3cfd4cc9
|
new tocken user edit newslatter info
|
2019-07-09 14:08:06 +02:00 |
Alejandro Fraguas
|
26c606b0d5
|
Merge branch 'ent-3090-Personalizacion-saml-2' into 'develop'
Added more parameters to SAML configuration
See merge request artica/pandorafms!2506
|
2019-07-09 13:18:12 +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 |
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 |
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 |
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 |
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 |
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 |
artica
|
8229f634e0
|
Auto-updated build strings.
|
2019-07-05 00:01:09 +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 |
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 |
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 |
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 |
Alejandro Fraguas
|
31187d76fb
|
Merge branch 'ent-3742-Perdida-de-recursion-en-paginacion-inferior' into 'develop'
Fixed down paginations in manage agents
See merge request artica/pandorafms!2280
|
2019-07-03 12:33:16 +02:00 |
Alejandro Fraguas
|
8ef22373a7
|
Merge branch 'ent.3698-Conteo-de-notificaciones-un-poco-raro' into 'develop'
Fixed messages count
See merge request artica/pandorafms!2260
|
2019-07-03 10:12:03 +02:00 |
artica
|
3b68964f27
|
Auto-updated build strings.
|
2019-07-03 00:01:12 +02:00 |
Alejandro Campos
|
ffbaac6edc
|
Merge branch 'develop' into 'ent-3742-Perdida-de-recursion-en-paginacion-inferior'
# Conflicts:
# pandora_console/godmode/agentes/modificar_agente.php
|
2019-07-02 18:22:49 +02:00 |
alejandro-campos
|
51d7104de7
|
fix item name macros when using report templates
|
2019-07-02 18:09:52 +02:00 |
Alejandro Fraguas
|
86610ebe96
|
Merge branch 'ent-4294-7984-Desplegable-de-grupos-desordenados' into 'develop'
Fixed unordered groups
See merge request artica/pandorafms!2559
|
2019-07-02 16:06:33 +02:00 |
Tatiana Llorente
|
1aa0131a81
|
Merge branch 'develop' into 'ent-4195-Status-sets-Visual'
Conflicts:
pandora_console/include/styles/pandora.css
|
2019-07-02 11:42:19 +02:00 |
Alejandro Fraguas
|
3a76f331c8
|
Merge branch 'ent-2094-Añadir-buscador-en-operaciones-masivas' into 'develop'
Add module filter by text -#2094
See merge request artica/pandorafms!2520
|
2019-07-02 11:37:01 +02:00 |
Alejandro Fraguas
|
1f2e6a50f8
|
Merge branch 'ent-4214-8207-Tactical-View-contador-de-alertas-disparadas-falla' into 'develop'
Add condition in tactical view to exclude disabled alerts from count of triggered alerts
See merge request artica/pandorafms!2547
|
2019-07-02 10:30:20 +02:00 |
artica
|
78bcf83856
|
Auto-updated build strings.
|
2019-07-02 00:01:09 +02:00 |
Alejandro Fraguas
|
177eb86956
|
Merge branch 'ent-3679-7637-7711-Agregar-eliminar-agente-de-politica-en-metaconsola' into 'develop'
modified api function for adding agent to policy to make it available on meta
See merge request artica/pandorafms!2522
|
2019-07-01 17:06:37 +02:00 |
Alejandro Fraguas
|
8c7acdb02e
|
Merge branch 'ent-3965-Ordenado-y-validado-de-alertas-disparadas' into 'develop'
Added sorting in last fired column - #3965
See merge request artica/pandorafms!2507
|
2019-07-01 15:41:04 +02:00 |
marcos.alconada
|
6349c29eb5
|
Add message for autenticaition error SAML
|
2019-07-01 13:45:42 +02:00 |
fbsanchez
|
a6327a16ad
|
Session expiration ignoring notifications checks
|
2019-07-01 12:46:09 +02:00 |
Alejandro Fraguas
|
eb94438c7f
|
Merge branch 'ent-3541-7513-nuevo-modificar-informe-de-eventos-por-grupo' into 'develop'
Show new filters for group events reports
See merge request artica/pandorafms!2534
|
2019-07-01 12:38:48 +02:00 |
Alejandro Fraguas
|
8ec2ec9d0d
|
Merge branch 'ent-4112-Bug-visual-cuadro-de-datos-tipo-string' into 'develop'
Truncate long title in modal dialogs - #4112
See merge request artica/pandorafms!2508
|
2019-07-01 10:36:24 +02:00 |
Alejandro Fraguas
|
1ee2e94766
|
Merge branch 'ent-3748-component-group-creation-not-working-after-delete-component' into 'develop'
Fixed create from bug: added action with refresh url
See merge request artica/pandorafms!2284
|
2019-07-01 10:19:44 +02:00 |
Alejandro Fraguas
|
39ac83ae5e
|
Merge branch 'ent-4250-Cambios-de-estilo-pendientes_2' into 'develop'
Style changes - #4250
See merge request artica/pandorafms!2557
|
2019-07-01 10:02:02 +02:00 |
Alejandro Fraguas
|
47838a1134
|
Merge branch 'ent-4213-SNMP-Walk-dede-modulo-creado-no-muestra-parametros-v3' into 'develop'
Ent 4213 snmp walk dede modulo creado no muestra parametros v3
See merge request artica/pandorafms!2511
|
2019-07-01 09:48:33 +02:00 |