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 |
|
artica
|
3f855702b2
|
Auto-updated build strings.
|
2022-04-19 01:00:49 +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 |
|
Daniel Rodriguez
|
9ac540f0af
|
Merge branch 'ent-8819-fallos-test' into 'develop'
ulimit in docker run
See merge request artica/pandorafms!4818
|
2022-04-18 11:14:45 +00:00 |
|
Daniel Rodriguez
|
07c1ccc89c
|
Merge branch 'ent-8731-umc-no-en-vendor' into 'develop'
Moved from vendor to independent folder inside PandoraFMS Project #8731#note_144708
See merge request artica/pandorafms!4817
|
2022-04-18 09:35:39 +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 |
|
fbsanchez
|
11fe828f81
|
ulimit in docker run
|
2022-04-12 13:22:27 +02:00 |
|
fbsanchez
|
89428b377c
|
Moved from vendor to independent folder inside PandoraFMS Project #8731#note_144708
|
2022-04-12 13:12:05 +02:00 |
|
Daniel Rodriguez
|
ea07bba78b
|
Merge branch 'ent-8815-error-500-en-operaciones-masivas-de-modulos-copy' into 'develop'
Ent 8815 error 500 en operaciones masivas de modulos copy
See merge request artica/pandorafms!4813
|
2022-04-12 07:05:39 +00:00 |
|
artica
|
acf31f9dfd
|
Auto-updated build strings.
|
2022-04-12 01:00:51 +02:00 |
|
alejandro.campos@artica.es
|
0721169da5
|
minor fix in templates
|
2022-04-11 18:27:20 +02:00 |
|
Daniel Maya
|
51f5127265
|
#8815 Fixed table
|
2022-04-11 14:04:57 +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 |
|
Daniel Rodriguez
|
aa21da9e54
|
Merge branch 'ent-8731-umc-en-vendor-2' into 'develop'
Swap some stuff in MR becouse some environments had FK in deprecated tables
See merge request artica/pandorafms!4807
|
2022-04-08 09:46:29 +00:00 |
|
fbsanchez
|
9406fa2c09
|
switch order of drops in MR
|
2022-04-08 11:31:36 +02:00 |
|
artica
|
d2787675d2
|
Auto-updated build strings.
|
2022-04-08 01:00:51 +02:00 |
|
fbsanchez
|
037bf016fb
|
Swap some stuff in MR becouse some environments had FK in deprecated tables
|
2022-04-07 17:26:14 +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 |
|
Daniel Rodriguez
|
144d65acf9
|
Merge branch 'ent-8731-umc-en-vendor' into 'develop'
update_manager_client => vendor
See merge request artica/pandorafms!4782
|
2022-04-07 08:12:14 +00:00 |
|
fbsanchez
|
6c63d13a68
|
fix in title
|
2022-04-07 09:46:51 +02: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 |
|
Daniel Barbero Martin
|
a0afaa156d
|
add new report custom render pandora_enterprise#8540
|
2022-04-06 13:49:28 +02:00 |
|
artica
|
b96b8b2a57
|
Updated version and build strings.
|
2022-04-06 13:12:18 +02:00 |
|
Daniel Rodriguez
|
4a546e07c8
|
Merge branch 'ent-8799-actualizar-version-mr' into 'develop'
update version
See merge request artica/pandorafms!4802
|
2022-04-06 08:09:39 +00:00 |
|
Daniel Barbero Martin
|
9de7f0564e
|
update version
|
2022-04-06 09:42:09 +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 |
|
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 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
|
ad957c5a72
|
Merge branch 'ent-8742-No-se-pueden-crear-nuevos-mapas-GIS' into 'develop'
Ent 8742 no se pueden crear nuevos mapas gis
See merge request artica/pandorafms!4789
|
2022-04-04 10:38:54 +00: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 |
|