tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-04-08 18:55:09 +02:00
Code Issues Packages Projects Releases Wiki Activity
30,063 Commits 34 Branches 30 Tags
Commit Graph

30063 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Daniel Rodriguez
fe53bcd8cc Merge branch 'ent-8817-Falla-proceso-de-merge-en-metaconsola' into 'develop' 
minor fix

See merge request artica/pandorafms!4816
 2022-04-21 09:30:25 +00:00
artica
73bee44d93 Auto-updated build strings. 2022-04-21 01:00:18 +02:00
alejandro.campos@artica.es
69e0bf2697 fixed error during merge process 2022-04-20 15:58:26 +02:00
alejandro.campos@artica.es
7ec1784429 Merge remote-tracking branch 'origin/develop' into ent-8817-Falla-proceso-de-merge-en-metaconsola 2022-04-20 15:53:20 +02:00
José González
80a2775b6f Fix typo 2022-04-20 14:51:01 +02:00
Daniel Rodriguez
b2ea3d1d7a Merge branch 'ent-8463-usar-el-pandora_ha-para-monirorizar-y-mantener-activo-el-tentacle-server' into 'develop' 
Add a watchdog for Tentacle Server to pandora_ha.

See merge request artica/pandorafms!4821
 2022-04-20 10:22:52 +00: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
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
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
Ramon Novoa
86cf4d5b0f Add tentacle_service_watchdog to pandora_server.conf.new. 2022-04-13 13:21:56 +02:00
Ramon Novoa
8bc84bf0b4 Add a watchdog for Tentacle Server to pandora_ha. 2022-04-13 13:14:54 +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
alejandro.campos@artica.es
903e2ae34c minor fix 2022-04-12 11:24:31 +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