tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-04-08 18:55:09 +02:00
Code Issues Packages Projects Releases Wiki Activity
12,387 Commits 34 Branches 30 Tags
Commit Graph

12387 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Arturo Gonzalez
be876a8383 Fixed mac, avg and min values in reports and visual maps. Ticket #159 
(cherry picked from commit f9c56237fd237d2ce5425bf1310215d2bbffa99b)
 2017-01-31 12:44:01 +01:00
vgilc
52bad97477 Merge branch '208-events_with_non_privilege_user' into 'pandora_6.0' 
Fixed events with non privileges user. Ticket #208

See merge request !89
 2017-01-31 11:04:39 +01:00
Arturo Gonzalez
d1994e3914 Fixed events with non privileges user. Ticket #208 
(cherry picked from commit 9d5a79b6fc207b4f5fc9a4f4e51cc10826fcce1e)
 2017-01-31 11:03:26 +01:00
artica
c2272c3e67 Auto-updated build strings. 2017-01-31 00:01:32 +01:00
vgilc
09195ca529 Merge branch '201-update_manager_online_open_problems_to_update' into 'pandora_6.0' 
Fixed update manager online open version. Ticket #201

See merge request !87
 2017-01-30 11:32:53 +01:00
Arturo Gonzalez
ae08c7cb37 Fixed update manager online open version. Ticket #201 
(cherry picked from commit fea6a1134da4b79566a2f315db92795a574a969a)
 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
vgilc
54af128cb3 Merge branch 'cherry-pick-5fc52c34' into 'pandora_6.0' 
Merge branch '31-mostrar-espacio-en-descripcion-agente-windows-integria-4378' into 'develop'

See merge request !85
 2017-01-26 15:23:46 +01:00
Enrique Camargo
031e2c406d Merge branch '31-mostrar-espacio-en-descripcion-agente-windows-integria-4378' into 'develop' 
Show free space in windows agent - #31

See merge request !84
 2017-01-26 12:39:31 +01:00
Ramon Novoa
18d5d4cb79 Set the type for async_abs modules. 
(cherry picked from commit e707f65a6f9e80408eef46380e7a4b02a3eda25b)
 2017-01-26 11:23:22 +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
vgilc
7028d4055f Merge branch '188-error_pandora6' into 'pandora_6.0' 
Fixed merge error. Ticket #188

See merge request !79
 2017-01-25 11:20:10 +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
8846a9a6a4 Merge branch 'cherry-pick-8ed84bf7' into 'pandora_6.0' 
Merge branch '21-mensaje-no-access-solo-aparece-con-alertas-integria-4368' into 'develop'

See merge request !59
 2017-01-23 16:04:43 +01:00
vgilc
7307409efc Merge branch 'cherry-pick-8ed84bf7-2' into 'pandora_6.0' 
Merge branch '21-mensaje-no-access-solo-aparece-con-alertas-integria-4368' into 'develop'

See merge request !62
 2017-01-23 16:04:21 +01:00
vgilc
a7035c08c4 Merge branch 'cherry-pick-8ed84bf7-3' into 'pandora_6.0' 
Merge branch '21-mensaje-no-access-solo-aparece-con-alertas-integria-4368' into 'develop'

See merge request !63
 2017-01-23 16:03:39 +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
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