12408 Commits

Author SHA1 Message Date
artica
fc28d720bd Auto-updated build strings. 2017-02-06 00:01:32 +01:00
artica
c6b3b5400c Auto-updated build strings. 2017-02-05 00:01:31 +01:00
artica
c9bcce9c69 Auto-updated build strings. 2017-02-04 00:01:37 +01:00
vgilc
57f5526b8b Merge branch '42-rendimiento-del-shortcut-bar-integria-4409-6.0' into 'pandora_6.0'
delete shortcutbar in 6.0

See merge request !116
2017-02-03 12:46:13 +01:00
daniel
3e8f3502af delete shortcutbar in 6.0 2017-02-03 12:38:10 +01:00
Ramon Novoa
fae73c31b4 Update the logo and screenshots URLs.
(cherry picked from commit 93180afcf1b64bd014696864210ef3d72123b10e)
2017-02-03 12:25:39 +01:00
artica
90232a4687 Auto-updated build strings. 2017-02-03 00:01:36 +01:00
Ramon Novoa
c50879c5a5 Do not constrain UTC time offsets.
(cherry picked from commit af276ab7ace69150f0244a57788c41a69c8bb4a7)
2017-02-02 12:51:23 +01:00
vgilc
722b676cc4 Merge branch 'cherry-pick-ffb5df9f' into 'pandora_6.0'
Merge branch 'resolve-conflict-events-reports' into 'develop'

See merge request !107
2017-02-02 11:58:54 +01:00
daniel
6613ed6d52 Merge branch 'resolve-conflict-events-reports' into 'develop'
fixed errors in reports evnts

See merge request !106
2017-02-02 10:15:12 +01:00
artica
8b5da6bc64 Auto-updated build strings. 2017-02-02 00:01:34 +01:00
Ramon Novoa
29724f40e5 Revert "Show free space in windows agent - #31"
This reverts commit 1ecf471ab87d1ff09a043627b60800e634ef51db.

(cherry picked from commit 937489a88d433e4050704f3bc3bc8195142f468a)
2017-02-01 14:48:10 +01:00
Ramon Novoa
c4039038f6 Remove PandoraAgent.exe from the repo.
(cherry picked from commit f8aef02f36cdb78371a3004ccc9557799da2dc90)
2017-02-01 14:48:10 +01:00
vgilc
82a288c3d2 Merge branch '183-agent_plugin_edit_executions_functions_html_problems' into 'pandora_6.0'
Added "function" value to input text. Ticket #183

See merge request !100
2017-02-01 09:50:54 +01:00
Arturo Gonzalez
56451a5587 Added "function" value to input text. Ticket #183 2017-02-01 09:48:37 +01:00
artica
ce7096815a Auto-updated build strings. 2017-02-01 00:01:32 +01:00
vgilc
76d6ae5fb7 Merge branch 'cherry-pick-c6784af7' into 'pandora_6.0'
Merge branch 'fixed-errors-reports-events-and-alert' into 'develop'

See merge request !97
2017-01-31 17:02:43 +01:00
daniel
d7ce0a44ee Merge branch 'fixed-errors-reports-events-and-alert' into 'develop'
fixed errors in reports evnts and alerts groups

See merge request !96
2017-01-31 17:02:00 +01:00
vgilc
af462a6c07 Merge branch '215-graph_date_format' into 'pandora_6.0'
Now times under 1 day will be shown in a correct format. Ticket #215

See merge request !93
2017-01-31 15:51:30 +01:00
Arturo Gonzalez
f7908f4838 Now times under 1 day will be shown in a correct format. Ticket #215
(cherry picked from commit 3976a45e898a33f605830f326ff0cfea903ede39)
2017-01-31 15:48:53 +01:00
vgilc
50b4ddc589 Merge branch '151-show_units_in_avg_max_min_reports' into 'pandora_6.0'
Fixed mac, avg and min values in reports and visual maps. Ticket #159

See merge request !91
2017-01-31 12:55:10 +01:00
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