12444 Commits

Author SHA1 Message Date
Enrique Camargo
a52ef0aaf5 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-17 13:27:26 +01:00
vgilc
4d6a3ee66c Merge branch 'cherry-pick-6b168873' into 'pandora_6.0'
Merge branch '52-la-ventana-de-alertas-deberia-de-ser-arrastrable-y-con-zindex-3…

See merge request !144
2017-02-17 10:40:34 +01:00
vgilc
78f46d7b85 Merge branch 'cherry-pick-1ba76736' into 'pandora_6.0'
Merge branch '7-cambiar-color-de-grafica-de-acceso-integria-3271' into 'develop'

See merge request !130
2017-02-17 10:12:08 +01:00
artica
2312a95805 Auto-updated build strings. 2017-02-17 00:01:31 +01:00
vgilc
b853ece28e Merge branch 'cherry-pick-93db0563-2' into 'pandora_6.0'
Merge branch '28-modificar-etiqueta-de-boton-forzar-integria-4341' into 'develop'

See merge request !165
2017-02-16 18:17:51 +01:00
Enrique Camargo
eb6d73c65e Merge branch '28-modificar-etiqueta-de-boton-forzar-integria-4341' into 'develop'
Resolve "Modificar etiqueta de botón forzar [INTEGRIA: #4341]"

See merge request !77
2017-02-16 17:37:55 +01:00
vgilc
df742dbd6f Merge branch 'cherry-pick-483c64a8' into 'pandora_6.0'
Add lost updates of files in mobile version #148

See merge request !158
2017-02-16 10:27:01 +01:00
m-lopez-f
a36e201c8d Add lost updates of files in mobile version #148 2017-02-16 08:39:22 +01:00
artica
565edcb1b3 Auto-updated build strings. 2017-02-16 00:01:29 +01:00
vgilc
e0ee47739d Merge branch '179-error-al-crear-nuevo-componente-local-y-seleccionarlo-en-agente-integria-3934-6-open-bug' into 'pandora_6.0'
Show local components bar in module editor/creator, remote_config function was not hooked - #179

See merge request !156
2017-02-15 16:00:47 +01:00
vgilc
a905153349 Merge branch 'cherry-pick-68bdcdd7' into 'pandora_6.0'
Fixed typo error

See merge request !155
2017-02-15 15:49:51 +01:00
enriquecd
0f2eaa2dca Show local components bar in module editor/creator, remote_config function was not hooked - #179 2017-02-15 15:24:28 +01:00
m-lopez-f
f368a01fce Fixed typo error 2017-02-15 13:44:54 +01:00
vgilc
a8f00936cb Merge branch 'cherry-pick-1fe9ded0' into 'pandora_6.0'
Add changes of visual mobile version of pandora. Gitlab: #148

See merge request !153
2017-02-15 13:10:11 +01:00
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
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
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
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
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
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