tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-08-30 06:08: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 Maya
2049805de7 #9033 conflict resolved 2022-06-27 17:13:23 +02:00
Daniel Barbero Martin
d969ac42bf legend combined graph module view pandora_enterprise#8621 2022-06-27 17:09:27 +02:00
Daniel Barbero Martin
1c051f88bc Merge remote-tracking branch 'origin/develop' into ent-7960-filtros-de-alertas-sonoras-sound-events-2 
Conflicts:
	pandora_console/include/functions_events.php
 2022-06-27 16:07:19 +02:00
Daniel Barbero Martin
3cdde5054a size form widgets dashboards pandora_enterprise#8827 2022-06-27 15:43:42 +02:00
Daniel Barbero Martin
ebe5f0de7c Merge remote-tracking branch 'origin/develop' into ent-8827-cambios-visuales-en-widget-agents-modules 2022-06-27 09:48:18 +02:00
Daniel Barbero Martin
24305b40b0 Merge remote-tracking branch 'origin/develop' into ent-8621-copiando-a-grafana-4-color-tabs-como-widget-en-dashboard 
Conflicts:
	pandora_console/include/javascript/pandora.js
	pandora_console/include/lib/Dashboard/Widget.php
	pandora_console/include/styles/dashboards.css
 2022-06-27 08:38:50 +02:00
artica
beefbff267 Auto-updated build strings. 2022-06-27 01:00:34 +02:00
artica
cab6fdbf12 Auto-updated build strings. 2022-06-26 01:00:39 +02:00
artica
036aa788fa Auto-updated build strings. 2022-06-25 01:00:46 +02:00
Junichi Satoh
8123392c50 Updated Japanese console translations. 2022-06-24 13:53:57 +09:00
artica
a7051ea40d Auto-updated build strings. 2022-06-24 01:00:53 +02:00
Daniel Barbero Martin
f89aaabc21 minor fixed events 2022-06-23 18:06:25 +02:00
Daniel Barbero Martin
5328cf21c6 Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-23 12:51:35 +02:00
Daniel Barbero Martin
58f5f4e9f1 refactor events meta pandora_enterprise#9086 2022-06-23 12:47:49 +02:00
Daniel Rodriguez
4dd65c20a8 Merge branch 'ent-8888-consolas-visuales-vista-movil-carrefour' into 'develop' 
Not orientation CV view mobile pandora_enterprise#8888

See merge request artica/pandorafms!4886
 2022-06-23 10:07:24 +00:00
Daniel Rodriguez
c0509a798c Merge branch 'ent-8812-Adaptar-WMI-Wizard-nuevo-binario-pandorawmic' into 'develop' 
Added control for WMI binary

See merge request artica/pandorafms!4884
 2022-06-23 08:27:11 +00:00
Daniel Rodriguez
d6ab78ba68 Merge branch 'ent-8912-Problemas-en-recuperación-alertas-de-evento---Necesaria-refactorizacion' into 'develop' 
Ent 8912 problemas en recuperación alertas de evento   necesaria refactorizacion

See merge request artica/pandorafms!4959
 2022-06-23 07:53:11 +00:00
artica
7854206ede Updated version and build strings. 2022-06-23 08:27:31 +02:00
Daniel Barbero Martin
b63da2066e Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-23 08:22:31 +02:00
artica
a254c7d3c5 Auto-updated build strings. 2022-06-23 01:01:15 +02:00
Daniel Rodriguez
428de71b85 Merge branch 'ent-9192-cambio-imagen-warp-update-online' into 'develop' 
new images update manager online pandora_enterprise#9192

See merge request artica/pandorafms!4976
 2022-06-22 14:44:20 +00:00
Daniel Barbero Martin
e77ae67fb2 new images update manager online pandora_enterprise#9192 2022-06-22 14:48:54 +02:00
Daniel Rodriguez
7e206716d7 Merge branch 'ent-9181-problema-al-borrar-agentes-cuando-hay-modulos-delete-pending' into 'develop' 
Ent 9181 problema al borrar agentes cuando hay modulos delete pending

See merge request artica/pandorafms!4973
 2022-06-22 12:29:19 +00:00
José González
38ecfd5b62 Added message for control return code in WMI 2022-06-22 14:25:08 +02:00
Daniel Barbero Martin
0c09e7fc22 refactor events meta pandora_enterprise#9086 2022-06-22 14:05:21 +02:00
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