fbsanchez
|
7a1b66755d
|
minor fixes H&D
Former-commit-id: a4ffc2e761dc0a4d06209fb1c448bc17d5d45022
|
2019-02-15 16:06:28 +01:00 |
|
fbsanchez
|
45fd528e38
|
minor fixes H&D
Former-commit-id: c3236b91b4b6a0f37af2d4da4955c711dd4ace43
|
2019-02-15 16:02:55 +01:00 |
alejandro-campos
|
46de260573
|
Merge branch 'develop' into 2536-Error-login-hash-al-editar-una-custom-graph-desde-la-meta
Former-commit-id: 36cdf03e3debabc0a079f08a457c8d2c0ac1c165
|
2019-02-15 15:55:31 +01:00 |
|
alejandro-campos
|
337b846f48
|
Merge branch 'develop' into 3141-SQL-query-a-la-propia-metaconsola
Former-commit-id: 16a42b43088f8f99b9c33fe05a53f220598b2135
|
2019-02-15 15:35:57 +01:00 |
|
alejandro-campos
|
41c4ad8d90
|
Merge branch 'develop' into 3154-Agent-name-en-vistas-de-alertas-de-consola-movil
Former-commit-id: aa3d44b06df07f90092f6bab50b2c6ef63660fc5
|
2019-02-15 15:30:36 +01:00 |
|
alejandro-campos
|
0c99fe279f
|
Merge branch 'develop' into 3199-Parsear-espacios-al-final-y-caracteres-especiales-al-introducir-nombre-agente-en-consola
Former-commit-id: 2b9c06e16291022e626c42503c45776193a0c5ce
|
2019-02-15 15:13:45 +01:00 |
|
alejandro-campos
|
c16fb1696d
|
Merge branch 'develop' into 3222-Deshabilitar-doble-autenticacion-si-no-esta-activada
Former-commit-id: 6024bd09f1bb77c7610a8adbb72a92631ad6e59d
|
2019-02-15 15:03:42 +01:00 |
|
alejandro-campos
|
2c97708373
|
Merge branch 'develop' into 3227-No-se-guarda-muestra-correctamente-certificado-ssl-en-setup-general
Former-commit-id: d6becbfc3aba9d5197b748647db5e93e3b58c348
|
2019-02-15 14:56:20 +01:00 |
Daniel Rodriguez
|
28472ddc7d
|
Merge branch '3373-Añadir-opcion-a-mas-parametros-en-api_get_groups' into 'develop'
ent-3373-Añadir-opcion-a-mas-parametros-en-api_get_groups
See merge request artica/pandorafms!2127
Former-commit-id: a614183a0f077c8fb88c5b3eb5e52aa3c31e8e23
|
2019-02-15 14:38:27 +01:00 |
daniel
|
087978aa70
|
fixed errors in reports
Former-commit-id: de2cb22c4545dd5ae859f7059e5c8ba13a195723
|
2019-02-15 14:36:58 +01:00 |
|
alejandro-campos
|
e4ca9b7fc8
|
Merge branch 'develop' into 3281-Vista-monitor-detail-personalizar-campos-a-mostrar
Former-commit-id: 1683307f273ba5676ec61709403249b24113c47f
|
2019-02-15 14:22:55 +01:00 |
|
fbsanchez
|
c62c01c4a0
|
H&D minor fix - visual
Former-commit-id: 57d1e3c62192d9568bfa4db11658e31a8d811a3a
|
2019-02-15 14:14:56 +01:00 |
manuel
|
e04a61df98
|
Merge branch 'ent-3431-discovery-host-devices' of brutus.artica.lan:artica/pandorafms into ent-3431-discovery-host-devices
Former-commit-id: 1744720e44aea863fb01c328cb2d25382d2c40a8
|
2019-02-15 14:03:29 +01:00 |
|
fbsanchez
|
e397353f71
|
minor fix get_parameter_switch
Former-commit-id: c8e430e1cbd789a99058217e7dffb4098aab821a
|
2019-02-15 14:03:16 +01:00 |
|
manuel
|
32d34cd09b
|
Changed styles in host and devices
Former-commit-id: 743f203466e8e3745a33837054e5bc4faa69337c
|
2019-02-15 14:02:32 +01:00 |
|
fbsanchez
|
ec672d6bfb
|
H&D network scan
Former-commit-id: dcd22994d6addf69ab5d68a6724d12e26e994d15
|
2019-02-15 13:57:33 +01:00 |
|
alejandro-campos
|
196de9ae3d
|
Merge branch 'develop' into 3373-Añadir-opcion-a-mas-parametros-en-api_get_groups
Former-commit-id: b8436e3dcbc1b23de21653fcbaff88c544c79562
|
2019-02-15 13:54:28 +01:00 |
Fermin
|
6c485795c7
|
Merge branch 'ent-3431-discovery-host-devices' into ent-1798-monitorizacion-aws-amazon
Former-commit-id: adb71ba49b8d3e6081aaa8c91af8c42e7c18c689
|
2019-02-15 13:48:08 +01:00 |
|
Fermin
|
c9c855da9a
|
Added new Cloud Wizard class
Former-commit-id: 789af2b6cba344bac44b34c4c90228801f2468a0
|
2019-02-15 13:47:11 +01:00 |
Tatiana Llorente
|
6c9ce7e65b
|
Merge remote-tracking branch 'origin/develop' into 1744-Opción-para-validar-que-la-ip-de-un-agente-sea-unica
Conflicts:
pandora_console/godmode/setup/setup_general.php
pandora_console/include/styles/pandora.css
pandora_console/install.php
Former-commit-id: b94f977a4d39f2e9e59b7ed9626115b0a458c5dd
|
2019-02-15 13:18:10 +01:00 |
|
fbsanchez
|
efdc17b801
|
WIP: H&D
Former-commit-id: 605aa350c6d8d9bcebadbb941bba2a6fc399cb7c
|
2019-02-15 13:08:44 +01:00 |
|
Tatiana Llorente
|
a20d7b9ce1
|
Merge remote-tracking branch 'origin/develop' into ent-3426-No-desaparece-la-alerta-de-PhantomJS-en-windows
Conflicts:
pandora_console/install.php
Former-commit-id: ef2b7fb631fab61bcb5e21b0632f02a3af451045
|
2019-02-15 12:10:49 +01:00 |
samucarc
|
442e0306ea
|
Merge branch 'develop' into ent-3108-Aplicar_una_politica_a_un_solo_agente_con_API_CLI
Former-commit-id: 496f7fa859c5745dcd22d73afe9426a46e772a9a
|
2019-02-15 11:15:58 +01:00 |
|
fbsanchez
|
f777c59a83
|
WIP: H&D skel files css wiz&discov
Former-commit-id: e57758a9e77b19868262557d9e11a0ff7b38f02c
|
2019-02-15 10:00:23 +01:00 |
Daniel Maya
|
ffe8bba3f7
|
added exception in ldapsearch
Former-commit-id: 4ab1637c30cac2bb4c827b1e08017f6b08fae1b9
|
2019-02-15 09:10:21 +01:00 |
artica
|
cd83f324a1
|
Auto-updated build strings.
Former-commit-id: 3efb9b48fb3cc1021d0b3e7752c3cd1607e863a5
|
2019-02-15 00:01:26 +01:00 |
|
fbsanchez
|
96fccc578c
|
WIP: H&D
Former-commit-id: 82a6c84a2c896a08f420a89dc3fe6cd79d8ff3bb
|
2019-02-14 17:56:10 +01:00 |
|
fbsanchez
|
2059614ba2
|
missed install...
Former-commit-id: a2e1bc42354612afde7e1a28845348f41eab7509
|
2019-02-14 17:20:00 +01:00 |
|
fbsanchez
|
3995874176
|
WIP: H&D: merge
Former-commit-id: c1e04b80a49fb0a9870676dc8f59732cd595fbc0
|
2019-02-14 17:19:20 +01:00 |
|
fbsanchez
|
7df9d4f78b
|
WIP: H&D merge
Former-commit-id: d53f7d5abed5cfc8d45e6a42bfd52089ff463ff3
|
2019-02-14 17:14:01 +01:00 |
|
Daniel Rodriguez
|
52c4b3dab1
|
Merge branch 'ent-2806-Administracion_base_de_datos_de_historico' into 'develop'
add params setup historic database
See merge request artica/pandorafms!2154
Former-commit-id: ef832c053b6e678ec48c95a5494aa2b774b533ed
|
2019-02-14 17:00:56 +01:00 |
|
fermin831
|
0d7ea0d056
|
Added CSV report and copy a lot of not revisted code
Former-commit-id: 005362b157450862501963770df3fd0419bc573a
|
2019-02-14 16:56:03 +01:00 |
|
Daniel Barbero
|
624d804168
|
Fixed minor error
Former-commit-id: 05fc8b97c42ee9907954cb28d9e560c9076d50e9
|
2019-02-14 16:53:01 +01:00 |
|
Tatiana Llorente
|
f849c2b0f0
|
Merge remote-tracking branch 'origin/develop' into ent-3426-No-desaparece-la-alerta-de-PhantomJS-en-windows
Conflicts:
pandora_console/include/styles/pandora.css
pandora_console/install.php
Former-commit-id: d74f5cb5c6ff0cc05542e63d1f8537f289eebfc8
|
2019-02-14 16:41:17 +01:00 |
|
Daniel Barbero
|
d9ba3af358
|
Fixed errors in setup performances
Former-commit-id: 1eb48c00f527f43504a41aea8b352f30792e080b
|
2019-02-14 16:31:19 +01:00 |
Alejandro Fraguas
|
4c94956b91
|
Merge branch 'ent-3459-7439-vista-de-edit-item-report-template-muy-lenta-debido-a-query-no-optimizada' into 'develop'
Fixed slow query in template item
See merge request artica/pandorafms!2151
Former-commit-id: db1f74b219dcac4180690d56310dcc2a11acd14d
|
2019-02-14 16:15:01 +01:00 |
|
Daniel Barbero
|
40143a1402
|
fixed reports
Former-commit-id: 99e8d84b1db440156f8b382ded51be7c39322eed
|
2019-02-14 15:50:13 +01:00 |
|
Alejandro Fraguas
|
04e8962cec
|
Merge branch 'ent-2967-6662-Error-504-en-vista-de-eventos' into 'develop'
Ent 2967 6662 error 504 en vista de eventos
See merge request artica/pandorafms!2167
Former-commit-id: 4096c814248a75bbe5e75858b31ee040379d6486
|
2019-02-14 14:55:33 +01:00 |
|
fbsanchez
|
8acb658266
|
WIP: H&D
Former-commit-id: 7e74f1330b7e5cfdab3757ec62523942a1b4fe9f
|
2019-02-14 13:27:49 +01:00 |
|
fbsanchez
|
070db506b8
|
WIP: H&D
Former-commit-id: 8f66bccf64b219df20d19d72eb41bec8acdd9bbc
|
2019-02-14 11:53:06 +01:00 |
|
fbsanchez
|
685d8c04c2
|
WIP H&D base structure
Former-commit-id: dace1164c5a568adbb98c187106838d25334f934
|
2019-02-14 11:32:07 +01:00 |
|
fbsanchez
|
3e9e668e00
|
Merge remote-tracking branch 'origin/ent-3430-discovery' into ent-3431-discovery-host-devices
Former-commit-id: e20038920481419abfaeddc665b3369f90b49fef
|
2019-02-14 10:59:27 +01:00 |
|
fbsanchez
|
6ff357595d
|
Merge remote-tracking branch 'refs/remotes/origin/ent-3431-discovery-host-devices' into ent-3431-discovery-host-devices
Former-commit-id: 8210f6bb9abb2c666b6cf4e914d87bb92e8b0690
|
2019-02-14 10:58:26 +01:00 |
|
fbsanchez
|
0db88817a9
|
WIP H&D
Former-commit-id: c3b0b6f56ff0591f8c5839d61144bbb72ddd7033
|
2019-02-14 10:56:25 +01:00 |
|
fbsanchez
|
6e7369d672
|
Merge branch 'ent-3381-eventos-extendidos' into 'ent-3430-discovery'
Ent 3381 eventos extendidos
See merge request artica/pandorafms!2169
Former-commit-id: b8a4fd52a30b8cc34c2417499ce3b4a60c027edf
|
2019-02-14 10:51:04 +01:00 |
|
fbsanchez
|
beb47ec480
|
Merge branch 'ent-3371-sistema-de-notificaciones-pandora' into 'ent-3430-discovery'
Ent 3371 sistema de notificaciones pandora
See merge request artica/pandorafms!2129
Former-commit-id: 3a3a2a28f817cf13365bace9d6b963055b0fef75
|
2019-02-14 10:50:29 +01:00 |
|
fermin831
|
57991495e4
|
Use the CSV extension to import CSV on host and devices
Former-commit-id: ed95b09992ee681e35e7f934b8a8ac70c83bc8be
|
2019-02-14 10:30:01 +01:00 |
|
Daniel Barbero
|
52bf8befd2
|
Merge remote-tracking branch 'origin/develop' into 3404-Mejoras_y_arreglos_en_la_instalación_de_la_consola
Conflicts:
pandora_console/install.php
Former-commit-id: 02eb23f0147608c8154aad2c312d8f9d84390806
|
2019-02-14 08:06:19 +01:00 |
|
Daniel Barbero
|
0fb61444f6
|
Merge remote-tracking branch 'origin/develop' into ent-2806-Administracion_base_de_datos_de_historico
Conflicts:
pandora_console/godmode/setup/performance.php
pandora_console/include/functions_api.php
pandora_console/install.php
Former-commit-id: e8fc07d1f10723700114949b30e9f3770208149e
|
2019-02-14 08:01:23 +01:00 |
|
Daniel Barbero
|
444b5c4bfd
|
Merge remote-tracking branch 'origin/develop' into 339-No_cortar_elementos_en_PDF
Conflicts:
pandora_console/install.php
Former-commit-id: f26bcce527ebe225454700e8feca21610f91b20f
|
2019-02-14 07:51:53 +01:00 |