fermin831
|
a6bbd17423
|
Merge branch 'ent-3431-discovery-host-devices' into ent-1798-monitorizacion-aws-amazon
Former-commit-id: 11a9f65a87b0b479791aa76e4936cebfb5ab7424
|
2019-02-18 10:24:35 +01:00 |
|
fermin831
|
a9caebbbf4
|
Put the list into a function
Former-commit-id: 11e4d0faa3512e46582530f48bab2cfa1031e89f
|
2019-02-18 10:24:19 +01:00 |
Tatiana Llorente
|
4017539728
|
Merge remote-tracking branch 'origin/develop' into 1744-Opción-para-validar-que-la-ip-de-un-agente-sea-unica
Conflicts:
pandora_console/install.php
Former-commit-id: 25f781cc2a2be2258e2ad601353afd9f80561a7c
|
2019-02-18 09:27:40 +01:00 |
|
Tatiana Llorente
|
582b8a70da
|
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: 0c97025f2425b1048efd1447a56ea9e2062b3b13
|
2019-02-18 09:22:48 +01:00 |
|
fermin831
|
2332001884
|
Merge branch 'ent-3431-discovery-host-devices' into ent-1798-monitorizacion-aws-amazon
Conflicts:
pandora_console/godmode/servers/discovery.php
Former-commit-id: 4e840a1738523e2e0570413e8e7dedb02b265919
|
2019-02-18 08:50:54 +01:00 |
artica
|
0ef118f401
|
Auto-updated build strings.
Former-commit-id: 2e217d82f2119ffdca6218a233fa8eeb743c3fb0
|
2019-02-18 00:01:24 +01:00 |
|
artica
|
1fafda8502
|
Auto-updated build strings.
Former-commit-id: affb7e6fc134d1ae80be0450f759a30960b177fd
|
2019-02-17 00:01:24 +01:00 |
|
artica
|
0d93ccc094
|
Auto-updated build strings.
Former-commit-id: 8789c127ad23a066317bd86d0bfe456dd4a3ec38
|
2019-02-16 00:01:31 +01:00 |
fbsanchez
|
c49c8bc0b5
|
discovery minor style changes
Former-commit-id: ea572c9d797214cbfc6f1b9ff2025f0c4819b4ed
|
2019-02-15 18:44:59 +01:00 |
|
fbsanchez
|
912f0baace
|
Discovery Tasks first tasks and some minor fixes
Former-commit-id: 4a37dc99f1b1a95217e9be207526d750133a14a6
|
2019-02-15 18:42:44 +01:00 |
|
fbsanchez
|
a5ad61f340
|
discovery delete task
Former-commit-id: 8809067053aa6bebfa61498afb2108aea352f3d7
|
2019-02-15 18:35:35 +01:00 |
|
fbsanchez
|
5093094d7d
|
H&D tasklist and some visual changes
Former-commit-id: d9130ec520b0c23a9cf42ce62aae6c3d2432649b
|
2019-02-15 18:05:59 +01:00 |
|
fbsanchez
|
0f375d6a76
|
H&D minor fix group cannot be All
Former-commit-id: 2feb42ce06bd379bbb3804a30fab744a4b01b1e1
|
2019-02-15 16:37:48 +01:00 |
|
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 |