adb25e91f8
Merge remote-tracking branch 'origin/ent-3621-Discover-vista-de-tasks-bloqueada-y-duplicada' into ent-3595-discovery-fase-2
...
Former-commit-id: 157ed627078c5e6cfedd6ed9d509a339cdb01632
2019-03-01 11:09:11 +01:00
b4170ca285
minor fixes, removed tuser_task_scheduled from tasklist, also cde over ipam references
...
Former-commit-id: 46be3614b9aeb9837748149a805427d68a07f566
2019-03-01 11:08:49 +01:00
d547024274
fixes non-enterprise components
...
Former-commit-id: c22cec27d981c119531a0049469847b9d1a848eb
2019-03-01 09:51:16 +01:00
ed9b736299
Merge remote-tracking branch 'origin/ent-3621-Discover-vista-de-tasks-bloqueada-y-duplicada' into ent-3595-discovery-fase-2
...
Former-commit-id: 9dcad6195eb21f84d90b570828791338ff069ddd
2019-03-01 09:50:09 +01:00
46089b31a8
Merge branch 'develop' into ent-3594-Unificacion-de-tamaños-de-checkbox-switch
...
Conflicts:
pandora_console/install.php
Former-commit-id: 3dee86da8f6b6b1c2caa5e6e1529acd7f60c1433
2019-02-28 13:36:18 +01:00
52d6dfe815
fix discover task view
...
Former-commit-id: 5475d6be802cd4e7280d12aed6f8f91f7833ed98
2019-02-28 12:00:43 +01:00
75b889ff4a
Merge branch 'ent-3430-proyecto-discovery' into 'develop'
...
Ent 3430 proyecto discovery
See merge request artica/pandorafms!2210
Former-commit-id: 104df0b898d6f4bb9eef21005cca6a3f74c3e035
2019-02-27 10:02:14 +01:00
e18eaaf415
Merge branch 'ent-3287-sincronizacion-plugin-de-servidor' into 'develop'
...
Ent 3287 sincronizacion plugin de servidor
See merge request artica/pandorafms!2199
Former-commit-id: 2153828c0deb35bd72dd6b39612c947b56782c40
2019-02-27 09:58:42 +01:00
7ed3252ca5
minor fixes
...
Former-commit-id: 75b33343bed508ff3ff136fa0fedc5d9d8c952be
2019-02-26 20:23:52 +01:00
24a1adfb9f
minor fix
...
Former-commit-id: 6729d11217d0fecb7b64283b6e4d0485b9bdfdc8
2019-02-26 20:08:01 +01:00
a8874f9b1b
Minor fixes
...
Former-commit-id: c3abb9964c61f0535ab59644f6eb1d0a8328212a
2019-02-26 20:00:41 +01:00
5382f07ae2
Comment updates in wizard class
...
Former-commit-id: 9fbb1d0c6499dd1ad71c472970b3993193b581da
2019-02-26 17:42:12 +01:00
5b3ce09515
Comment updates in wizard class
...
Former-commit-id: 0b820729a631d906fe4816ba74f84f700b500c01
2019-02-26 17:41:42 +01:00
2c0c050507
Disabled cache in server plugin synchronization
...
Former-commit-id: c8d60db8aece2db8611ee7d8ac44347f661d9b83
2019-02-26 17:20:23 +01:00
c886dd1dfa
Merge branch 'develop' into ent-3594-Unificacion-de-tamaños-de-checkbox-switch
...
Conflicts:
pandora_console/include/functions_html.php
pandora_console/include/styles/pandora.css
pandora_console/install.php
Former-commit-id: 5cd5899c222ba13ec9bfa0212e5d2ec580353787
2019-02-26 12:31:37 +01:00
45419fbfb0
Fixed href in plugins with centralized node
...
Former-commit-id: 03fa2c15b7a9fb14cdc12499c3bc2a204bae3cd5
2019-02-26 12:23:46 +01:00
875d7ecaba
Unified sizes of the checkbox switch
...
Former-commit-id: f6f8eca748f67fdf1e4a98256c3ca590b61328ac
2019-02-26 12:04:18 +01:00
c38ac4b837
Updated breadcrum
...
Former-commit-id: 51c14ea50e6c7d419d610ef1b52c4769214495ef
2019-02-26 10:34:37 +01:00
5812a8bdaa
Merge remote-tracking branch 'origin/develop' into ent-3287-Sincronización-plugin-de-servidor
...
Former-commit-id: 93fd236f1876132a18aae31f8ccbcd888a1613f0
2019-02-25 15:43:33 +01:00
d8ee90c285
Merge remote-tracking branch 'origin/develop' into ent-3430-discovery
...
Former-commit-id: cd7b77b0fe8fa41f03024af752b8793ae877de2b
2019-02-25 14:42:48 +01:00
cdca720d9a
minor fix user_edig
...
Former-commit-id: 2e13b75edd5625fa2d1d6d9360d55a19f0992ac0
2019-02-25 14:41:27 +01:00
7f01e47e1f
Merge branch '3281-Vista-monitor-detail-personalizar-campos-a-mostrar' into 'develop'
...
ent-3281-Vista-monitor-detail-personalizar-campos-a-mostrar
See merge request artica/pandorafms!2132
Former-commit-id: bebade5b9cd293eb6f062f5b6fb85aaad673a9b8
2019-02-25 13:48:37 +01:00
be7eadeb2c
extend status change functionality in monitor detail view custom fields
...
Former-commit-id: e48ae88416f50b47aac79ae28b9b4bcd08ebdf73
2019-02-25 11:32:26 +01:00
1f26a8c4b3
Updated message warnings in Tasklist
...
Former-commit-id: beb870813818ff8a7000ffaac7e09f326f0bf253
2019-02-25 11:30:09 +01:00
4da8f54f84
Updated message warnings in Tasklist
...
Former-commit-id: 9f8324e4f882e14451bda7034b1ff081c14a7a41
2019-02-25 11:29:39 +01:00
797f922748
Discovery Tasklist minor fixes
...
Former-commit-id: 693f181168f74f93ad9a3ce628d0defd9ef72d02
2019-02-23 12:13:54 +01:00
8b5f50f883
Discovery minor fixes
...
Former-commit-id: 3914d7a99fb70d88c1a1f95d3c2aeb100f277266
2019-02-22 19:18:07 +01:00
12b8042c53
Added server plugins in meta
...
Former-commit-id: 7f69f55c3fad06c7b15408d755d088d5ac89b111
2019-02-22 14:26:58 +01:00
f0c9d16318
fixed errors view discovery task list
...
Former-commit-id: 7e3160cde5c0fa46ee3d918789ffec4091f42c31
2019-02-22 13:45:59 +01:00
3d2bfa95b5
add table console task in discovery
...
Former-commit-id: b13571167c063188102a8473fb57fa63c18bece3
2019-02-22 12:53:35 +01:00
b1aa0fe2f2
Merge from develop
...
Former-commit-id: 043b38c0e4ea96e0e39cc2480420164dd0f5d3b7
2019-02-22 12:30:27 +01:00
e55915e1e2
Merge branch 'ent-3199-Parsear-espacios-al-final-y-caracteres-especiales-al-introducir-nombre-agente-en-consola' into 'develop'
...
3199-Parsear-espacios-al-final-y-caracteres-especiales-al-introducir-nombre-agente-en-consola into develop
See merge request artica/pandorafms!2193
Former-commit-id: c6e976b78254e6b5b82dddf206c419737bd99a83
2019-02-22 10:01:43 +01:00
45bba4faa8
fix agent name input
...
Former-commit-id: 51b7566719392d1cc43ca04a9ec91ae007e73feb
2019-02-21 19:00:47 +01:00
64679ee72e
discovery minor fixes
...
Former-commit-id: 6d7a1a75bcb6844c839f34a2a2bfaf3f96734db8
2019-02-21 18:00:50 +01:00
9e9d915609
Modified redirection
...
Former-commit-id: 77dd6fee3a71064e790bd020afbcc91edbdfe20c
2019-02-21 15:35:44 +01:00
36410a26d1
Merge branch 'ent-3436-custom-fields-como-macros-en-el-server' into 'develop'
...
Add support for column macros.
See merge request artica/pandorafms!2182
Former-commit-id: 93dad8f6c54f6e46e5e54dab347a96cffe2fd240
2019-02-21 14:38:21 +01:00
4148387c50
Updates discovery
...
Former-commit-id: e99072a2b7a1ddd528698e12bdfe75b0b56ba25b
2019-02-21 13:05:48 +01:00
ba87d6a9b8
Merge branch 'ent-3214-exact-oid-matches' into 'develop'
...
Add support for exact matches to SNMP alerts.
See merge request artica/pandorafms!2090
Former-commit-id: 5e4c43a5343f7fa6992c05c93c0695b1881548b9
2019-02-21 11:35:51 +01:00
c385a3191f
minor fixes
...
Former-commit-id: ffb62390a5edaa158507f253cf7fb23c690f8fcf
2019-02-21 11:21:56 +01:00
ad3e2b88bf
Minor fixes Wiz.Discovery
...
Former-commit-id: 750cd3ab1902ed3eda9806aa9b505d5e4a1175be
2019-02-21 11:19:38 +01:00
08c6d782a4
Add menuentry discovery
...
Former-commit-id: bc40f0bda89947a88a912484642aa3c89ded64f8
2019-02-20 18:24:32 +01:00
0ed6c6d620
Merge branch 'ent-3430-discovery' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3430-discovery
...
Conflicts:
pandora_console/godmode/wizards/Wizard.main.php
Former-commit-id: 570168ca638ea3403de5768b08c640a909aa27d2
2019-02-20 16:54:52 +01:00
f49b26692e
Fixes on wizards
...
Former-commit-id: 98804bde49e19a7ecb3e2749a8955ac656da54a8
2019-02-20 16:47:29 +01:00
8266c716e8
Merge branch 'ent-3138-ent-Cambiar-alert-por-dialog' into 'develop'
...
Cambiar alert por dialog
See merge request artica/pandorafms!2178
Former-commit-id: b8d1f9f1797ef1d3f54975ca8a695f0a5033938e
2019-02-20 16:37:03 +01:00
300626e551
Merge remote-tracking branch 'origin/develop' into ent-3499-Numero_de_respuestas_de_eventos_masivas
...
Former-commit-id: 4a8482ccef3661c83553dff8f5533c29321f95f2
2019-02-20 15:38:15 +01:00
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
331b09c520
Merge remote-tracking branch 'origin/ent-3431-discovery-host-devices' into ent-3394-discovery-applications
...
Former-commit-id: 7220701d8016a2963cd80cb807bf037af37c2730
2019-02-20 12:32:27 +01:00
f19bdf956e
Wiz. minor fix default value url in goback button
...
Former-commit-id: 434b2acb09290f11c8804024adb8834b86eeda73
2019-02-20 12:32:12 +01:00
fbsanchez
manuel
alejandro-campos
Alejandro Fraguas
Daniel Rodriguez
Daniel Maya
daniel
fermin831