tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
30,550 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

16393 Commits

Author SHA1 Message Date
Daniel Barbero Martin 22717d169d Merge remote-tracking branch 'origin/develop' into ent-8827-cambios-visuales-en-widget-agents-modules 
Conflicts:
	pandora_console/include/lib/Dashboard/Widgets/service_map.php
 2022-06-21 14:43:47 +02:00
Daniel Barbero Martin 9bb072a48a refactor events meta pandora_enterprise#9086 2022-06-21 14:10:08 +02:00
edu.corral 22d9c267af ent-9041 input text style 2022-06-21 13:29:50 +02:00
Daniel Barbero Martin f93e141aac refactor events meta pandora_enterprise#9086 2022-06-21 11:22:56 +02:00
Daniel Barbero Martin c42852a18f refactor events meta pandora_enterprise#9086 2022-06-21 11:20:26 +02:00
Daniel Barbero Martin 9d23b9af4a refactor events meta pandora_enterprise#9086 2022-06-21 11:17:18 +02:00
Daniel Rodriguez 9421cd46f5 Merge branch 'ent-8857-llamada-set-new_agent-api-meta' into 'develop' 
Api create agent meta support

See merge request artica/pandorafms!4860
 2022-06-21 08:39:22 +00:00
artica a5d13f5e16 Auto-updated build strings. 2022-06-21 01:00:18 +02:00
Daniel Rodriguez 8fb54be1bb Merge branch 'ent-8730-problema-notificacion-consola-con-parches-soporte' into 'develop' 
some fixes in version control and php memory usage

See merge request artica/pandorafms!4803
 2022-06-20 15:07:01 +00:00
José González 275fd2ed19 Fix minor issues related with pandorawmic 2022-06-20 16:20:49 +02:00
Daniel Barbero Martin 3e59093b0e refactor events meta pandora_enterprise#9086 2022-06-20 12:29:00 +02:00
Daniel Rodriguez fa8ed3398f Merge branch 'ent-8061-vista-netflow-con-black-theme' into 'develop' 
Fix black theme issues

See merge request artica/pandorafms!4873
 2022-06-20 09:38:25 +00:00
Daniel Rodriguez f4761e5c0f Merge branch 'ent-9067-no-estan-funcionando-los-enlaces-sistema-de-notificacion' into 'develop' 
Ent 9067 no estan funcionando los enlaces sistema de notificacion

See merge request artica/pandorafms!4964
 2022-06-20 09:09:16 +00:00
Daniel Rodriguez a7c61d9ee8 Merge branch 'ent-9139-Widget-Top-N-sale-mal-Continuacion' into 'develop' 
Fix

See merge request artica/pandorafms!4956
 2022-06-20 08:36:56 +00:00
Ramon Novoa 9b5b4deb67 Merge remote-tracking branch 'origin/develop' into ent-8912-Problemas-en-recuperación-alertas-de-evento---Necesaria-refactorizacion 2022-06-20 10:25:22 +02:00
Daniel Barbero Martin ca298422bd Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-20 07:58:40 +02:00
artica c4fadcd461 Auto-updated build strings. 2022-06-20 01:00:14 +02:00
artica d2e140e85b Auto-updated build strings. 2022-06-19 01:00:14 +02:00
artica 7574e99e80 Auto-updated build strings. 2022-06-18 01:00:19 +02:00
Calvo 291c6c6a69 Merge remote-tracking branch 'origin/develop' into ent-8857-llamada-set-new_agent-api-meta 2022-06-17 13:27:31 +02:00
Daniel Barbero Martin 7e25a86d52 refactor events meta pandora_enterprise#9086 2022-06-17 12:50:40 +02:00
José González 6f903023a7 Fix 2022-06-17 12:42:24 +02:00
José González 7f2182d52a Merge branch 'develop' into 'ent-8912-Problemas-en-recuperación-alertas-de-evento---Necesaria-refactorizacion' 
# Conflicts:
#   pandora_console/install.php
 2022-06-17 07:37:01 +00:00
