tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-29 16:55:05 +02:00
Code Issues Packages Projects Releases Wiki Activity
12,551 Commits 34 Branches 30 Tags
Commit Graph

12551 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
vgilc
8fdad6ae90 Merge branch '135-fixed-errors-with-pandora_6-open' into 'pandora_6.0' 
135 fixed errors with pandora 6 open

See merge request !50
 2017-01-23 15:37:54 +01:00
vgilc
c964f95efd Merge branch '22-graficas-estaticas-en-correos-con-problemas-open' into 'pandora_6.0' 
fixed errors in legend graph

See merge request !61
 2017-01-23 15:36:58 +01:00
Enrique Camargo
4a8a467bd2 Merge branch '21-mensaje-no-access-solo-aparece-con-alertas-integria-4368' into 'develop' 
21-Mensaje no access solo aparece con alertas [INTEGRIA: #4368]

See merge request !58
 2017-01-23 11:27:07 +01:00
artica
484ddc9ddf Auto-updated build strings. 2017-01-22 00:01:27 +01:00
artica
c9843d949a Auto-updated build strings. 2017-01-21 00:01:30 +01:00
Enrique Camargo
c43fc9064b Merge branch '23-general-report-hay-un-error-de-traduccion-en-el-campo-operation-integria-4366' into 'develop' 
Change item minimum / maximum title in general reports - #23

See merge request !68
 2017-01-20 17:35: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
Enrique Camargo
dfc173485f Merge branch '21-mensaje-no-access-solo-aparece-con-alertas-integria-4368' into 'develop' 
21-Mensaje no access solo aparece con alertas [INTEGRIA: #4368]

See merge request !58
 2017-01-20 11:39:40 +01:00
Enrique Camargo
f733ce4e05 Merge branch '21-mensaje-no-access-solo-aparece-con-alertas-integria-4368' into 'develop' 
21-Mensaje no access solo aparece con alertas [INTEGRIA: #4368]

See merge request !58
 2017-01-20 11:37:31 +01:00
daniel
b08369652c fixed errors in legend graph 2017-01-20 11:30:15 +01:00
Enrique Camargo
9014000e15 Merge branch '21-mensaje-no-access-solo-aparece-con-alertas-integria-4368' into 'develop' 
21-Mensaje no access solo aparece con alertas [INTEGRIA: #4368]

See merge request !58
 2017-01-20 11:09:56 +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 919119e7be6809cc93ff61858b0d6d3ce1e727ec)
 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 b3206791d919397830fa554b2c63a0e06f9e1aea)
 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 bc44e5b671235502c63fcf2bf918760e6139a701)
 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
Junichi Satoh
8f86be3265 Set default module action threshold to 0. 
(cherry picked from commit 34f4b434c236dece3a6c50036430d8d087462210)
 2017-01-19 19:52:34 +09:00
daniel
86207212eb fixed pdf reports events 
(cherry picked from commit 8006c1fc0b69567053ac3bd9597be848350be3b6)
 2017-01-19 10:23:09 +01:00
daniel
a5eddbc963 fixed reports events 
(cherry picked from commit 99aa41b32a20f53a571051f1a8e10d5f539e0a02)
 2017-01-19 10:20:15 +01:00
daniel
36015807f3 fixed errors in events reports #135 
(cherry picked from commit 993bad314d81f97db207cc502325667b28fd31c7)
 2017-01-19 09:40:07 +01:00
artica
84e3f695ff Auto-updated build strings. 2017-01-19 00:01:26 +01:00
mlopez
9a17d97ad9 Merge branch '19-usuario-con-not-login-puede-entrar-int-4355' into 'develop' 
Add logout from session if user have a not login active

See merge request !46
 2017-01-18 11:58:18 +01:00
artica
568fe5a62c Updated version and build strings for the 6.0SP5 release. 6.0SP5 2017-01-18 10:45:21 +01:00
artica
5bea6cbdbc Auto-updated build strings. 2017-01-18 00:01:24 +01:00
enriquecd
1ab7686c3d Error message when change user language 2017-01-17 15:54:32 +01:00
m-lopez-f
b85bcc9814 Add select profile, group and tags when autocreate user in few options. And add metaconsole replication users in node 2017-01-17 15:26:03 +01:00
Arturo Gonzalez
a39addc0ec Fixed threshold in interface graphs. Ticket #156 
(cherry picked from commit d3f5a62814c257fd150e0b9fbedea54f78a57681)

 Conflicts resolved:
	pandora_console/include/functions_graph.php
 2017-01-17 14:37:34 +01:00
Arturo Gonzalez
0a584c3741 Added things to interface thressold. Ticket #4113 
(cherry picked from commit b683d5d50c8f83448fe680b3a6c8c96a345e1c37)
 2017-01-17 14:34:12 +01:00
Arturo Gonzalez
fd21b281c7 Added threshold graph to interface monitors graph (Only when monitors have the same warning or critical min value). Ticket #4113 
(cherry picked from commit 2391e7ae7827eaae7ff73f2377e89bbc70fc2848)

 Conflicts resolved:
	pandora_console/operation/agentes/interface_traffic_graph_win.php
 2017-01-17 14:33:08 +01:00
Arturo Gonzalez
0e031b50e3 Added module value control to shows units in max, min and avg values. Ticket #159 
(cherry picked from commit 1f07d8a022cec8988fdf148e5c4c35f447eb6fa0)

Conflicts resolved:
	pandora_console/include/functions_visual_map.php
 2017-01-17 11:43:28 +01:00
Arturo Gonzalez
3053322d60 Filter with not init history db. Ticket #158 
(cherry picked from commit 2cbe165d2513cb9ca8d252a978caa8ca08a9e7eb)
 2017-01-17 10:51:51 +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