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

16852 Commits

Author SHA1 Message Date
vgilc 8d3683d71b Merge branch '1748-Sistema-de-gestión-de-Clusters-fix-id-os' into 'develop' 
Fix id_os 100 cluster - #1748

See merge request artica/pandorafms!1380
 2018-03-19 19:15:19 +01:00
enriquecd 43e374f454 Fix id_os 100 cluster - #1748 2018-03-19 19:09:45 +01:00
artica 25efa085ce Auto-updated build strings. 2018-03-19 00:01:29 +01:00
artica c4ddcc9332 Auto-updated build strings. 2018-03-18 00:01:21 +01:00
artica ea5ef0bc42 Auto-updated build strings. 2018-03-17 00:01:23 +01:00
artica a17c7c3e34 Auto-updated build strings. 2018-03-16 00:01:21 +01:00
vgilc 5e9a90183c Merge branch 'fix-mr-13' into 'develop' 
Fixed mr 13

See merge request artica/pandorafms!1374
 2018-03-15 15:29:20 +01:00
fermin831 458938b751 Fixed mr 13 2018-03-15 14:32:51 +01:00
vgilc c0cc6bbb5e Merge branch '1873-autoprovisionamiento-de-agentes' into 'develop' 
Added missing constants for two servers.

See merge request artica/pandorafms!1373
 2018-03-15 12:50:11 +01:00
Ramon Novoa 9bdc23077c Added missing constants for two servers. 2018-03-15 12:41:30 +01:00
vgilc 5fc4e30c6d Merge branch 'ent-1695-carrefour-pandora-fms-console-metaconsole-tree-view-conteo-de-los-elementos' into 'develop' 
[Tree view] Substitute items by groups

See merge request artica/pandorafms!1372
 2018-03-15 12:26:49 +01:00
fermin831 e9932daf19 [Tree view] Substitute items by groups 2018-03-15 12:06:07 +01:00
artica 270a43fbeb Auto-updated build strings. 2018-03-15 00:01:23 +01:00
vgilc 663e5da6ae Merge branch '1670-Traducciones-setup' into 'develop' 
Translations 720 - #1670

See merge request artica/pandorafms!1370
 2018-03-14 14:10:36 +01:00
enriquecd 2663cc1be5 Translations 720 - #1670 2018-03-14 13:59:44 +01:00
vgilc 4ba8b86bfd Merge branch 'ent-2052-previsualizador-iconos-roto' into 'develop' 
[Visual console] Fixed icon preview

See merge request artica/pandorafms!1368
 2018-03-14 10:33:36 +01:00
fermin831 0c3b6fbf83 [Visual console] Fixed icon preview 2018-03-14 10:25:27 +01:00
vgilc 387280e97f Merge branch '1873-autoprovisionamiento-de-agentes' into 'develop' 
1873 autoprovisionamiento de agentes

See merge request artica/pandorafms!1342
 2018-03-14 09:12:07 +01:00
artica fb56ebfbff Auto-updated build strings. 2018-03-14 00:01:25 +01:00
Ramon Novoa 42107017bf Merge remote-tracking branch 'origin/develop' into 1873-autoprovisionamiento-de-agentes 2018-03-13 18:40:51 +01:00
Ramon Novoa 560f18f3a2 Add tables for agent provisioning to the schema. 2018-03-13 18:01:04 +01:00
Ramon Novoa 21f8194f0d Add a new agent provisioning server (enterprise). 2018-03-13 17:52:34 +01:00
Ramon Novoa b63a1c4ce8 Remove debugging messages. 2018-03-13 17:52:34 +01:00
vgilc 8af4272152 Merge branch '1923-Migrar_agentes_desde_metaconsola' into 'develop' 
1923 migrar agentes desde metaconsola

See merge request artica/pandorafms!1364
 2018-03-13 17:47:52 +01:00
