1330 Commits

Author SHA1 Message Date
fbsanchez
b384e97da5 Test REGEXP is valid before apply in MySQL 2021-03-09 10:17:29 +01:00
alejandro.campos@artica.es
0a8c478c47 visual fixes in agent view graphs 2021-03-08 17:48:59 +01:00
Daniel Rodriguez
94b04a8ef4 Merge branch 'ent-6106-Exportacion-CSV-en-icono-grafica-es-diferente-a-la-exportacion-normal' into 'develop'
Fix styles file export_data

See merge request artica/pandorafms!3691
2021-03-04 10:29:52 +00:00
daniel
fbf26fab91 Fix styles file export_data 2021-03-04 10:29:52 +00:00
Daniel Rodriguez
51404eda8d Merge branch 'ent-7077-no-funciona-doble-auth-meta' into 'develop'
Ent 7077 no funciona doble auth meta

See merge request artica/pandorafms!3866
2021-03-02 12:24:03 +00:00
Luis
93a4a90dd6 Ent 7077 no funciona doble auth meta 2021-03-02 12:24:03 +00:00
fbsanchez
d96590aea5 Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision
Conflicts:
	pandora_console/include/functions_ui.php
	pandora_console/include/styles/pandora.css
2021-03-02 09:40:15 +01:00
Daniel Rodriguez
4fbfc14479 Merge branch 'ent-6817-Meter-spinning-Loading-en-la-visualizacion-de-graficas-de-modulos' into 'develop'
Fix loading charts modules and interfaces

See merge request artica/pandorafms!3700
2021-03-01 12:16:27 +00:00
Daniel Rodriguez
39d0e66983 Merge branch 'ent-6378-descarga-custom-field-view' into 'develop'
Added ACL check to custom view CSV donwload

See merge request artica/pandorafms!3714
2021-03-01 10:47:50 +00:00
fbsanchez
85f37a91de Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision
Conflicts:
	pandora_console/include/functions_ui.php
2021-02-22 12:01:29 +01:00
fbsanchez
b17d6349f7 Multiple fixes port defition 2021-02-09 13:44:21 +01:00
fbsanchez
2639533cc1 Fixes 2021-02-09 12:05:59 +01:00
fbsanchez
ecf0f3d161 Force error catching while SNMP browsing 2021-02-09 10:25:42 +01:00
fbsanchez
e711239c69 Added port, limited base OID (default) removed timeout (browser) capturing error to message 2021-02-08 17:42:41 +01:00
fbsanchez
380c77be02 Merge remote-tracking branch 'origin/develop' into ent-6384-consola-visual-nuevo-elemento-interfaz-de-red
Conflicts:
	pandora_console/include/lib/Module.php
	pandora_console/include/visual-console-client/vc.main.css.map
2021-02-02 12:15:24 +01:00
fbsanchez
0ddc1929fa multiple fixes 2021-02-02 11:25:26 +01:00
fbsanchez
b8980c189c Schedule history db schema check after MR update 2021-01-28 18:50:55 +01:00
alejandro-campos
0549f2c604 added file to open folder 2021-01-18 10:31:53 +01:00
José González
3199b3d6b5 Merge branch 'develop' into 'ent-6407-server-to-execute-snmp-browser'
# Conflicts:
#   pandora_console/include/ajax/snmp_browser.ajax.php
2021-01-07 14:14:33 +01:00
Daniel Rodriguez
b9a2998c49 Merge branch 'ent-6490-Errores-en-edicion-de-acciones-de-alertas' into 'develop'
Ent 6490 errores en edicion de acciones de alertas

See merge request artica/pandorafms!3657
2021-01-04 11:11:16 +01:00
Daniel Rodriguez
b0f862b4c7 Merge branch 'ent-1175-copyright-actualizados' into 'develop'
Updated copyrights

Closes pandora_enterprise#1175

See merge request artica/pandorafms!3668
2020-12-23 17:19:46 +01:00
Daniel Rodriguez
fc49958c96 Merge branch 'ent-6681-SNMP-Browser-multiple-remote-components-y-abrir-ventana-adicional-en-el-navegador' into 'develop'
Ent 6681 snmp browser multiple remote components y abrir ventana adicional en el navegador

