12426 Commits

Author SHA1 Message Date
Arturo Gonzalez
7fcc833e4d Fixed classic menu mode. Ticket #250
(cherry picked from commit 4c63756f51fa83787f30715b106586a68745527e)

 Conflicts:
	pandora_console/general/main_menu.php
2017-02-13 13:55:18 +01:00
artica
56d609ccdc Auto-updated build strings. 2017-02-13 00:01:34 +01:00
artica
df645d0d90 Auto-updated build strings. 2017-02-12 00:01:29 +01:00
artica
ea73a5dafb Auto-updated build strings. 2017-02-11 00:01:34 +01:00
vgilc
22a4424e5e Merge branch '208-events_problems_with_like_in_tags_field' into 'pandora_6.0'
Fixed events query with like in tags field. Ticket #208

See merge request !145
2017-02-10 14:18:55 +01:00
vgilc
5985933627 Merge branch 'fix_netflow_reports_data' into 'pandora_6.0'
Fixed netflow reports

See merge request !147
2017-02-10 14:03:19 +01:00
Arturo Gonzalez
8dafc0d1d6 Fixed netflow reports 2017-02-10 13:23:43 +01:00
Arturo Gonzalez
33be446e1f Fixed events query with like in tags field. Ticket #208
(cherry picked from commit 930304145031a3a74524500c0f55d1f0237ad41a)
2017-02-10 12:34:49 +01:00
artica
7a820be983 Auto-updated build strings. 2017-02-10 00:01:30 +01:00
vgilc
d4090761e3 Merge branch 'cherry-pick-29a0b192' into 'pandora_6.0'
Fixed a typo error. GitHub #78

See merge request !88
2017-02-09 10:34:38 +01:00
artica
a20bbe08a4 Auto-updated build strings. 2017-02-09 00:01:32 +01:00
artica
a5d50a5f9a Auto-updated build strings. 2017-02-08 00:02:33 +01:00
Ramon Novoa
edab97eac3 Clone the repo from scratch for every GitLab CI job.
(cherry picked from commit 559d7ca217c1b1bdee099ddfb592b70771c0c69c)
2017-02-07 12:20:38 +01:00
Ramon Novoa
db6616632f Add a basic .gitlab-ci.yml.
(cherry picked from commit 0d28b1c3d71d275f47baa31cdf5b0ca4641c40a3)
2017-02-07 11:31:13 +01:00
artica
c6218ae393 Auto-updated build strings. 2017-02-07 00:01:30 +01:00
vgilc
31ba687576 Merge branch '47-error-al-modificar-imagen-de-grupo-en-consola-visual-integria-4315-6' into 'pandora_6.0'
Error Changing image for group item in visual console - #47

See merge request !123
2017-02-06 12:05:26 +01:00
enriquecd
333dcbaae5 Error Changing image for group item in visual console - #47 2017-02-06 11:58:30 +01:00
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
m-lopez-f
5bd8a00b07 Fixed a typo error. GitHub #78 2017-01-31 09:40:05 +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