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

12916 Commits

Author SHA1 Message Date
vgilc f809a013e1 Merge branch '983-API-CLI-posibilidad-de-aplicar-templates-componentes-a-un-agente' into 'develop' 
API and CLI apply template components - #983

See merge request artica/pandorafms!1319
 2018-03-22 12:51:33 +01:00
enriquecd dcb33e08b7 Merge branch 'develop' into 983-API-CLI-posibilidad-de-aplicar-templates-componentes-a-un-agente 
Conflicts:
	pandora_server/util/pandora_manage.pl
 2018-03-22 11:11:01 +01:00
enriquecd 632845c9b3 Adapt search bar to cluster id_os 100 - #1866 2018-03-22 11:04:19 +01:00
vgilc 6fd44faad1 Merge branch '2030-5422-Esconder-los-campos-de-tipo-password-dentro-de-los-custom-fields-del-agente' into 'develop' 
Hide password custom fields data in agent custom fileds section - #2030

See merge request artica/pandorafms!1362
 2018-03-22 10:13:33 +01:00
vgilc c8c6c2ad1a Merge branch '1866-Cluster-Añadir-filtro-de-grupos-con-recursión-buscador-de-agentes-a-wizard-en-paso-2' into 'develop' 
Add search bar to cluster agent aggregator - #1866

See merge request artica/pandorafms!1351
 2018-03-22 10:11:43 +01:00
vgilc d5cd5963d7 Merge branch '2081-Enlace-de-ayuda-mal-en-edicion-de-agente' into 'develop' 
Help icon in module creator - #2081

See merge request artica/pandorafms!1388
 2018-03-22 10:10:49 +01:00
vgilc 9e276aa8a2 Merge branch '2026-5413-Quitar-el-parpadeo-del-reloj-digital' into 'develop' 
Not blink separator dots for digital clocks - #2026

See merge request artica/pandorafms!1356
 2018-03-22 10:04:04 +01:00
vgilc 7f30b63e98 Merge branch 'ent-2045-5325-Bug-Descripcion-MIBS' into 'develop' 
[SNMP] Fixed translation of custom mibs, added custom description data and…

See merge request artica/pandorafms!1375
 2018-03-22 10:03:16 +01:00
vgilc 9e72b6c190 Merge branch '2067-Informe_de_SLA_muestra_datos_en_not_init_al_inicio_del_grafico' into 'develop' 
fixed errors detected SLA

See merge request artica/pandorafms!1377
 2018-03-22 10:02:46 +01:00
vgilc c5af972aeb Merge branch '1598-Cron-jobs-y-permisos-dev' into 'develop' 
Added group_id in cron job(mr and migrate)

See merge request artica/pandorafms!1386
 2018-03-22 10:01:53 +01:00
vgilc d60a0dbc02 Merge branch '1922-Error-en-paginado-de-eventos-dev' into 'develop' 
Fixed module filter in view events

See merge request artica/pandorafms!1314
 2018-03-22 09:59:07 +01:00
vgilc 6b49624bc9 Merge branch 'ent-1965-5340-Bug-Visualizacion-elementos-Consola-Visual' into 'develop' 
[Visual Console] Changed simple select by group select in restricted group…

See merge request artica/pandorafms!1369
 2018-03-22 09:58:37 +01:00
vgilc f8d58cbe1f Merge branch 'ent-1971-error-en-validacion-de-alertas' into 'develop' 
[Alerts view] Fixed validation in alerts view

See merge request artica/pandorafms!1371
 2018-03-22 09:57:58 +01:00
vgilc 9e4d8e12b3 Merge branch 'ent-1978-5343-Bugs-SQL-Graphs-Custom-Reports' into 'develop' 
[Pie charts] Adding more space in legend

See merge request artica/pandorafms!1366
 2018-03-22 09:57:28 +01:00
artica 243e24e56e Auto-updated build strings. 2018-03-22 00:01:23 +01:00
enriquecd f5e8d4f90f Help icon in module creator - #2081 2018-03-21 19:18:24 +01:00
danielmaya 364daa8579 Added group_id in cron job(mr and migrate) 2018-03-21 16:51:08 +01:00
vgilc 928113bf4c Merge branch '2090-Cambio-id_os-a-100-a-sistema-operativo-asociado-a-cluster' into 'develop' 
Fix cluster id_os bug - #2090

See merge request artica/pandorafms!1384
 2018-03-21 15:49:06 +01:00
artica 199b81a79c Auto-updated build strings. 2018-03-21 00:01:22 +01:00
enriquecd 19b566d4c2 Fix cluster id_os bug - #2090 2018-03-20 15:42:37 +01:00
enriquecd a7531bbcb3 Fix migrate clusters id_os bug - #1748 2018-03-20 15:34:23 +01:00
artica 972e394a8e Auto-updated build strings. 2018-03-20 00:01:22 +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
daniel d881e0028d fixed errors detected SLA 2018-03-16 12:03:51 +01:00
artica a17c7c3e34 Auto-updated build strings. 2018-03-16 00:01:21 +01:00
fermin831 1001240cf4 [SNMP] Fixed translation of custom mibs, added custom description data and change style of OID details 2018-03-15 16:03:46 +01:00
fermin831 458938b751 Fixed mr 13 2018-03-15 14:32:51 +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
fermin831 a8cb366508 [Alerts view] Fixed validation in alerts view 2018-03-14 17:24:34 +01:00
enriquecd 2663cc1be5 Translations 720 - #1670 2018-03-14 13:59:44 +01:00
fermin831 690ad81a62 [Visual Console] Changed simple select by group select in restricted group advanced fieldin static graph 2018-03-14 13:31:54 +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
fermin831 d38df88c79 [Pie charts] Adding more space in legend 2018-03-13 19:07:31 +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
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
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
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
enriquecd 753d10920a Hide password custom fields data in agent custom fileds section - #2030 2018-03-13 12:46:27 +01:00
artica af5d70bd7d Updated version and build strings. 2018-03-13 11:06:33 +01:00