See merge request artica/pandorafms!3608
2020-12-23 16:55:56 +01:00
José González
623b729001 Merge branch 'develop' into 'ent-1175-copyright-actualizados'
# Conflicts:
#   pandora_agents/pc/Win32/pandora_agent.conf
#   pandora_agents/win32/bin/pandora_agent.conf
#   pandora_console/extensions/realtime_graphs.php
#   pandora_console/godmode/snmpconsole/snmp_alert.php
#   pandora_console/include/functions_ui.php
#   pandora_console/install.php
#   pandora_console/operation/agentes/realtime_win.php
2020-12-14 11:10:35 +01:00
Luis Calvo
734efbf892 Added ACL check to custom view CSV donwload 2020-12-11 10:10:22 +01:00
Daniel Barbero Martin
aa52ab01df Fix loading charts modules and interfaces 2020-12-09 14:05:40 +01:00
Jose Gonzalez
649442f794 Updated copyrights 2020-11-27 13:52:35 +01:00
Jose Gonzalez
9bf70add51 Fixed snmp server selection 2020-11-26 10:35:48 +01:00
Daniel Maya
1cf3381797 Fixed update alert actions 2020-11-26 10:33:32 +01:00
marcos
13d90bb1c5 Merge remote-tracking branch 'origin/develop' into ent-5719-9894-2fa-forzar-habilitado-y-no-poder-ser-desactivado-por-el-usuario 2020-11-18 12:05:57 +01:00
Daniel Maya
0ea8196db0 Fixed create network components 2020-11-12 13:44:52 +01:00
fbsanchez
b585a4e372 Merge remote-tracking branch 'origin/develop' into ent-6384-consola-visual-nuevo-elemento-interfaz-de-red 2020-11-03 16:35:25 +01:00
Daniel Rodriguez
946c548244 Merge branch 'ent-6626filtros-de-eventos-personalizados-no-guardia-varios-apartados' into 'develop'
Primeras modificaciones del filtro de eventos

See merge request artica/pandorafms!3585
2020-10-30 14:42:41 +01:00
daniel
c4e7c6b5f1 fix events acknowledge-by 2020-10-30 14:42:10 +01:00
Daniel Rodriguez
fe90008d17 Merge branch 'ent-6587-bug-historico-comentarios-eventos' into 'develop'
Handled comments for validated comments

Closes pandora_enterprise#6587

See merge request artica/pandorafms!3564
2020-10-30 10:46:52 +01:00
fbsanchez
8e09a30a05 WIP Networklink POC 2020-10-29 17:20:16 +01:00
marcos
6bcca915ba resuelto el error que vaciaba el module search 2020-10-29 14:57:54 +01:00
marcos
cf108c0a17 se cambia el valor del modulo y marca en el filtro usado 2020-10-29 12:30:54 +01:00
marcos
edc9038783 Primeras modificaciones del filtro de eventos 2020-10-29 10:24:37 +01:00
Jose Gonzalez
765d7938f9 Handled comments for validated comments 2020-10-23 12:20:20 +02:00
Daniel Barbero Martin
73ff2cff9d fixed error report selector modules in metaconsole 2020-10-20 18:30:53 +02:00
daniel
148384f8fb phantomjs performance 2020-10-13 18:24:10 +02:00
marcos
848f60229a updates on 2FA all users feature 2020-10-06 17:02:58 +02:00
fbsanchez
2187f9d0c9 Merge remote-tracking branch 'origin/develop' into ent-5822-prueba-concepto-modal-selector-de-grupos
Conflicts:
	pandora_console/godmode/reporting/reporting_builder.item_editor.php
2020-10-02 14:56:07 +02:00
daniel
0db539c444 fix visual windows charts 2020-10-01 15:29:54 +02:00
fbsanchez
5f4893ef1a Merge remote-tracking branch 'origin/develop' into ent-5822-prueba-concepto-modal-selector-de-grupos 2020-09-29 12:47:11 +02:00
fbsanchez
3374a89ae0 Group selection improvement 2020-09-11 14:34:41 +02:00
Jose Gonzalez
42a615166e Fixed object definitions 2020-09-07 13:54:18 +02:00
alejandro-campos
0917a631ee fix parameter macros in event responses 2020-08-14 14:48:34 +02:00
alejandro-campos
90ea61f753 fix parameter macros in event responses 2020-08-13 14:10:57 +02:00
Daniel Rodriguez
f7854ab633 Merge branch 'ent-6068-snmp-browser-community-spcial-char' into 'develop'
Fixed snmp community special char

See merge request artica/pandorafms!3352
2020-08-07 09:46:57 +02:00