Daniel Barbero Martin f3e645146d Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-17 08:51:11 +02:00
Daniel Maya 6d1f03a633 #9158 Fixed digital clock 2022-06-17 08:17:55 +02:00
artica ddee99b016 Auto-updated build strings. 2022-06-17 01:00:19 +02:00
edu.corral a0f7c9e6a2 ent-9067 fixed notification system 2022-06-16 16:19:33 +02:00
José González 4c2ad2822f Fix visual issue 2022-06-16 16:04:22 +02:00
Daniel Maya ad98356957 resolved conflict 2022-06-16 14:21:47 +02:00
Daniel Rodriguez bea57c8991 Merge branch 'ent-8861-wizard-snmp-convierte-valores-hex-string-en-string' into 'develop' 
Changed snmpwalk parameters for wizard

See merge request artica/pandorafms!4872
 2022-06-16 12:17:27 +00:00
Daniel Barbero Martin 6f49f63353 fixed VC pandora_enterprise#8888 2022-06-16 14:09:30 +02:00
Daniel Rodriguez d400d5b7dc Merge branch 'ent-8860-mejora-wizard-snmp' into 'develop' 
Applied fix for snmp

See merge request artica/pandorafms!4868
 2022-06-16 11:46:53 +00:00
Daniel Rodriguez ae5c4dca24 Merge branch 'ent-9026-Buscador-roto-agregar-acciones-a-alerta-SNMP' into 'develop' 
Fix several issues with SNMP Alert view

See merge request artica/pandorafms!4913
 2022-06-16 11:35:40 +00:00
edu.corral 4ee4590690 ent-9067 notifications fixed 2022-06-16 13:02:49 +02:00
José González 32bfa233d5 Merge 2022-06-16 11:45:58 +02:00
Daniel Barbero Martin 8e7ed75b3e refactor events meta pandora_enterprise#9086 2022-06-16 11:31:07 +02:00
José González bad0335502 Changed styles 2022-06-16 11:14:29 +02:00
Daniel Rodriguez 52cfd6b70a Merge branch 'ent-8899-13499-problema-con-conexion-db-hist-con-contrasenas-con-caracteres-especiales' into 'develop' 
Ent 8899 13499 problema con conexion db hist con contrasenas con caracteres especiales

See merge request artica/pandorafms!4852
 2022-06-16 09:03:28 +00:00
Daniel Rodriguez fa28b5b7e1 Merge branch 'ent-9000-cambio-update-manager-a-warp-update' into 'develop' 
Ent 9000 cambio update manager a warp update

See merge request artica/pandorafms!4957
 2022-06-16 08:43:12 +00:00
Daniel Barbero Martin acef7e6f63 Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 
Conflicts:
	pandora_console/operation/events/events.php
 2022-06-16 09:09:49 +02:00
Daniel Maya bb01bfe2d0 #8899 Fixed history_db_enabled 2 2022-06-16 08:44:09 +02:00
Daniel Rodriguez 74e2dcad26 Merge branch 'ent-9064-Cambiar-logo-en-CSS-blanco-estándar' into 'develop' 
Set new brand and color for header

See merge request artica/pandorafms!4944
 2022-06-16 06:43:21 +00:00
Daniel Rodriguez d57394c0b9 Merge branch 'ent-8856-no-funciona-crear-componentes-en-metaconsola-api-2' into 'develop' 
Ent 8856 no funciona crear componentes en metaconsola api 2

See merge request artica/pandorafms!4955
 2022-06-16 06:42:38 +00:00
Daniel Rodriguez ffdc8ee656 Merge branch 'ent-9032-Mejora-visual-eventos-largos-destrozan' into 'develop' 
Improve event names

See merge request artica/pandorafms!4951
 2022-06-16 06:41:07 +00:00
