danielmaya
bbde9c70b6
conflict resolved
2018-10-25 11:13:57 +02:00
vgilc
4f406d8702
Merge branch '2876-No-se-guardan-datos-Network-components' into 'develop'
...
Fixed bug in the data collection of network component when creating its corresponding module
See merge request artica/pandorafms!1865
2018-10-25 10:58:03 +02:00
vgilc
2f9169c679
Merge branch '2903-Limitación-de-caracteres-en-Warning-Critical-status-tipo-string-al-crear-Network-component' into 'develop'
...
Increased the character limit in Warning / Critical status string type when…
See merge request artica/pandorafms!1861
2018-10-25 10:56:34 +02:00
vgilc
1de97d631a
Merge branch '2376-Bug-operaciones-masivas-de-módulos-dev' into 'develop'
...
Fixed force_type check in delete/edit modules in bulk
See merge request artica/pandorafms!1885
2018-10-25 10:43:29 +02:00
vgilc
aff94d0761
Merge branch 'ent-2543-6208-version-movil-metaconsola-no-muestra-graficas-ni-algunas-imagenes-metaconsola-no-redirige-a-vista-de-movil' into 'develop'
...
Ent 2543 6208 version movil metaconsola no muestra graficas ni algunas imagenes metaconsola no redirige a vista de movil
See merge request artica/pandorafms!1886
2018-10-25 10:40:56 +02:00
vgilc
582db8d3b5
Merge branch '2618_Bug_Acceso_agentes_en_vista_de_grupo' into 'develop'
...
Fixed enterprise ACLs in Agents View
See merge request artica/pandorafms!1853
2018-10-25 10:40:12 +02:00
vgilc
ea0474e704
Merge branch '2677-No-se-elimina-parent-id-entre-modulos-del-mismo-agente' into 'develop'
...
Fixed bug in modules deletion: parent id set to 0 in case parent has been deleted
See merge request artica/pandorafms!1727
2018-10-25 10:37:11 +02:00
vgilc
6afb1e0312
Merge branch 'ent-2705-eliminar-fichero-empty-en-la-carpeta-collection-del-agente' into 'develop'
...
Removed .empty from tarball and rpm
See merge request artica/pandorafms!1784
2018-10-25 10:35:35 +02:00
vgilc
9cc08709dd
Merge branch 'ent-2709-i6079-Real-time-graphs-de-IfOperStatus-no-muestran-nada' into 'develop'
...
Fixed booleans realtime graphs
See merge request artica/pandorafms!1866
2018-10-25 10:35:04 +02:00
vgilc
5a551da1f8
Merge branch '2759-crear-iso-precargada-enterprise-para-demos' into 'develop'
...
Minor fix in cde cluster api methods
See merge request artica/pandorafms!1864
2018-10-25 10:34:39 +02:00
vgilc
816811b5b7
Merge branch 'fix/pandora_enterprise#2808-badxml' into 'develop'
...
Prevent the counter from overflowing often when server_threshold is low.
See merge request artica/pandorafms!1837
2018-10-25 10:33:58 +02:00
vgilc
6ab39aa728
Merge branch '2932-Bug-al-crear-un-evento-por-medio-de-la-API-no-te-inserta-el-campo-agent-name' into 'develop'
...
fixed bug: calling api method create event not inserting agent name
See merge request artica/pandorafms!1877
2018-10-25 10:33:06 +02:00
vgilc
2b6e8473dc
Merge branch 'ent-2908-lentitud-vista-tactica-cuando-hay-millones-de-eventos' into 'develop'
...
Improve performance on tactical view with a lot of events
See merge request artica/pandorafms!1857
2018-10-25 10:32:11 +02:00
artica
db802c5a2e
Auto-updated build strings.
2018-10-25 00:01:22 +02:00
fbsanchez
50aa314191
WUX-UX integration
2018-10-24 19:31:39 +02:00
manuel.montes
2e74cd53f1
Changed tlayout_template name table to varchar 600
2018-10-24 16:50:40 +02:00
danielmaya
87abf1dc02
added event time filter in tactical view
2018-10-24 16:36:44 +02:00
manuel.montes
9d7f063ef2
Changed tlayout_template name table to varchar 600
2018-10-24 12:39:58 +02:00
fbsanchez
f0dbff1885
Merge remote-tracking branch 'origin/develop' into 2759-crear-iso-precargada-enterprise-para-demos
2018-10-24 12:22:12 +02:00
manuel.montes
f4add9a7f8
Changed tlayout_template name table to varchar 600
2018-10-24 11:49:18 +02:00
artica
7a64bb4855
Auto-updated build strings.
2018-10-24 00:01:28 +02:00
fermin831
4cb66c31f1
Fixed logo image on metaconsole login
2018-10-23 17:43:00 +02:00
fermin831
8cb2ff1d1b
Fixed tactical view graph on mobile metaconsole
2018-10-23 17:41:14 +02:00
danielmaya
a1f28480ae
Fixed force_type check in delete/edit modules in bulk
2018-10-23 15:46:48 +02:00
fbsanchez
9765a8c113
Merge remote-tracking branch 'origin/develop' into 2759-crear-iso-precargada-enterprise-para-demos
2018-10-23 14:43:39 +02:00
danielmaya
f10a661cd6
Fixed group and set_center
2018-10-23 12:36:20 +02:00
fermin831
2af6108b66
Removed dashboard menu if it is displayed from main page
2018-10-23 12:29:23 +02:00
artica
9a77256198
Auto-updated build strings.
2018-10-23 00:01:29 +02:00
alejandro-campos
aaa2c6aa10
fixed bug: calling api method create event not inserting agent name
2018-10-22 10:31:10 +02:00
artica
f899910dd0
Updated version and build strings.
2018-10-22 09:45:06 +02:00
daniel
6bb478ea1a
Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP
2018-10-22 08:04:36 +02:00
artica
1d0d656996
Auto-updated build strings.
2018-10-22 00:01:23 +02:00
artica
b01362a873
Auto-updated build strings.
2018-10-21 00:01:26 +02:00
artica
5ced50863c
Auto-updated build strings.
2018-10-20 00:01:25 +02:00
manuel.montes
972f4b1e89
Added unit in label graphs
2018-10-19 14:03:15 +02:00
daniel
bd2a3a82ec
silence error php7(not solution)
2018-10-19 12:25:01 +02:00
daniel
81ebfc755e
fixed gdgraph
2018-10-19 12:01:22 +02:00
daniel
a7918a1816
delete field flash chart php7
2018-10-19 11:56:49 +02:00
daniel
8c49b26a91
php7 version
2018-10-19 11:37:11 +02:00
daniel
ffc7734ebc
delete flash_charts and library pchart
2018-10-19 11:31:06 +02:00
vgilc
b7f9149c20
Merge branch '2920-No-funciona-el-wizard-para-crear-agentes-desde-la-metaconsola' into 'develop'
...
Changed function that creates a new agent from metaconsole to set field name…
See merge request artica/pandorafms!1873
2018-10-19 11:30:47 +02:00
daniel
0a1bee92a5
fixed slicebar to php7
2018-10-19 10:49:13 +02:00
alejandro-campos
3fd588353b
Changed function that creates a new agent from metaconsole to set field name with a hash and fixed bug when setting alias in database
2018-10-19 10:43:43 +02:00
daniel
b736746e1c
php version upgrade
2018-10-19 10:04:26 +02:00
artica
f340a3dda0
Auto-updated build strings.
2018-10-19 00:01:26 +02:00
fermin831
4d3c74ed37
Minor typo fix in events responses
2018-10-18 19:20:37 +02:00
fermin831
40ceec6561
Fixed macro _agent_adress_ on events responses
2018-10-18 18:45:11 +02:00
fermin831
cde7e011a5
Fixed module_crontab in windows agent on minutes wildcard
2018-10-18 18:01:36 +02:00
vgilc
9eefa6ff85
Merge branch '2471-Custom_graphs_en_consolas_visuales' into 'develop'
...
2471 custom graphs en consolas visuales
See merge request artica/pandorafms!1868
2018-10-18 13:35:54 +02:00
daniel
e299209a92
fixed visual console custam graph in meta
2018-10-18 13:24:15 +02:00
