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

17573 Commits

Author SHA1 Message Date
José González
5f05b79e66 Fix issue with header 2022-06-22 12:06:34 +02:00
Ramon Novoa
59ea9a716e Merge remote-tracking branch 'origin/develop' into ent-8912-Problemas-en-recuperación-alertas-de-evento---Necesaria-refactorizacion 2022-06-22 11:46:19 +02:00
Daniel Rodriguez
7798e0cd63 Merge branch 'ent-9179-actualizar-traducciones' into 'develop' 
Ent 9179 actualizar traducciones

See merge request artica/pandorafms!4969
 2022-06-22 09:07:30 +00:00
Daniel Barbero Martin
4b00e8ee3c refactor events meta pandora_enterprise#9086 2022-06-22 10:29:19 +02:00
Daniel Barbero Martin
f39d502108 refactor events meta pandora_enterprise#9086 2022-06-22 10:11:24 +02:00
edu.corral
19a26d6835 ent 9181 delete agent with delete pending modules 2022-06-22 10:01:35 +02:00
Daniel Barbero Martin
4ca78ec00c refactor events meta pandora_enterprise#9086 2022-06-22 09:44:00 +02:00
Daniel Barbero Martin
9505206328 Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-22 08:48:38 +02:00
artica
a17232fb86 Auto-updated build strings. 2022-06-22 01:00:51 +02:00
Daniel Rodriguez
2ab8918463 Merge branch 'ent-9034-Alert-SNMP-como-agent-name-vista-tactica' into 'develop' 
Clean unnecesary message

See merge request artica/pandorafms!4970
 2022-06-21 14:18:16 +00:00
edu.corral
28d25acbcb ent-9179 translations 2022-06-21 15:19:33 +02:00
José González
b2b64ae014 Merge remote-tracking branch 'origin' into ent-9034-Alert-SNMP-como-agent-name-vista-tactica 2022-06-21 14:47:28 +02:00
José González
4480455258 Clean unnecesary message 2022-06-21 14:45:17 +02:00
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
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