artica 592d09d34a Auto-updated build strings. 2022-06-16 01:00:17 +02:00
Daniel Barbero Martin d22c667776 fixed VC pandora_enterprise#8888 2022-06-15 19:50:19 +02:00
Daniel Barbero Martin 1bf1a83782 Merge remote-tracking branch 'origin/develop' into ent-8888-consolas-visuales-vista-movil-carrefour 2022-06-15 19:49:31 +02:00
Daniel Barbero Martin 8ad6d350af refactor events meta pandora_enterprise#9086 2022-06-15 13:06:10 +02:00
Daniel Maya 9a7e0e3228 #8899 Fixed history_db_enabled 2022-06-15 09:37:29 +02:00
Daniel Barbero Martin 080c10aad7 Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-15 08:50:00 +02:00
artica 3ee1ba0bbc Auto-updated build strings. 2022-06-15 01:00:16 +02:00
Daniel Barbero Martin b82b3c3fb1 refactor events meta pandora_enterprise#9086 2022-06-14 18:47:09 +02:00
Daniel Barbero Martin 3b3e964cf9 Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-14 07:57:18 +02:00
artica c7b8c55284 Auto-updated build strings. 2022-06-14 01:00:42 +02:00
Daniel Barbero Martin 5968febd04 Merge remote-tracking branch 'origin/develop' into ent-7960-filtros-de-alertas-sonoras-sound-events-2 
Conflicts:
	pandora_console/include/javascript/pandora.js
 2022-06-13 17:10:19 +02:00
Daniel Barbero Martin 90013603a7 refactor events meta pandora_enterprise#9086 2022-06-13 17:06:09 +02:00
José González dc599d2fe6 Handle header image with community and with black theme 2022-06-13 16:23:37 +02:00
José González 8e4cffbc0a Several style refactory 2022-06-13 12:34:16 +02:00
Daniel Rodriguez 871e1cc0c0 Merge branch 'ent-9066-Mala-traducción-al-castellano-Menú-colapsado' into 'develop' 
Fixed languages files

See merge request artica/pandorafms!4943
 2022-06-13 09:42:45 +00:00
Daniel Rodriguez 38de162f94 Merge branch 'ent-9031-Mejora-visual-Cajas-de-busqueda-avanzada-de-ver-eventos' into 'develop' 
Ent 9031 mejora visual cajas de busqueda avanzada de ver eventos

See merge request artica/pandorafms!4925
 2022-06-13 09:22:54 +00:00
Daniel Barbero Martin 5680b82563 Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-13 08:16:40 +02:00
artica 85f31c5ab4 Auto-updated build strings. 2022-06-13 01:00:16 +02:00
artica 62bcc9e267 Auto-updated build strings. 2022-06-12 01:00:15 +02:00
artica 46897aff83 Auto-updated build strings. 2022-06-11 01:00:50 +02:00
José González 3ec50f10b4 Update warp strings 2022-06-10 12:57:45 +02:00
José González 022d28981d Update styles 2022-06-10 12:57:04 +02:00
José González 0784b25ea0 Update Warp strings 2022-06-10 12:56:45 +02:00
José González bb17645c88 Fix 2022-06-10 10:40:28 +02:00
José González 815a737a69 Change strings for Update Manager references to WARP update 2022-06-10 10:17:23 +02:00
artica 32c62e9f93 Auto-updated build strings. 2022-06-10 01:00:21 +02:00
edu.corral ae657ee018 8856 meta api functions 2022-06-09 17:22:00 +02:00
Daniel Maya 2cfb4e53c2 #9033 Fixed group events 2022-06-09 14:59:43 +02:00
Daniel Rodriguez 50442faf26 Merge branch 'ent-9108-No-funciona-widget-Odometro-en-version-Open' into 'develop' 
Ent 9108 no funciona widget odometro en version open

See merge request artica/pandorafms!4938
 2022-06-09 12:50:39 +00:00
José González bce182f2b2 Improve event names 2022-06-09 11:02:11 +02:00
Daniel Rodriguez 336bc74d49 Merge branch 'ent-9021-proteccion-en-cascada-bucle-padre-hijo' into 'develop' 
Ent 9021 proteccion en cascada bucle padre hijo

See merge request artica/pandorafms!4921
 2022-06-09 07:34:40 +00:00
