26768 Commits

Author SHA1 Message Date
Daniel Rodriguez
b2ed2f5511 Merge branch 'ent-6833-planned-downtimes-any-no-funciona' into 'develop'
Fix issue with adding agents and modules

Closes pandora_enterprise#6833

See merge request artica/pandorafms!3723
2021-03-01 10:05:59 +00:00
Daniel Rodriguez
07a29fae04 Merge branch 'ent-6608-OPEN-Servidores-SMTP-externos-no-mandan-e-mail-test' into 'develop'
fixed string

See merge request artica/pandorafms!3870
2021-03-01 10:05:04 +00:00
Daniel Rodriguez
86bd145dce Merge branch 'ent-6414-mobile-console-events-modal-open-twice' into 'develop'
Fixed mobile events modal opening twice

See merge request artica/pandorafms!3720
2021-03-01 10:03:51 +00:00
Daniel Rodriguez
0243740ab1 Merge branch 'ent-6136-fallos-visuales-en-la-correlacion-de-alertas' into 'develop'
add new style

See merge request artica/pandorafms!3789
2021-03-01 10:02:19 +00:00
Marcos Alconada
0d4761b63d add new style 2021-03-01 10:02:18 +00:00
Daniel Rodriguez
1128b366d5 Merge branch 'ent-5537-cambio-en-botones-de-select-all-de-ventanas-de-seleccion-de-agentes' into 'develop'
Ent 5537 cambio en botones de select all de ventanas de seleccion de agentes

See merge request artica/pandorafms!3696
2021-03-01 10:00:22 +00:00
Daniel Maya
6175d91298 Ent 5537 cambio en botones de select all de ventanas de seleccion de agentes 2021-03-01 10:00:22 +00:00
Daniel Rodriguez
a0335b5fe6 Merge branch 'ent-4336-8257-separar-alertas-de-system-status-para-elegir-cuales-deseamos-recibir' into 'develop'
Ent 4336 8257 separar alertas de system status para elegir cuales deseamos recibir

See merge request artica/pandorafms!3846
2021-03-01 09:57:51 +00:00
Daniel Rodriguez
43c842ec75 Merge branch 'ent-6931-Cabecera-duplicada-en-Remote-component-management' into 'develop'
Ent 6931 cabecera duplicada en remote component management

See merge request artica/pandorafms!3782
2021-03-01 09:54:35 +00:00
Daniel Rodriguez
1767712c72 Merge branch 'ent-2530-bug-tokens-webserver-module' into 'develop'
Fixed tokens htpp_auth user,avoid repetiton

See merge request artica/pandorafms!3734
2021-03-01 09:53:55 +00:00
artica
0587500074 Auto-updated build strings. 2021-03-01 01:00:09 +01:00
artica
0cf47e4b00 Auto-updated build strings. 2021-02-28 01:00:06 +01:00
artica
814a39235e Auto-updated build strings. 2021-02-27 01:00:19 +01:00
Jose Gonzalez
08cc259f07 Fixed issue 2021-02-26 14:24:44 +01:00
fbsanchez
ad347dc953 errata fix 2021-02-26 12:48:23 +01:00
alejandro.campos@artica.es
86cd01418f fixed string 2021-02-26 09:41:53 +01:00
artica
dc04a2b2b5 Auto-updated build strings. 2021-02-26 01:00:19 +01:00
Daniel Rodriguez
1b2fcb67fb Merge branch 'ent-7080-error-servicios-elementos-modulo' into 'develop'
Ent 7080 error servicios elementos modulo

