tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
12,389 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

9484 Commits

Author SHA1 Message Date
Arturo Gonzalez f7908f4838 Now times under 1 day will be shown in a correct format. Ticket #215 
(cherry picked from commit 3976a45e89)
 2017-01-31 15:48:53 +01:00
Arturo Gonzalez be876a8383 Fixed mac, avg and min values in reports and visual maps. Ticket #159 
(cherry picked from commit f9c56237fd)
 2017-01-31 12:44:01 +01:00
Arturo Gonzalez d1994e3914 Fixed events with non privileges user. Ticket #208 
(cherry picked from commit 9d5a79b6fc)
 2017-01-31 11:03:26 +01:00
artica c2272c3e67 Auto-updated build strings. 2017-01-31 00:01:32 +01:00
Arturo Gonzalez ae08c7cb37 Fixed update manager online open version. Ticket #201 
(cherry picked from commit fea6a1134d)
 2017-01-30 11:30:00 +01:00
artica eb8e18c87c Auto-updated build strings. 2017-01-30 00:01:30 +01:00
artica 7a6c8e45ce Auto-updated build strings. 2017-01-29 00:01:28 +01:00
artica 3ed7a7b6c4 Auto-updated build strings. 2017-01-28 00:01:29 +01:00
artica fd1d8e2747 Auto-updated build strings. 2017-01-27 00:01:36 +01:00
artica 564b652771 Auto-updated build strings. 2017-01-26 00:01:30 +01:00
vgilc 1f16f67ca0 Merge branch 'cherry-pick-5bb4e747' into 'pandora_6.0' 
Merge branch '24-general-report-ordenar-por-nombre-de-agente-y-luego-por-nombre-…

See merge request !74
 2017-01-25 12:43:46 +01:00
Arturo Gonzalez 44ee8617f8 Fixed merge error. Ticket #188 2017-01-25 11:17:14 +01:00
artica 969ce03f1d Auto-updated build strings. 2017-01-25 00:01:28 +01:00
artica 60cfca9ff9 Auto-updated build strings. 2017-01-24 00:01:36 +01:00
Enrique Camargo 9d2f35e04a Merge branch '24-general-report-ordenar-por-nombre-de-agente-y-luego-por-nombre-modulo-integria-4367' into 'develop' 
Order by agent and module in general reports, fix group reports - #24

See merge request !73
 2017-01-23 17:41:39 +01:00
vgilc 7235945bd5 Merge branch 'cherry-pick-256e81d0' into 'pandora_6.0' 
Merge branch '2-el-campo-last-data-hacer-click-en-un-modulo-no-se-muestra-correc…

See merge request !5
 2017-01-23 16:14:03 +01:00
vgilc 19f53d8508 Merge branch 'cherry-pick-2224478e-into-6.0' into 'pandora_6.0' 
Fixed "pagination" had ignored trap_type filtering at SNMP Console.

See merge request !11
 2017-01-23 16:13:20 +01:00
vgilc ad6f61bee0 Merge branch 'cherry-pick-2868ee3f' into 'pandora_6.0' 
Merge branch '1-acciones-masivas'

See merge request !16
 2017-01-23 16:12:31 +01:00
vgilc 4f08cfde99 Merge branch 'cherry-pick-50174695' into 'pandora_6.0' 
Merge branch '9-Feature_Case_sensitive_en_campos_de_búsqueda' into 'develop'

See merge request !20
 2017-01-23 16:11:33 +01:00
vgilc 2581d5d3ea Merge branch '158-filtro-de-no-iniciados-con-historico' into 'pandora_6.0' 
Filter with not init history db. Ticket #158

See merge request !38
 2017-01-23 16:10:55 +01:00
vgilc 614ca62557 Merge branch '159-media-de-modulo' into 'pandora_6.0' 
Added module value control to shows units in max, min and avg values. Ticket #159

See merge request !39
 2017-01-23 16:10:13 +01:00
vgilc 2c920d67a5 Merge branch '147-sincronizacion-usuarios-metaconsola' into 'pandora_6.0' 
Add select profile, group and tags when autocreate user in few options.

See merge request !44
 2017-01-23 16:09:30 +01:00
vgilc 8ca7b3bcbd Merge branch '156-mostrar-umbrale-warning-y-critical-en-gráficas-de-interfaces-SNMP' into 'pandora_6.0' 
156 mostrar umbrale warning y critical en gráficas de interfaces snmp

See merge request !41
 2017-01-23 16:08:06 +01:00
vgilc 36439fc406 Merge branch '18-Edición_de_usuario_metaconsola_INTEGRIA_#4352' into 'pandora_6.0' 
Error message when change user language #18

See merge request !45
 2017-01-23 16:07:09 +01:00
vgilc 0640b50335 Merge branch 'cherry-pick-2019c975' into 'pandora_6.0' 
Merge branch '19-usuario-con-not-login-puede-entrar-int-4355'

See merge request !47
 2017-01-23 16:06:26 +01:00
vgilc 86e9a0b907 Merge branch 'cherry-pick-34f4b434' into 'pandora_6.0' 
Set default module action threshold to 0.

See merge request !51
 2017-01-23 16:05:21 +01:00
vgilc 86fa68fb8a Merge branch 'cherry-pick-65da4818' into 'pandora_6.0' 
Merge branch '23-general-report-hay-un-error-de-traduccion-en-el-campo-operation…

See merge request !69
 2017-01-23 16:02:33 +01:00
vgilc 4cc4b796ce Merge branch 'cherry-pick-8ed84bf7-4' into 'pandora_6.0' 
Merge branch '21-mensaje-no-access-solo-aparece-con-alertas-integria-4368' into 'develop'

See merge request !70
 2017-01-23 15:49:23 +01:00
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
daniel b08369652c fixed errors in legend graph 2017-01-20 11:30:15 +01:00
artica d229edec1c Auto-updated build strings. 2017-01-20 00:01:32 +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
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 34f4b434c2)
 2017-01-19 19:52:34 +09:00
daniel 86207212eb fixed pdf reports events 
(cherry picked from commit 8006c1fc0b)
 2017-01-19 10:23:09 +01:00
daniel a5eddbc963 fixed reports events 
(cherry picked from commit 99aa41b32a)
 2017-01-19 10:20:15 +01:00
daniel 36015807f3 fixed errors in events reports #135 
(cherry picked from commit 993bad314d)
 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. 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 d3f5a62814)

 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 b683d5d50c)
 2017-01-17 14:34:12 +01:00