17573 Commits

Author SHA1 Message Date
fbsanchez
2ab1aa601c Service tree view with local scope parents 2022-04-20 14:10:23 +02:00
artica
018f89b8af Auto-updated build strings. 2022-04-20 01:00:50 +02:00
Daniel Rodriguez
b290e6c896 Merge branch 'ent-8332-post-configurar-un-segundo-servidor-ldap' into 'develop'
Ent 8332 post configurar un segundo servidor ldap

See merge request artica/pandorafms!4823
2022-04-19 12:42:43 +00:00
Daniel Rodriguez
be24fd7b28 Merge branch 'ent-7621-autenticacion-local-usuarios-solo-api' into 'develop'
Fix api local auth

See merge request artica/pandorafms!4258
2022-04-19 12:21:36 +00:00
Daniel Rodriguez
627e9bb22a Merge branch 'ent-8818-Errores-SQL-al-crear-alertas-en-Bulk-operations' into 'develop'
fixed sql error

See merge request artica/pandorafms!4820
2022-04-19 12:19:23 +00:00
Daniel Barbero Martin
e46be28765 performance events view#8800 2022-04-19 09:30:27 +02:00
artica
3f855702b2 Auto-updated build strings. 2022-04-19 01:00:49 +02:00
Calvo
1fad2944a6 Merge remote-tracking branch 'origin/develop' into ent-7621-autenticacion-local-usuarios-solo-api 2022-04-18 17:46:36 +02:00
Daniel Rodriguez
f36a89d41d Merge branch 'ent-8557-Disenar-nuevas-plantillas-de-alertas-de-correo-para-Pandora' into 'develop'
change email alert templates

See merge request artica/pandorafms!4808
2022-04-18 11:51:42 +00:00
artica
2441b208bf Auto-updated build strings. 2022-04-18 01:00:27 +02:00
artica
9041dea14d Auto-updated build strings. 2022-04-17 01:00:30 +02:00
artica
0dd12259c1 Auto-updated build strings. 2022-04-16 01:00:19 +02:00
artica
0c4aa6978f Auto-updated build strings. 2022-04-15 01:00:28 +02:00
artica
5fcd51eccb Auto-updated build strings. 2022-04-14 01:00:32 +02:00
Daniel Maya
fd7af69a1d #8587 tooltip option 2022-04-13 15:24:31 +02:00
artica
d3fafcfaa8 Auto-updated build strings. 2022-04-13 01:00:40 +02:00
Daniel Maya
9f1be4531b #8587 Added sunburst 2022-04-12 17:24:47 +02:00
alejandro.campos@artica.es
fdca42eb24 fixed sql error 2022-04-12 17:18:55 +02:00
artica
acf31f9dfd Auto-updated build strings. 2022-04-12 01:00:51 +02:00
fbsanchez
8a221f10b0 allow disable counters on mc environments 2022-04-11 14:20:17 +02:00
artica
773071946f Auto-updated build strings. 2022-04-11 01:00:21 +02:00
artica
2c87abc4f8 Auto-updated build strings. 2022-04-10 01:00:24 +02:00
artica
fbfd97b113 Auto-updated build strings. 2022-04-09 01:00:12 +02:00
artica
d2787675d2 Auto-updated build strings. 2022-04-08 01:00:51 +02:00
alejandro.campos@artica.es
6b708777f6 change email alert templates 2022-04-07 17:24:06 +02:00
Daniel Rodriguez
bfcb4dad5e Merge branch 'ent-8786-Borrado-de-IPs-en-agente-Delete-selected-items' into 'develop'
Ent 8786 borrado de i ps en agente delete selected items

See merge request artica/pandorafms!4797
2022-04-07 13:31:15 +00:00
fbsanchez
686ba0a5a5 Merge remote-tracking branch 'origin/develop' into ent-8731-umc-en-vendor
Conflicts:
	pandora_console/extras/mr/53.sql
2022-04-07 09:44:12 +02:00
artica
63c63a2616 Auto-updated build strings. 2022-04-07 01:00:28 +02:00
José González
2ae66f7eb3 Fix x20; chars in alias when create agents with alias with spaces in API 2022-04-06 17:11:10 +02:00
fbsanchez
3dc57f8a8c some fixes in version control and php memory usage 2022-04-06 14:29:24 +02:00
Daniel Rodriguez
2471bbf1d4 Merge branch 'ent-8540-contel-nuevo-informe-custom-render' into 'develop'
add new report custom render pandora_enterprise#8540

See merge request artica/pandorafms!4793
2022-04-06 12:16:26 +00:00
artica
b96b8b2a57 Updated version and build strings. 2022-04-06 13:12:18 +02:00
artica
7cb547dee4 Auto-updated build strings. 2022-04-06 01:00:46 +02:00
Daniel Rodriguez
bcb4efe397 Merge branch 'ent-avoid-warnigs-with-php74' into 'develop'
Fixed some codes to avoid warnings with some php74 environment.

See merge request artica/pandorafms!4795
2022-04-05 15:17:47 +00:00
Daniel Rodriguez
fb6381b789 Merge branch 'ent-improve-check-allowoverride' into 'develop'
Added support for FreeBSD in checkAllowOverrideEnabled().

See merge request artica/pandorafms!4794
2022-04-05 15:08:18 +00:00
Daniel Rodriguez
fa62f8facc Merge branch 'ent-8541-cambio-funcionamiento-licencia-satelite' into 'develop'
Ent 8541 cambio funcionamiento licencia satelite

See merge request artica/pandorafms!4792
2022-04-05 13:44:12 +00:00
Daniel Barbero Martin
6bfde7e903 add new report custom render pandora_enterprise#8540 2022-04-05 13:55:29 +02:00
José González
bfb44be775 Fix styles 2022-04-05 13:40:12 +02:00
Daniel Maya
165f3ff598 #8735 Fixed interface view 2022-04-05 13:00:15 +02:00
Daniel Barbero Martin
c049f18bf1 Merge remote-tracking branch 'origin/develop' into ent-8540-contel-nuevo-informe-custom-render 2022-04-05 08:20:21 +02:00
artica
d0f1723789 Auto-updated build strings. 2022-04-05 01:00:47 +02:00
Daniel Maya
dcdcbfad88 #8786 Fixed delete address 2022-04-04 17:40:51 +02:00
Daniel Maya
4a6ab6ce95 #8766 Fixed event comments 2022-04-04 16:02:26 +02:00
Daniel Barbero Martin
6351b98777 add new report custom render pandora_enterprise#8540 2022-04-04 14:56:40 +02:00
Daniel Barbero Martin
502b5ab0db add new report custom render pandora_enterprise#8540 2022-04-04 14:40:20 +02:00
Daniel Rodriguez
71fef65f35 Merge branch 'ent-8340-POST-Custom-data-en-vista-de-eventos' into 'develop'
implemented custom data filter in event view

See merge request artica/pandorafms!4787
2022-04-04 10:38:30 +00:00
Junichi Satoh
e0d50facf0 Fixed some codes to avoid warnings with some php74 environment. 2022-04-04 16:31:22 +09:00
Junichi Satoh
5fcf3a4009 Added support for FreeBSD in checkAllowOverrideEnabled(). 2022-04-04 16:22:25 +09:00
Daniel Barbero Martin
863e6c887f Merge remote-tracking branch 'origin/develop' into ent-8540-contel-nuevo-informe-custom-render 2022-04-04 08:17:03 +02:00
artica
8a5875f987 Auto-updated build strings. 2022-04-04 01:00:24 +02:00