12597 Commits

Author SHA1 Message Date
artica
3b4b8b660d Auto-updated build strings. 2017-02-15 00:01:28 +01:00
artica
4fd44d5597 Auto-updated build strings. 2017-02-14 00:01:32 +01:00
m-lopez-f
3779167593 Add changes of visual mobile version of pandora. Gitlab: #148 2017-02-13 16:14:51 +01:00
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
Enrique Camargo
c509d23a81 Merge branch '53-no-ejecuta-custom-responses' into 'develop'
Show unreachable host reponse when ping from custom responses - #53

See merge request !148
2017-02-10 17:02:28 +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
Enrique Camargo
ee0e286d9c Merge branch '52-la-ventana-de-alertas-deberia-de-ser-arrastrable-y-con-zindex-3-cambiar-tambien-texto-para-desactivar-logo-en-graficas-en-setup-visual' into 'develop'
Make alert messages window draggable, zindex 3, change disable logo in graph - #52

See merge request !143
2017-02-10 10:34:27 +01:00
artica
7a820be983 Auto-updated build strings. 2017-02-10 00:01:30 +01:00
Arturo Gonzalez
ab79119874 Added "G" in srtftime format from date format. Ticket #241
(cherry picked from commit 0e179a17252866464df749219a96a876032eb1b7)
2017-02-09 12:22:12 +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
Enrique Camargo
d6721f0934 Merge branch '237-editar-modulo-web-no-enlazado-a-politica-integria-4421/open' into 'develop'
Enable fields in web modules created by policy when is unlinked - #237

See merge request !137
2017-02-08 17:07:52 +01:00
artica
a5d50a5f9a Auto-updated build strings. 2017-02-08 00:02:33 +01:00
enriquecd
878e4fa5a3 Add titles to all levels buttons in lateral menu buttons / 2 - 6 - #234 2017-02-07 17:49:28 +01:00
Enrique Camargo
459ef3be79 Merge branch '48-aumentar-altura-de-las-filas-de-la-tabla-agent-contact-en-la-vista-de-agente' into 'develop'
Increase cell height in agent contact table of agent view - #48

See merge request !131
2017-02-07 17:06:42 +01:00
Enrique Camargo
d8e10996f1 Merge branch '7-cambiar-color-de-grafica-de-acceso-integria-3271' into 'develop'
Change water mark logo - #7

See merge request !129
2017-02-07 15:55:00 +01:00
Enrique Camargo
13f11fbe24 Merge branch '230-se-descojona-la-solapa-cuando-el-nombre-del-servicio-tiene-mas-de-10-caracteres-open' into 'develop'
Show only service name in green header for service maps - #230

See merge request !125
2017-02-07 14:42:26 +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
daniel
35738ad38a Merge branch '44-las-plantillas-de-modulos-no-guardan-la-unidad-de-los-modulos-creados-por-componentes-integria-4412' into 'develop'
fixed errors in modules templates

See merge request !120
2017-02-06 09:46:44 +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
Enrique Camargo
2068e6cec6 Merge branch '43-la-ayuda-del-post-procesado-de-modulos-crea-confusion-entre-y-integria-4405' into 'develop'
Resolve "La ayuda del post-procesado de módulos crea confusión entre . y , [INTEGRIA: #4405]"

See merge request !117
2017-02-03 15:18:52 +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
enriquecd
c9ab28eb2d Add enterprise_hook filter to all config_agents_has_remote_configuration functions/6 - #41 2017-02-02 19:28:13 +01:00
Enrique Camargo
ef253e0743 Merge branch '40-ancho-de-los-combobox-integria-4407' into 'develop'
No width limit in graph editor agents selector - #40

See merge request !111
2017-02-02 18:41:00 +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
Enrique Camargo
ae47e0a02a Merge branch '37-agregar-filtros-a-masivas-agentes-integria-4333' into 'develop'
Disabled and enabled or all agents selector in agent massive operations - #37

See merge request !103
2017-02-01 17:38:55 +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
Enrique Camargo
e867b33210 Merge branch '35-configurar-portada-de-informes-integria-4325' into 'develop'
Show/hide front page custom report display or not in setup visual on click - #35

See merge request !98
2017-01-31 19:16:46 +01:00