414ff282e2
Merge remote-tracking branch 'origin/ent-3431-discovery-host-devices' into ent-3394-discovery-applications
...
Former-commit-id: 2d10f49e4eb2078eebd2f6164866fe2a8412d6a3
2019-02-20 14:38:14 +01:00
4834561e87
Wiz. minor fixes
...
Former-commit-id: b3963bf5994a8f9829922e0a1b0be3a20fc54fba
2019-02-20 14:38:00 +01:00
73a5e691ef
Merge remote-tracking branch 'origin/ent-3431-discovery-host-devices' into ent-1798-monitorizacion-aws-amazon
...
Conflicts:
pandora_console/godmode/wizards/Wizard.main.php
Former-commit-id: dead86a654f8b2873721387233a9c9797b0cd8b1
2019-02-20 13:57:54 +01:00
e088b412cd
Added preload schecked values into snmp browser treeview
...
Former-commit-id: d8a3317d849263ff732cbf3a7a7714f4b41917d5
2019-02-20 13:55:21 +01:00
d4cc0f6952
Merge branch 'ent-3497-event-responses-current-user-macro' into 'develop'
...
Added the _current_user_ macro to the event responses
See merge request artica/pandorafms!2179
Former-commit-id: c468e43ec3add15487109c2c961630361bd9bdaf
2019-02-20 13:50:19 +01:00
c527378183
Merge branch 'ent-3345-Error_al_subir_imagenes_en_el_file_manager' into 'develop'
...
fixed error filemanager
See merge request artica/pandorafms!2186
Former-commit-id: d7cbd95f2b8cf86a7cdcbc85e100dc282a94d483
2019-02-20 11:42:29 +01:00
8872968600
Merge remote-tracking branch 'origin/ent-3431-discovery-host-devices' into ent-3394-discovery-applications
...
Former-commit-id: c3eed02e448a213a65159897355dc44d844b9741
2019-02-20 11:11:37 +01:00
a63e497497
Wiz. Added textarea input
...
Former-commit-id: 319ab37377e6649c1cd6c6adea1e956e934f2e23
2019-02-20 11:11:26 +01:00
33ed8a2cc1
Merge branch '3219-Vista-de-custom-fields-diferente-nodo-meta2' into 'develop'
...
Fixed bug in metaconsole custom fields2
See merge request artica/pandorafms!2070
Former-commit-id: cb36006bed0259c9e7c70c420d5e46129d64457a
2019-02-20 11:00:42 +01:00
55486e7b93
Merge branch 'ent-2836-Operaciones-masivas-filtrado-de-modulos-por-tag' into 'develop'
...
Fixed bug in filtered modules by tag
See merge request artica/pandorafms!2181
Former-commit-id: f313f0cab032ccc8329933a641db8c541b682474
2019-02-20 10:33:28 +01:00
ca243c46fb
Minor fix
...
Former-commit-id: f3c550c07a38df24b5de84200190583437586720
2019-02-20 08:52:29 +01:00
53a41a7a56
Auto-updated build strings.
...
Former-commit-id: f44eb5d91d85be5ebfaf5fe25cea0fdb40b874f3
2019-02-20 00:01:26 +01:00
69abba260a
Merge remote-tracking branch 'origin/ent-3431-discovery-host-devices' into ent-3394-discovery-applications
...
Former-commit-id: eec0a9614d1dee466d5adb59c9f39d2599360e27
2019-02-19 20:27:34 +01:00
fa3f548cdd
Several changes for Wiz.App support
...
Former-commit-id: 7c86d2e601771686a69d3f1b846638a427a25d6e
2019-02-19 20:27:05 +01:00
55af128cd5
Modified snmp browser to work with wizard
...
Former-commit-id: c8d37e06967ed43867320ae89fd3dc2bede7b0ce
2019-02-19 20:14:14 +01:00
df88582982
fixed error filemanager
...
Former-commit-id: 4bd54ef9c60396822a1a757bc91218b4d2244efa
2019-02-19 17:52:25 +01:00
218e90a663
Merge branch '2970_No_capta_bien_las_fuentes' into 'develop'
...
Fixed minor bug in pandora flot js
See merge request artica/pandorafms!1897
Former-commit-id: 7c45783033b5f856375498ec30954341a4ddc0fa
2019-02-19 17:51:19 +01:00
07db5ce37d
Merge remote-tracking branch 'origin/ent-3431-discovery-host-devices' into ent-3394-discovery-applications
...
Former-commit-id: 9ca0cec89fa7ee8dc9747ab414d95d8afd49877b
2019-02-19 17:15:14 +01:00
ea70c0846c
Added href in wizard
...
Former-commit-id: 9b6b9e66d14257163f14bc904d5b13c6de9f9912
2019-02-19 16:34:11 +01:00
04c4162419
Merge branch '339-No_cortar_elementos_en_PDF' into 'develop'
...
339 no cortar elementos en pdf
See merge request artica/pandorafms!2163
Former-commit-id: 756360a1b91e5edf2c1af80e601085f7b41b505c
2019-02-19 15:39:03 +01:00
2573e40538
Bugfix
...
Former-commit-id: 0ea7cf8437935c77098b1e408a723ac3de4d973c
2019-02-19 14:52:14 +01:00
68afc9289d
Documentation improvements
...
Former-commit-id: ad2155056dd26014f169e277eec2ac7cd463ea3a
2019-02-19 14:51:40 +01:00
1b82a970b1
WIP: App wiz
...
Former-commit-id: aa969dc2fead693977959374c747f046676c5fed
2019-02-19 14:36:16 +01:00
00cba4cbc9
Fixed bug in filtered modules by tag
...
Former-commit-id: 098d3c88a9a30fb1c38074e741f093ff40fd5d02
2019-02-19 13:05:31 +01:00
7bd5851667
Add support for column macros.
...
Former-commit-id: 8b826854c288754feefdbe270701655c6bbbfac9
2019-02-19 13:04:57 +01:00
d116e4742a
add new tocken max events responses
...
Former-commit-id: f65e6a478812a913d25fa7b87e9ac2b26b9a5ff4
2019-02-19 12:14:42 +01:00
d554dcc7db
Added the _current_user_ macro to the event responses
...
Former-commit-id: 1a5860bc7a62efecba44d467df9eb9cf7e25070b
2019-02-19 11:37:44 +01:00
8c09b945c7
minor fix changed customer check
...
Former-commit-id: f2659c9e7780dcddaa9528b1aa13a4d61026c154
2019-02-19 11:14:48 +01:00
85371424ee
Minor fixes and status check
...
Former-commit-id: 47a7e75579927c0ac109f303b77ebcc273334581
2019-02-19 11:13:07 +01:00
8ac1642dea
Merge branch 'ent-3431-discovery-host-devices' of brutus.artica.lan:artica/pandorafms into ent-3431-discovery-host-devices
...
Former-commit-id: 7b45b6f2d34e1592b9898dc94c826d138e2b6e63
2019-02-19 08:59:41 +01:00
938408ada9
Added wizard
...
Former-commit-id: d47389f000b9295c21d9a56ed0138913d0045b76
2019-02-19 08:58:30 +01:00
2b3a72e938
Auto-updated build strings.
...
Former-commit-id: cf3f4af9caa5c9c435adf672e8c620b4b173f3cc
2019-02-19 00:01:28 +01:00
af110f4820
minor fix notification direct assignment
...
Former-commit-id: 59ffb2338377ac2c3270681e6905f5d853add16b
2019-02-18 18:13:22 +01:00
9f6a96675e
Merge branch 'develop' into ent-3138-ent-Cambiar-alert-por-dialog
...
Former-commit-id: 5928dfed7bff1870450b7fe9f652d92973b21591
2019-02-18 17:34:24 +01:00
4473762393
Merge branch '3227-No-se-guarda-muestra-correctamente-certificado-ssl-en-setup-general' into 'develop'
...
fix bug when updating path of ssl certificate in general setup
See merge request artica/pandorafms!2052
Former-commit-id: 453119a3a14e50ce6834eb1ee46da2f1289d6082
2019-02-18 17:18:46 +01:00
bb83f4ba4a
avoid to show notification if disabled by user
...
Former-commit-id: d00b09c9e608c51223f7192ad85408976fac5baa
2019-02-18 17:08:23 +01:00
43ddd9d482
fixed pdf
...
Former-commit-id: e220052501d8f1b4c3d8f392cc9665876671e7ae
2019-02-18 16:34:48 +01:00
37f6da9aa8
recovered. changes from 0b72571c7c [formerly f3a8cdd6923834443ed7223d1e6ad7776b861184]
...
Former-commit-id: 591e002043d2bae2382c8a91c437057fd2b809c7
2019-02-18 15:36:51 +01:00
7b2e0342c1
Fix. notification did not reach ALL target
...
Former-commit-id: 237e5dac34bcbe50453e0b56f0964a9d74aa7c04
2019-02-18 14:18:58 +01:00
e00ae31862
Merge remote-tracking branch 'origin/develop' into 339-No_cortar_elementos_en_PDF
...
Conflicts:
pandora_console/install.php
Former-commit-id: e10a178c783187df7d07027f11b4fa1c06f923b0
2019-02-18 13:16:43 +01:00
efd65edefa
fixed errors
...
Former-commit-id: dc70e23da17691f3af6602cd85e2f01b27d27d58
2019-02-18 13:13:17 +01:00
59cd0a43ea
Merge branch '2536-Error-login-hash-al-editar-una-custom-graph-desde-la-meta' into 'develop'
...
ent-2536-Error-login-hash-al-editar-una-custom-graph-desde-la-meta
See merge request artica/pandorafms!2111
Former-commit-id: b9770bc97e741d6e6d7b0ab111c195ac3fe440df
2019-02-18 12:16:55 +01:00
01b8649812
Merge branch '1744-Opción-para-validar-que-la-ip-de-un-agente-sea-unica' into 'develop'
...
Added option in setup for unique main IP in agents - #1744
Closes pandora_enterprise#1744
See merge request artica/pandorafms!2114
Former-commit-id: 77e1bbae9a1a60bc51739d98948ca8af5d183f78
2019-02-18 12:16:20 +01:00
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
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
0ef118f401
Auto-updated build strings.
...
Former-commit-id: 2e217d82f2119ffdca6218a233fa8eeb743c3fb0
2019-02-18 00:01:24 +01:00
1fafda8502
Auto-updated build strings.
...
Former-commit-id: affb7e6fc134d1ae80be0450f759a30960b177fd
2019-02-17 00:01:24 +01:00
0d93ccc094
Auto-updated build strings.
...
Former-commit-id: 8789c127ad23a066317bd86d0bfe456dd4a3ec38
2019-02-16 00:01:31 +01:00
c49c8bc0b5
discovery minor style changes
...
Former-commit-id: ea572c9d797214cbfc6f1b9ff2025f0c4819b4ed
2019-02-15 18:44:59 +01:00
5093094d7d
H&D tasklist and some visual changes
...
Former-commit-id: d9130ec520b0c23a9cf42ce62aae6c3d2432649b
2019-02-15 18:05:59 +01:00
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
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
087978aa70
fixed errors in reports
...
Former-commit-id: de2cb22c4545dd5ae859f7059e5c8ba13a195723
2019-02-15 14:36:58 +01:00
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
e397353f71
minor fix get_parameter_switch
...
Former-commit-id: c8e430e1cbd789a99058217e7dffb4098aab821a
2019-02-15 14:03:16 +01:00
32d34cd09b
Changed styles in host and devices
...
Former-commit-id: 743f203466e8e3745a33837054e5bc4faa69337c
2019-02-15 14:02:32 +01:00
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
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
efdc17b801
WIP: H&D
...
Former-commit-id: 605aa350c6d8d9bcebadbb941bba2a6fc399cb7c
2019-02-15 13:08:44 +01:00
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
f777c59a83
WIP: H&D skel files css wiz&discov
...
Former-commit-id: e57758a9e77b19868262557d9e11a0ff7b38f02c
2019-02-15 10:00:23 +01:00
ffe8bba3f7
added exception in ldapsearch
...
Former-commit-id: 4ab1637c30cac2bb4c827b1e08017f6b08fae1b9
2019-02-15 09:10:21 +01:00
cd83f324a1
Auto-updated build strings.
...
Former-commit-id: 3efb9b48fb3cc1021d0b3e7752c3cd1607e863a5
2019-02-15 00:01:26 +01:00
7df9d4f78b
WIP: H&D merge
...
Former-commit-id: d53f7d5abed5cfc8d45e6a42bfd52089ff463ff3
2019-02-14 17:14:01 +01:00
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
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
40143a1402
fixed reports
...
Former-commit-id: 99e8d84b1db440156f8b382ded51be7c39322eed
2019-02-14 15:50:13 +01:00
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
8acb658266
WIP: H&D
...
Former-commit-id: 7e74f1330b7e5cfdab3757ec62523942a1b4fe9f
2019-02-14 13:27:49 +01:00
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
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
57991495e4
Use the CSV extension to import CSV on host and devices
...
Former-commit-id: ed95b09992ee681e35e7f934b8a8ac70c83bc8be
2019-02-14 10:30:01 +01:00
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
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
f91635c67c
fixed errors in pdf reports
...
Former-commit-id: fbc3598ab2dfd11cc2bfa850ba49b3e35481218d
2019-02-14 07:46:19 +01:00
f0338cd08e
Auto-updated build strings.
...
Former-commit-id: d0d40baca6720eb12b085a1968d827b8e9e767b0
2019-02-14 00:01:26 +01:00
c0dd81cab5
Merge branch 'ent-3277-Error_al_guardar_password_en_chequeos_wmi' into 'develop'
...
Fixed WMI passwords when encrypted
See merge request artica/pandorafms!2164
Former-commit-id: 7c2aeffb2849a3539569b2706b4ca613e1c632a8
2019-02-13 18:33:11 +01:00
5b4cadf138
minor style fix
...
Former-commit-id: ca2dcf89672832b7796c9b9cc555d36d9db503ec
2019-02-13 17:16:12 +01:00
f75a292b34
minor fixes/updates in notifications UI
...
Former-commit-id: d4f5b7db1b5a6f0a023e33c4b8cd55db7765b11a
2019-02-13 16:40:37 +01:00
f7134b6d81
Merge branch 'ent-3377-Bug_Manager_Update_Online_de_la_version_OpenSource' into 'develop'
...
Ent 3377 bug manager update online de la version open source
See merge request artica/pandorafms!2171
Former-commit-id: f353173953ab39af5bd6e1f39d41e37c7476618a
2019-02-13 15:56:19 +01:00
7f4353c4bc
optimized. events_has_extended_info
...
Former-commit-id: 2435badcea24fd5777bde358658409bf947a2d4b
2019-02-13 15:55:03 +01:00
453c639c53
optimized. events_has_extended_info
...
Former-commit-id: 805b80f1a9e09425b0e5710906886ae39e791753
2019-02-13 15:54:40 +01:00
4c809ba8d2
event query optimization
...
Former-commit-id: 322868d281ddeac4006480bac6dbf03434ffefa1
2019-02-13 15:41:34 +01:00
9951aadab3
Fixed typo
...
Former-commit-id: 469f46c34caefcb6b810e99f88a9223434959182
2019-02-13 15:04:53 +01:00
74e16b656b
Disable max postpone select
...
Former-commit-id: 43460b3304b70d6d0248ace672d51c2b48c3d22c
2019-02-13 15:03:59 +01:00
ed63ef47fa
Moved ReconServer to DiscoveryServer
...
Former-commit-id: 5e18aa75d669f6b45d3b4e2648f31473fd206091
2019-02-13 14:56:10 +01:00
0ecf2bb9c4
Added pandora db messages purgue
...
Former-commit-id: 23d1f55ac6b7d6d5470fa25860b9bbb1575875df
2019-02-13 14:43:55 +01:00
bf0fc07533
Merge branch 'develop' into 3219-Vista-de-custom-fields-diferente-nodo-meta2
...
Conflicts:
pandora_console/include/functions_events.php
Former-commit-id: 00b8cb47f7294fa6cd3c3fe257e18a1e56759580
2019-02-13 14:38:56 +01:00
855822f61e
Fixed arrow on notifications area
...
Former-commit-id: 6771d282bf7a6b5b9ddd0baec8a0a887f741d931
2019-02-13 12:44:30 +01:00
6a9e69adb1
Added changes
...
Former-commit-id: 0d0de6dba065aaaa5bbfc4b9f9790e4ef1b92b7d
2019-02-13 12:21:31 +01:00
b11d1a6687
Merge branch 'develop' into ent-3120-Cambio-de-radio-buttons-yes-no-por-checkbox-2-parte
...
Conflicts:
pandora_console/godmode/setup/setup_auth.php
pandora_console/include/functions_api.php
pandora_console/install.php
Former-commit-id: 70caf6f8d0b99057c55b21c8e3b4317a343923fb
2019-02-13 12:03:46 +01:00
fe50d6caff
Open toasts and messages into new window
...
Former-commit-id: ff3d565247225032219d4bbb5fa903bdae7730e8
2019-02-13 11:09:15 +01:00
eeb5f0e296
Merge remote-tracking branch 'origin/develop' into 339-No_cortar_elementos_en_PDF
...
Conflicts:
pandora_console/include/functions_reporting_html.php
pandora_console/install.php
Former-commit-id: 8f8f95cebc06d0a6802c6a7204a942658efa21f0
2019-02-13 08:02:46 +01:00
93edda07ee
fixed errors
...
Former-commit-id: 167c9a725e5dbd4f4ae1db0b6fb6c573a364c122
2019-02-13 07:55:21 +01:00
0e39e3fef7
Auto-updated build strings.
...
Former-commit-id: 7c2aabad85c99a55d80b3dc856c931f160cb35d7
2019-02-13 00:01:37 +01:00
48724fe033
Added onclick to notification-item's
...
Former-commit-id: 2e4833686b08b104b11ba9023f6eca38e0ed6bd9
2019-02-12 16:46:21 +01:00
4f158ed61b
Merge branch 'ent-3305-pandora-db-esta-reseteando-alertas-incorrectamente' into 'develop'
...
Validate alerts at the time agents/modules are modified.
Closes pandora_enterprise#3305
See merge request artica/pandorafms!2155
Former-commit-id: 6dead1fed27249ea1913e70530571d33b76cf3ff
2019-02-12 16:38:01 +01:00
cc2b2709f9
Show the notifications with AJAX
...
Former-commit-id: 73f407d13d3805dce879c1431311a4aaec00c152
2019-02-12 16:25:59 +01:00
35ea03ddf6
Fixed notifications global configuration. Do not disable the multiple selects.
...
Former-commit-id: c5148e3adad63300c2b938a78eb46974cceff761
2019-02-12 15:36:41 +01:00
325f5e8775
Added onclik con notification toasts
...
Former-commit-id: 7d0c7a7cc9dacc0e52c7f362a3301ed87a7205d3
2019-02-12 15:27:14 +01:00
fbsanchez
fermin831
Daniel Rodriguez
Alejandro Fraguas
artica
daniel
manuel
Alejandro Gallardo Escobar
Ramon Novoa
Tatiana Llorente
alejandro-campos
Daniel Maya
samucarc