tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
30,310 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

30310 Commits

Author SHA1 Message Date
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
Luis 30de4b05fe Merge remote-tracking branch 'origin/develop' into ent-8843-disabled-group-en-cli-meta 2022-04-26 14:55:38 +02:00
Luis 7190a797ec Fix meta CLI disable group 2022-04-26 14:47:49 +02:00
José González 7c2625fddf Fix recursion checkbox position 2022-04-26 11:47:34 +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
Daniel Rodriguez f034b65902 Merge branch 'ent-8846-anadir-con-nuevo-pandorawmic-a-los-instaladores-online' into 'develop' 
adding pandorawmic package to deploy scripts

See merge request artica/pandorafms!4837
 2022-04-25 15:47:53 +00:00
Daniel Rodriguez 13485318de Merge branch 'ent-8869-creacion-de-alertas-no-registra-la-accion' into 'develop' 
Fix alert creation return id

See merge request artica/pandorafms!4838
 2022-04-25 14:03:44 +00:00
Luis 3e81d3242e Fix alert creation return id 2022-04-25 15:36:17 +02:00
Rafael 4e3e4d9435 adding pandorawmic package to deploy scripts 2022-04-25 14:05:16 +02:00
Luis f4ac0d19d0 WIP: pandora manage disable group 2022-04-25 13:17:13 +02:00
Daniel Rodriguez e9a25023ce Merge branch 'ent-8868-if-exists-drops-sql' into 'develop' 
Fix

See merge request artica/pandorafms!4835
 2022-04-25 10:56:35 +00:00
José González 71d75fd6b7 Fix duplicated parameters 2022-04-25 11:23:44 +02:00
José González e272003396 Fix 2022-04-25 10:52:15 +02:00
José González 3cd116f88b Fix issue with period selector 2022-04-25 10:33:33 +02:00
alejandro.campos@artica.es 9adb8bae1d minor fix 2022-04-25 10:16:18 +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
Calvo dfc599b2d8 WIP: Meta disable groups CLI 2022-04-22 18:27:29 +02:00
artica 6470454de6 Auto-updated build strings. 2022-04-22 01:00:54 +02:00
alejandro.campos@artica.es 0223dd27c7 implemented text search of select inputs 2022-04-21 16:56:08 +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
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
alejandro 8845e37447 Adding new option log_module 2022-04-21 10:31:20 +02:00
artica 73bee44d93 Auto-updated build strings. 2022-04-21 01:00:18 +02:00
fbsanchez 00f594293c hint parents in service selection 2022-04-20 19:20:54 +02:00
fbsanchez 78907e691c removed traces 2022-04-20 18:45:52 +02:00
fbsanchez 87cd23b08a a nice trick 2022-04-20 18:41:03 +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
fbsanchez 2ab1aa601c Service tree view with local scope parents 2022-04-20 14:10:23 +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 Maya 1fcd64da26 #8840 changed invisible class 2022-04-19 15:23:12 +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
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