13502 Commits

Author SHA1 Message Date
Arturo Gonzalez
cb7ab827d2 Fixed module type chart selected in conf. Ticket #345 2017-02-21 16:36:46 +01:00
daniel
63d582586b Merge branch '68-creacion-de-usuarios-en-ldap-falla' into 'develop'
fixed error in ldap create new users

See merge request !186
2017-02-21 15:55:51 +01:00
daniel
e4fbef9e47 Merge branch '67-elementos-mal-colocados-en-informe-de-disponibilidad-integria-4155' into 'develop'
fixed minor error in report availavility

See merge request !185
2017-02-21 15:39:08 +01:00
m-lopez-f
e5fba88137 fixed visual on movile version. gitlab: #340 2017-02-21 14:27:06 +01:00
daniel
a5055ec27a fixed error in ldap create new users 2017-02-21 14:04:53 +01:00
daniel
df0a6086c4 fixed minor error in report availavility 2017-02-21 13:56:00 +01:00
m-lopez-f
2abff60380 Fixed code 2017-02-21 13:30:53 +01:00
Enrique Camargo
31d7091ce7 Merge branch '62-meter-un-salto-de-linea-entre-las-opciones-modules-first-y-agents-firsts-de-forma-que-se-anineen-bien' into 'develop'
Resolve "Meter un salto de linea entre las opciones "modules first" y "agents firsts" de forma que se anineen bien"

See merge request !180
2017-02-21 13:06:56 +01:00
m-lopez-f
a242395af0 Replace label definition and add help tip in custom reports items. Gitlab: #248 2017-02-21 13:01:34 +01:00
enriquecd
26627e0613 Merge branch '62-meter-un-salto-de-linea-entre-las-opciones-modules-first-y-agents-firsts-de-forma-que-se-anineen-bien' of https://192.168.50.5:8081/artica/pandorafms into 62-meter-un-salto-de-linea-entre-las-opciones-modules-first-y-agents-firsts-de-forma-que-se-anineen-bien 2017-02-21 12:54:48 +01:00
enriquecd
5dbca6eeca Insert newline between module first and agent first in module massive op /2 - #62 2017-02-21 12:52:48 +01:00
Enrique Camargo
32806a5538 Merge branch '66-pequenos-arreglos-en-interfaz-de-creacion-de-graficas-combinadas' into 'develop'
Improve custom graph interface - #66

See merge request !179
2017-02-21 12:39:01 +01:00
enriquecd
48a04d6c47 Improve custom graph interface - #66 2017-02-21 12:18:18 +01:00
artu30
c9e89921d2 Merge branch 'feature/log_in_reports' into 'develop'
Feature/log in reports

See merge request !178
2017-02-21 12:15:34 +01:00
m-lopez-f
3b97095fda Fixed problems with check discard unknown events in module configuration. Integria: #4242, Gitlab: #324 2017-02-21 12:09:07 +01:00
Arturo Gonzalez
5190228010 Merge branch 'develop' into feature/log_in_reports
Conflicts:
	pandora_console/godmode/reporting/reporting_builder.item_editor.php
	pandora_console/include/functions_reporting_html.php
2017-02-21 12:06:24 +01:00
m-lopez-f
09e1b8ce1c Fixed problems with src images in visual consoles. Gitlab: #255 2017-02-21 10:28:19 +01:00
fermin
59135bb1b1 Merge branch '65-la-version-del-cliente-de-ehorus-es-vieja-hablar-con-fermin' into 'develop'
Updated eHorus client

See merge request !176
2017-02-21 10:23:29 +01:00
m-lopez-f
8a1bdf5017 Fixed problems with login that this user not have a administration permissions. Gitlab #323 2017-02-21 09:47:42 +01:00
artica
028e5c60d2 Auto-updated build strings. 2017-02-21 00:01:17 +01:00
fermin831
7592bce0a9 Updated eHorus client 2017-02-20 18:25:46 +01:00
daniel
5c32d0ba95 Merge branch '267-vista-agente-modulo-con-filtros-no-visualiza-datos-open' into 'develop'
fixed errors in agent/module