fermin831 ff2098bb7f [Autoprovision] Removed agents_count column from tprovisioning 2018-03-13 17:29:39 +01:00
fbsanchez a6c5a0b046 Moved MigrationServer to enterprise servers load 2018-03-13 17:26:44 +01:00
vgilc 04ae61e9e2 Merge branch '1743-Nodos-ficticios-establecen-relaciones-solos-en-los-mapas-de-red-dev' into 'develop' 
Changes in networkmap_links_to_js_links

See merge request artica/pandorafms!1365
 2018-03-13 17:05:51 +01:00
danielmaya 9fa26f9fcb Changes in networkmap_links_to_js_links 2018-03-13 16:40:49 +01:00
fbsanchez 9b9b46ac65 1923 added new tables to MR and migrate sql script 2018-03-13 16:38:09 +01:00
fbsanchez ed282c6a9b 1923 Added required methods for migrationserver 2018-03-13 16:35:13 +01:00
vgilc d6e82be357 Merge branch 'ent-2048-warnings-en-el-servidor-module_interval' into 'develop' 
[Server] Fixed undefined module_interval

See merge request artica/pandorafms!1363
 2018-03-13 16:32:30 +01:00
daniel a3dceac0a0 Merge remote-tracking branch 'origin/develop' into 1923-Migrar_agentes_desde_metaconsola 2018-03-13 16:00:44 +01:00
fermin831 9b60d94d59 [Autoprovision] Changed hostname by alias in database 2018-03-13 13:39:30 +01:00
fermin831 e03ad1a1bf [Server] Fixed undefined module_interval 2018-03-13 13:03:44 +01:00
artica af5d70bd7d Updated version and build strings. 2018-03-13 11:06:33 +01:00
artica 24ff4014ff Auto-updated build strings. 2018-03-13 00:01:27 +01:00
fbsanchez 7d58734ef2 MigrationServer aux util 2018-03-12 19:39:28 +01:00
daniel c8118c2e08 fixed minor error 2018-03-12 19:31:24 +01:00
fermin831 775f2b1a55 [Console images] Added toggle images 2018-03-12 17:57:18 +01:00
vgilc f65aebf532 Merge branch 'ent-1850-no-hay-opcion-command-line-snapshot-en-meta-3' into 'develop' 
[Snapshots] Fixed snapshots in metaconsole. Changed functionallity but preserve all way to work

See merge request artica/pandorafms!1361
 2018-03-12 16:01:16 +01:00
fermin831 74f899736f [Snapshots] Fixed snapshots in metaconsole. Changed functionallity but preserve all way to work 2018-03-12 15:17:59 +01:00
vgilc 3e90c3421a Merge branch '2031-syslogserver-perdida-de-historico-en-cambio-de-alias-re' into 'develop' 
Fixed duplicate definition $rs

See merge request artica/pandorafms!1360
 2018-03-12 13:55:49 +01:00
fbsanchez 4566aee4e1 Fixed duplicate definition $rs 2018-03-12 13:47:57 +01:00
daniel 2fdc520a36 Merge remote-tracking branch 'origin/develop' into 1923-Migrar_agentes_desde_metaconsola 2018-03-12 13:07:34 +01:00
artica a66a7fde49 Auto-updated build strings. 2018-03-12 00:01:29 +01:00
artica 6235fc381a Auto-updated build strings. 2018-03-11 00:01:29 +01:00
artica 4af8841c29 Auto-updated build strings. 2018-03-10 00:01:37 +01:00
daniel 2605064c02 minor change 2018-03-09 15:33:51 +01:00
vgilc df6370ac4b Merge branch '1908-No-se-muestran-correctamente-las-gráficas-con-decimales-dev' into 'develop' 
Fixed shorten axis units

See merge request artica/pandorafms!1359
 2018-03-09 12:22:27 +01:00
danielmaya 64b62edd90 Fixed shorten axis units 2018-03-09 10:18:02 +01:00