tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-08-30 22:28:48 +02:00
Code Issues Packages Projects Releases Wiki Activity
34,857 Commits 34 Branches 30 Tags
Commit Graph

19098 Commits

Author SHA1 Message Date
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
49df65e69a Fix ACL for ncm 2022-06-17 15:02:57 +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
b871c1fb55 Added token view and generation in user views 2022-06-17 12:13:23 +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