See merge request !175
2017-02-20 17:26:14 +01:00
Arturo Gonzalez
03f2250ffa Removed weird alerts in networkmap. 2017-02-20 16:35:32 +01:00
daniel
65047c23a5 fixed errors in agent/module 2017-02-20 16:16:53 +01:00
Arturo Gonzalez
4a6cdf822d Fixed modules lejend in agent view. Ticket #294 2017-02-20 15:02:01 +01:00
m-lopez-f
2c1e43a477 Re-fixed problems with agents name in visual consoles 2017-02-20 14:38:58 +01:00
m-lopez-f
ca8ec686ac Fixed problems with upload images and show images in created visual consoles. Gitlab: #314 2017-02-20 13:54:34 +01:00
m-lopez-f
3ffe8ae49f Merge branch 'develop' of https://192.168.50.5:8081/artica/pandorafms into develop 2017-02-20 12:56:38 +01:00
m-lopez-f
9a3e693137 Fixed problems with change size of visual console when this size is very small.
And add message when this size is very small.
2017-02-20 12:56:29 +01:00
Arturo Gonzalez
e8a765876b Fixed multiple delete button and form structure in messages section. Ticket #301 2017-02-20 12:53:53 +01:00
Arturo Gonzalez
651e7ea8e6 Changed migration file name. Ticket #297 2017-02-20 12:35:52 +01:00
Enrique Camargo
4a5a9a5eef Merge branch '40-ancho-de-los-combobox-integria-4407-2' into 'develop'
Not limit 300px agent and module comboboxes in graph builder - #40

See merge request !173
2017-02-20 12:31:58 +01:00
enriquecd
b915a1034b Not limit 300px agent and module comboboxes in graph builder - #40 2017-02-20 12:06:30 +01:00
daniel
4b8808c93d Merge branch '64-detalles-visuales-a-mejorar-sobre-la-interfaz-de-las-graficas' into 'develop'
fixed errors in graphs

See merge request !172
2017-02-20 11:23:57 +01:00
Arturo Gonzalez
58ea653e05 Fixed multiple delete in events filter. Ticket #303 2017-02-20 11:20:59 +01:00
daniel
40ee2cce0a fixed errors in graphs 2017-02-20 11:13:47 +01:00
Arturo Gonzalez
f9eb762951 Changed license url and update url. Ticket #299 2017-02-20 10:32:07 +01:00
Arturo Gonzalez
89f0ec658c Added data precision to events. Ticket #288 2017-02-20 09:50:57 +01:00
artica
f7fd67ca79 Auto-updated build strings. 2017-02-20 00:01:14 +01:00
artica
2d26efe942 Auto-updated build strings. 2017-02-19 00:01:14 +01:00
artica
1021655e43 Auto-updated build strings. 2017-02-18 00:01:16 +01:00
m-lopez-f
e3c3fafa43 Fixed problems with agent name in visual consoles. Gitlab #257 2017-02-17 15:39:28 +01:00
m-lopez-f
699942eef5 Merge branch 'develop' of https://192.168.50.5:8081/artica/pandorafms into develop 2017-02-17 13:34:39 +01:00
m-lopez-f
e118729398 Fixed problems with column 'last contact'. Gitlab: #269 2017-02-17 13:34:30 +01:00
Enrique Camargo
8ad2c2f35f Merge branch '63-la-consola-visual-en-pantalla-completa-se-come-un-trozo-por-arriba' into 'develop'
Visual console in fullscreen does not allow see complete background if is bigger than screen - #63

See merge request !168
2017-02-17 13:23:43 +01:00
Arturo Gonzalez
294cb5a14f Revert "Added data precision to events table. Ticket #288"
This reverts commit f6f5d64d32884a5b8c43cabc52ebc349baf47dfb.
2017-02-17 13:15:28 +01:00
enriquecd
d7b24fc9c9 Visual console in fullscreen does not allow see complete background if is bigger than screen - #63 2017-02-17 13:04:21 +01:00
Arturo Gonzalez
f02827d235 Changed field type in db to get negative numbers. Ticket #120 2017-02-17 12:43:12 +01:00
Enrique Camargo
8bc12f02d0 Merge branch '62-meter-un-salto-de-linea-entre-las-opciones-modules-first-y-agents-firsts-de-forma-que-se-anineen-bien' into 'develop'
Insert newline between module first and agent first in module massive op - #62

See merge request !166
2017-02-17 12:24:21 +01:00
Arturo Gonzalez
f6f5d64d32 Added data precision to events table. Ticket #288 2017-02-17 12:16:33 +01:00