See merge request artica/pandorafms!3868
2021-02-25 17:56:22 +00:00
Luis
eb5e295286 Ent 7080 error servicios elementos modulo 2021-02-25 17:56:21 +00:00
Jose Gonzalez
7cfc1d2f9a Fixed issue with all modules 2021-02-25 16:08:02 +01:00
fbsanchez
d41b189612 Extra lines after mr file 2021-02-25 13:27:00 +01:00
alejandro.campos@artica.es
901d12fec0 Integration with Integria 2021-02-25 13:18:04 +01:00
fbsanchez
8fcac749f5 POST/GET reloaded if empty in ajax 2021-02-25 12:09:41 +01:00
fbsanchez
f84d7a413e POST/GET reloaded if empty in ajax 2021-02-25 12:08:58 +01:00
artica
078ab1657f Auto-updated build strings. 2021-02-25 01:00:25 +01:00
fbsanchez
9f694e32f7 Merge remote-tracking branch 'origin/develop' into ent-2561-llamadas-api-para-modulos-de-politicas
Conflicts:
	pandora_console/godmode/wizards/Wizard.main.php
2021-02-24 09:41:53 +01:00
artica
508b953496 Auto-updated build strings. 2021-02-24 01:00:21 +01:00
rafael.ameijeiras
793ca4ace7 change agent docker image to centos7 2021-02-23 15:05:08 +01:00
marcos
b13d5dc8d4 fixed error not show messages 2021-02-23 14:35:57 +01:00
Jose Gonzalez
e68d2bfe5c Fixed issue with URLs 2021-02-23 14:32:51 +01:00
Luis Calvo
e258069c39 Fixed data always formatting to date in sys uptime snmp modules 2021-02-23 11:50:35 +01:00
artica
a5b1128014 Auto-updated build strings. 2021-02-23 01:00:16 +01:00
fbsanchez
4b0f96126b minor fix 2021-02-22 12:25:24 +01:00
fbsanchez
34a19b969c missed mr file 2021-02-22 12:04:12 +01:00
fbsanchez
d1c0d1b9f4 Merge remote-tracking branch 'origin/develop' into ent-4336-8257-separar-alertas-de-system-status-para-elegir-cuales-deseamos-recibir 2021-02-22 12:03:52 +01:00
fbsanchez
85f37a91de Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision
Conflicts:
	pandora_console/include/functions_ui.php
2021-02-22 12:01:29 +01:00
artica
cd9694f034 Auto-updated build strings. 2021-02-22 01:00:09 +01:00
artica
c70643203f Auto-updated build strings. 2021-02-21 01:00:14 +01:00
artica
396f67d57b Auto-updated build strings. 2021-02-20 01:00:21 +01:00
Jose Gonzalez
64ae964191 Fixed forced 2FA 2021-02-19 14:30:09 +01:00
fbsanchez
925f456ef7 minor fixes 2021-02-19 13:57:39 +01:00
fbsanchez
0fb3ba9232 System status notifications filtered by subtype 2021-02-19 13:36:29 +01:00
artica
0f4f9cd461 Auto-updated build strings. 2021-02-19 01:00:21 +01:00
Daniel Rodriguez
3b2ba087e3 Merge branch 'ent-7054-Selector-modulo-vacio-en-informe-SLA-Meta' into 'develop'
Fixed error reports sla selected modules in metaconsole

See merge request artica/pandorafms!3847
2021-02-18 18:01:29 +01:00
Daniel Rodriguez
3dd6fbfd26 Merge branch 'ent-7059-no-existe-el-console-log-en-nuevas-instalaciones' into 'develop'
Ent 7059 no existe el console log en nuevas instalaciones

See merge request artica/pandorafms!3849
2021-02-18 17:34:42 +01:00
Marcos Alconada
c69b1f6282 Ent 7059 no existe el console log en nuevas instalaciones 2021-02-18 17:34:42 +01:00
Daniel Barbero Martin
6e3a3a1d38 Fixed error reports sla selected modules in metaconsole 2021-02-18 14:09:23 +01:00
artica
4c1eaf929b Auto-updated build strings. 2021-02-18 01:00:24 +01:00
vgilc
11cf5ae627 Merge branch 'fixed-mr-version-44-752-2' into 'develop'
fixed mr version and remove updates mr

See merge request artica/pandorafms!3843
2021-02-17 14:45:50 +01:00
Daniel Barbero Martin
39e603e908 fixed mr version and remove updates mr 2021-02-17 14:27:16 +01:00