Commit Graph

12326 Commits

Author SHA1 Message Date
artica c9843d949a Auto-updated build strings. 2017-01-21 00:01:30 +01:00
vgilc add928bde0 Merge branch '4261_no_meter_archivos_open' into 'pandora_6.0'
fixed errors

See merge request !65
2017-01-20 14:51:42 +01:00
daniel 5e76989f91 fixed errors 2017-01-20 14:49:33 +01:00
vgilc 90a8668f66 Merge branch '164-CLI-update_module-no-deslinka' into 'pandora_6.0'
164 cli update module no deslinka

See merge request !56
2017-01-20 12:19:13 +01:00
artica d229edec1c Auto-updated build strings. 2017-01-20 00:01:32 +01:00
fbsanchez 78b2e0bd95 Merge branch 'pandora_6.0' into 164-CLI-update_module-no-deslinka 2017-01-19 18:13:27 +01:00
vgilc 0d016b8e26 Merge branch 'cli-web-module-creation' into 'pandora_6.0'
Cli web module creation

See merge request !57
2017-01-19 17:56:10 +01:00
fbsanchez f4729a12dd Fixed: Unlink module from policy on module update (ticket: 3090 // 2673) 2017-01-19 17:54:11 +01:00
enriquecd 915d641920 Add definition_file content to bd for web modules - #4261
(cherry picked from commit 919119e7be)
2017-01-19 17:51:48 +01:00
enriquecd 7e2a7c0b95 Add create_web_module and create_policy_web_module help info about valid fields #4261
(cherry picked from commit b3206791d9)
2017-01-19 17:51:36 +01:00
enriquecd 77ad5379a6 Add create_web_module and create_policy_web_module functions #4261
(cherry picked from commit bc44e5b671)
2017-01-19 17:51:19 +01:00
vgilc 80e8e4a35d Merge branch 'cherry-pick-688cec8f' into 'pandora_6.0'
Merge branch 'fixed-errors-in-net_tools-open' into 'develop'

See merge request !55
2017-01-19 13:27:38 +01:00
daniel ac5daaf986 Merge branch 'fixed-errors-in-net_tools-open' into 'develop'
fixed minor error in net_tool

See merge request !54
2017-01-19 13:27:04 +01:00
vgilc 2fafad15f4 Merge branch 'cherry-pick-0f4c640f' into 'pandora_6.0'
Merge branch '20-codificacion-de-nombre-en-el-tree-view-malas' into 'develop'

See merge request !53
2017-01-19 12:47:45 +01:00
daniel 5b41ebebe4 Merge branch '20-codificacion-de-nombre-en-el-tree-view-malas' into 'develop'
fixed errors in tree-view

See merge request !52
2017-01-19 12:46:43 +01:00
artica 84e3f695ff Auto-updated build strings. 2017-01-19 00:01:26 +01:00
artica 568fe5a62c Updated version and build strings for the 6.0SP5 release. 2017-01-18 10:45:21 +01:00
artica 5bea6cbdbc Auto-updated build strings. 2017-01-18 00:01:24 +01:00
vgilc 9791f2aacb Merge branch 'cherry-pick-e2b749a3' into 'pandora_6.0'
Merge branch '17-compatibilidad-ante-cambios-de-ip-en-el-agente-integria-4208' into 'develop'

See merge request !37
2017-01-17 09:57:40 +01:00
daniel f6028640d3 Merge branch '17-compatibilidad-ante-cambios-de-ip-en-el-agente-integria-4208' into 'develop'
Allow dinamic ip

Closes #17

See merge request !34
2017-01-17 09:57:05 +01:00
vgilc 6481ed01df Merge branch 'cherry-pick-2aba5dde-2' into 'pandora_6.0'
Merge branch 'revert-981273b2' into 'develop'

See merge request !36
2017-01-17 09:56:23 +01:00
daniel 5409b852bd Merge branch 'revert-981273b2' into 'develop'
Revert "Merge branch '17-compatibilidad-ante-cambios-de-ip-en-el-agente-integria…

See merge request !33
2017-01-17 09:55:52 +01:00
vgilc 3d984bbfe2 Merge branch 'cherry-pick-981273b2' into 'pandora_6.0'
Merge branch '17-compatibilidad-ante-cambios-de-ip-en-el-agente-integria-4208' into 'develop'

Allow automatic ip

Closes #17

See merge request !31

See merge request !32
2017-01-16 17:48:52 +01:00
daniel 0aa2c40958 Merge branch '17-compatibilidad-ante-cambios-de-ip-en-el-agente-integria-4208' into 'develop'
Allow automatic ip

Closes #17

See merge request !31
2017-01-16 17:48:16 +01:00
vgilc 0ab5e4c2a7 Merge branch '151-seguridad-en-public-dashboard-integria-4347' into 'pandora_6.0'
Fixed problems with sessions in public dashboards

#151

See merge request !30
2017-01-16 17:01:32 +01:00
m-lopez-f ab648b64bf Fixed problems with sessions in public dashboards 2017-01-16 16:57:58 +01:00
vgilc b21e2ed875 Merge branch 'cherry-pick-0933ccd5' into 'pandora_6.0'
Merge branch '8-tree-view-metaconsola-con-usuario-ad-no-muestra-hiperlink-nodo' into 'develop'

Fixed problems with access a node with user in metaconsole.
#8
See merge request !17

See merge request !18
2017-01-16 15:22:05 +01:00
vgilc cd2af72638 Merge branch 'cherry-pick-a27f7216' into 'pandora_6.0'
Change the input encoding once,not on every run.



See merge request !28
2017-01-16 14:01:36 +01:00
Ramon Novoa e9b6d9071a Change the input encoding once,not on every run. 2017-01-16 14:00:15 +01:00
vgilc bab8227bb1 Merge branch 'group_pass_in_console' into 'pandora_6.0'
Added pass field to groups in console. Ticket #153

(cherry picked from commit d51225f86c)

See merge request !26
2017-01-16 11:40:17 +01:00
vgilc 075821b809 Merge branch 'cherry-pick-66ae3460' into 'pandora_6.0'
Add the token group_password to agent configuration files.



See merge request !25
2017-01-16 11:39:11 +01:00
Arturo Gonzalez 20aac21c84 Added pass field to groups in console. Ticket #153
(cherry picked from commit d51225f86c)
2017-01-16 11:38:02 +01:00
Ramon Novoa bd19b1489c Add the token group_password to agent configuration files. 2017-01-16 11:35:50 +01:00
vgilc d4fcd8b927 Merge branch 'macros_snmp_fields_macros' into 'pandora_6.0'
Added a minor modification to alert snmp macros. Ticket #4290

(cherry picked from commit 907ba03b1a)

See merge request !23
2017-01-16 10:12:29 +01:00
Arturo Gonzalez dd2ce3582d Added a minor modification to alert snmp macros. Ticket #4290
(cherry picked from commit 907ba03b1a)
2017-01-16 10:09:54 +01:00
vgilc 0d67346950 Merge branch 'cherry-pick-102e5bfc' into 'pandora_6.0'
Merge branch '11-config-network-tools-no-se-muestra-3520' into 'develop'

fixed minor error extensions

Closes #11

See merge request !21

See merge request !22
2017-01-16 09:36:12 +01:00
daniel 31f07677f7 Merge branch '11-config-network-tools-no-se-muestra-3520' into 'develop'
fixed minor error extensions

Closes #11

See merge request !21
2017-01-16 08:39:18 +01:00
artica 4d8236ab7e Auto-updated build strings. 2017-01-16 00:01:30 +01:00
artica a6c24eed2c Auto-updated build strings. 2017-01-15 00:01:34 +01:00
artica c39d9f51a4 Auto-updated build strings. 2017-01-14 00:01:37 +01:00
mlopez 4a61c03235 Merge branch '8-tree-view-metaconsola-con-usuario-ad-no-muestra-hiperlink-nodo' into 'develop'
Fixed problems with access a node with user in metaconsole.

#8

See merge request !17
2017-01-13 10:47:05 +01:00
vgilc 729f0daaca Merge branch '7-cambiar_color_de_grafica_de_acceso' into 'pandora_6.0'
Change agent details graph color

#7

See merge request !14
2017-01-13 10:01:20 +01:00
artica 4b83823783 Auto-updated build strings. 2017-01-13 00:01:34 +01:00
vgilc 40676d44ff Merge branch 'cherry-pick-8ae01d5c' into 'pandora_6.0'
Merge branch '141-consola-visual-metaconsola-vista-integria-4348-open' into 'develop'

fixed visual errors in metaconsole



See merge request !12

See merge request !13
2017-01-12 12:42:32 +01:00
enriquecd 0f50d40104 Change agent details graph color 2017-01-12 11:40:56 +01:00
daniel c3eb11bd2b Merge branch '141-consola-visual-metaconsola-vista-integria-4348-open' into 'develop'
fixed visual errors in metaconsole



See merge request !12
2017-01-12 10:57:36 +01:00
artica b33157885d Auto-updated build strings. 2017-01-12 00:01:34 +01:00
vgilc a7776122ef Merge branch 'cherry-pick-061273a2' into 'pandora_6.0'
Merge branch '5-consola-visual-metaconsola-scroll-a-tope-integria-4346' into 'develop'

fixed visual error visual console

Closes #5

See merge request !9

See merge request !10
2017-01-11 17:39:14 +01:00
daniel dce29d204a Merge branch '5-consola-visual-metaconsola-scroll-a-tope-integria-4346' into 'develop'
fixed visual error visual console

Closes #5

See merge request !9
2017-01-11 17:38:27 +01:00
vgilc 56c740772f Merge branch 'cherry-pick-59bd635b' into 'pandora_6.0'
Merge branch '4-vista-de-alertas-metaconsola' into 'develop'

add lost option in call function in alert view in metaconsole.
See merge request !7

See merge request !8
2017-01-11 16:54:47 +01:00