Commit Graph

16135 Commits

Author SHA1 Message Date
Daniel Maya 9fd4e415c0 #8899 Fixed pass with entities 2022-05-03 10:02:39 +02:00
artica 7d86f7f88d Auto-updated build strings. 2022-05-03 01:00:15 +02:00
artica ccafd0ec6e Auto-updated build strings. 2022-05-02 01:00:30 +02:00
artica d9b93df62d Auto-updated build strings. 2022-05-01 01:00:37 +02:00
artica f3db0f7bf6 Auto-updated build strings. 2022-04-30 01:00:25 +02:00
artica 1bdb0af99c Auto-updated build strings. 2022-04-29 01:00:57 +02:00
artica cee1c1bc95 Auto-updated build strings. 2022-04-28 01:00:47 +02:00
Daniel Rodriguez f7a67cadca Merge branch 'ent-8832-grafico-modulo-periodo-mal' into 'develop'
Fix issue with period selector

See merge request artica/pandorafms!4834
2022-04-27 07:44:05 +00:00
artica 240ecefabb Auto-updated build strings. 2022-04-27 01:00:53 +02:00
Daniel Rodriguez 08911d370f Merge branch 'ent-8800-13378-rendimiento-eventos-metaconsola' into 'develop'
performance events view#8800

See merge request artica/pandorafms!4822
2022-04-26 08:58:06 +00:00
artica 5818944468 Auto-updated build strings. 2022-04-26 01:00:43 +02:00
Luis 3e81d3242e Fix alert creation return id 2022-04-25 15:36:17 +02:00
José González 3cd116f88b Fix issue with period selector 2022-04-25 10:33:33 +02:00
artica c42b8c57c9 Auto-updated build strings. 2022-04-25 01:00:37 +02:00
artica 6e96230cd4 Auto-updated build strings. 2022-04-24 01:00:36 +02:00
artica 493f865619 Auto-updated build strings. 2022-04-23 01:00:47 +02:00
artica 6470454de6 Auto-updated build strings. 2022-04-22 01:00:54 +02:00
Daniel Rodriguez 543f801742 Merge branch 'ent-8713-traducciones-consola' into 'develop'
Fix typo

See merge request artica/pandorafms!4827
2022-04-21 14:27:05 +00:00
José González ea5206e692 Added new language files 2022-04-21 14:39:28 +02:00
artica 73bee44d93 Auto-updated build strings. 2022-04-21 01:00:18 +02:00
José González 80a2775b6f Fix typo 2022-04-20 14:51:01 +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
artica d3fafcfaa8 Auto-updated build strings. 2022-04-13 01:00:40 +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
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
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