Daniel Rodriguez ad9a864b1c Merge branch 'ent-9116-13158-Nuevos-fallos-componentes-locales-con-politicas-con-macro' into 'develop' 
fixed macro default value not loading

See merge request artica/pandorafms!4941
 2022-06-09 07:32:18 +00:00
artica 9d28c67a1c Auto-updated build strings. 2022-06-09 01:00:21 +02:00
Daniel Barbero Martin 8dbc860f4a refactor events meta pandora_enterprise#9086 2022-06-08 17:01:15 +02:00
Daniel Rodriguez 1eea27e1f3 Merge branch 'ent-9040-Mejoras-en-la-vista-de-agents-alerts' into 'develop' 
Ent 9040 mejoras en la vista de agents alerts

See merge request artica/pandorafms!4933
 2022-06-08 09:11:19 +00:00
Daniel Barbero Martin 951a1703bf Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 
Conflicts:
	pandora_console/include/functions_reporting.php
 2022-06-08 08:15:49 +02:00
artica 8a5847a225 Auto-updated build strings. 2022-06-08 01:00:24 +02:00
Daniel Barbero Martin ee2810e680 refactor events meta pandora_enterprise#9086 2022-06-07 17:25:51 +02:00
José González ad00594b1d Set new brand and color for header 2022-06-07 17:21:13 +02:00
José González 4f21402992 Fixed languages files 2022-06-07 16:31:55 +02:00
Daniel Rodriguez 6f5e1c3f94 Merge branch 'ent-8708-Version-mobile-visualiza-alertas-de-agentes-deshabilitados' into 'develop' 
Ent 8708 version mobile visualiza alertas de agentes deshabilitados

See merge request artica/pandorafms!4859
 2022-06-07 11:41:40 +00:00
José González 9d071982f5 Improve code 2022-06-07 13:39:58 +02:00
Daniel Rodriguez bf7941ddd2 Merge branch 'ent-7757-12115-anadir-ruta-completa-en-nombre-de-servicio-en-consola-visual-dashboard' into 'develop' 
Service tree view with local scope parents

See merge request artica/pandorafms!4826
 2022-06-07 10:47:26 +00:00
Daniel Rodriguez b962afe56d Merge branch 'ent-9078-Gráfica-de-estados-de-módulos' into 'develop' 
Ent 9078 gráfica de estados de módulos

See merge request artica/pandorafms!4924
 2022-06-07 10:46:18 +00:00
alejandro.campos@artica.es 7aa40617f8 fixed macro default value not loading 2022-06-07 11:20:51 +02:00
Daniel Rodriguez c433fcf3f0 Merge branch 'ent-9038-ocultar-opciones-en-la-busqueda-de-vista-de-modulos' into 'develop' 
Ent 9038 ocultar opciones en la busqueda de vista de modulos

See merge request artica/pandorafms!4930
 2022-06-07 09:12:51 +00:00
José González 06d9e0d137 Improve security message 2022-06-07 10:51:37 +02:00
artica 851f1a19ce Auto-updated build strings. 2022-06-07 01:00:21 +02:00
José González 67ade2fccd Improved error message 2022-06-06 16:35:02 +02:00
Daniel Maya 44748a0f8b #9108 fixed modules_get_table_data 2022-06-06 16:34:16 +02:00
Daniel Rodriguez 618ff10fa2 Merge branch 'ent-8153-POST-Campos-extendidos-en-informe-de-eventos' into 'develop' 
Ent 8153 post campos extendidos en informe de eventos

See merge request artica/pandorafms!4830
 2022-06-06 10:52:51 +00:00
Daniel Barbero Martin 459df79c8b Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-06 08:16:25 +02:00
artica 9712cf6c0f Auto-updated build strings. 2022-06-06 01:00:16 +02:00
artica 05b97a3dbc Auto-updated build strings. 2022-06-05 01:00:16 +02:00
artica 44925ef341 Auto-updated build strings. 2022-06-04 01:00:22 +02:00
José González 1be4948e2d Changed strings and improve code 2022-06-03 12:26:15 +02:00