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

17573 Commits

Author SHA1 Message Date
Daniel Maya
0e70bc9f67 #8689 Fixed wizard 2022-03-08 18:00:09 +01:00
Daniel Maya
860400fa9c #8339 added macros _customdata_json_ and _customdata_text_ 2022-03-08 16:42:19 +01:00
Daniel Barbero Martin
dee5f092c9 Merge remote-tracking branch 'origin/develop' into ent-7933-filtro-de-busqueda-de-modulo-en-alertas-externas 2022-03-08 15:47:33 +01:00
Daniel Barbero Martin
b0d73fa3ff API CV #8677 2022-03-08 14:56:33 +01:00
Daniel Barbero Martin
4f67ec2f22 API CV #8677 2022-03-08 14:50:59 +01:00
Daniel Maya
7e29cd5a60 #8547 added macros _current_username_ and _owner_username_ 2022-03-08 10:44:24 +01:00
José González
d511d75b8d Merge branch 'develop' into 'ent-8112-icono-collapse-recortado' 
# Conflicts:
#   pandora_console/general/main_menu.php
 2022-03-08 08:53:00 +00:00
artica
223475d546 Auto-updated build strings. 2022-03-08 01:00:06 +01:00
Daniel Maya
02fe08903c #8696 Fixed warning status 2022-03-07 15:07:06 +01:00
Daniel Maya
270bb433da added heatmap ajax and class 2022-03-07 13:11:54 +01:00
Daniel Maya
d4439dcf51 heatmap css 2022-03-07 10:47:20 +01:00
José González
89d5b490bf Clean filtered references for parent modules 2022-03-07 10:45:11 +01:00
Daniel Maya
f34e8fead7 Merge branch 'develop' into ent-8458-heatmap-view 2022-03-07 10:35:26 +01:00
artica
d9f7ea4038 Auto-updated build strings. 2022-03-07 01:00:15 +01:00
artica
5f08afca26 Auto-updated build strings. 2022-03-06 01:00:16 +01:00
artica
69be7b1b55 Auto-updated build strings. 2022-03-05 01:00:19 +01:00
artica
e3c80e015d Auto-updated build strings. 2022-03-04 01:00:14 +01:00
Calvo
433b4dda62 Fix select2 search on extended events dialog 2022-03-03 18:37:33 +01:00
artica
4a7160ce39 Auto-updated build strings. 2022-03-03 01:00:15 +01:00
artica
f34722841f Auto-updated build strings. 2022-03-02 01:00:07 +01:00
Daniel Rodriguez
f69ade2ca0 Merge branch 'ent-8653-No-funciona-selector-de-grupos-en-apartado-de-perfil-en-creacion-edicion-de-usuario' into 'develop' 
fix group selector in user creation and user edition view

See merge request artica/pandorafms!4728
 2022-03-01 15:12:41 +00:00
alejandro.campos@artica.es
69749e9498 fix group selector in user creation and user edition view 2022-03-01 15:12:28 +01:00
Daniel Rodriguez
953aa2887c Merge branch 'ent-6375-proyectos-auto-aplicacion-de-politicas' into 'develop' 
some tools for policy-auto-application

See merge request artica/pandorafms!4526
 2022-03-01 12:53:36 +00:00
artica
6f23817373 Auto-updated build strings. 2022-03-01 01:00:20 +01:00
fbsanchez
c5d648677d phantomjs cache auto-clean 2022-02-28 18:56:01 +01:00
artica
2f3f82bf4c Auto-updated build strings. 2022-02-28 01:00:15 +01:00
artica
5ec4632216 Auto-updated build strings. 2022-02-27 01:00:14 +01:00
artica
8d6389c528 Auto-updated build strings. 2022-02-26 01:00:15 +01:00
Calvo
05c283642f Addedd metaconsole tree view filter for disabled agents 2022-02-25 15:37:08 +01:00
Daniel Maya
74996e3cc0 WIP heatmap 2 2022-02-25 09:41:32 +01:00
artica
144f3f2a10 Auto-updated build strings. 2022-02-25 01:00:21 +01:00
Calvo
4f3c509bde Fix credential store ACL, only accces to PM or UM 2022-02-24 17:33:13 +01:00
José González
64ed03784b Fix several issues with mobile view 2022-02-24 11:04:18 +01:00
Daniel Rodriguez
3f7067fe48 Merge branch 'ent-I-do-now-like-procedures' into 'develop' 
Allow both behaviours in alert time slots

See merge request artica/pandorafms!4711
 2022-02-24 09:55:40 +00:00
artica
2cac1fed32 Auto-updated build strings. 2022-02-24 01:00:19 +01:00
fbsanchez
deb46436d3 Merge remote-tracking branch 'origin/develop' into ent-6375-proyectos-auto-aplicacion-de-politicas 
Conflicts:
	pandora_console/extras/mr/52.sql
 2022-02-23 12:11:44 +01:00
artica
df94b6ce4a Auto-updated build strings. 2022-02-23 01:00:18 +01:00
Calvo
3e6a6445b1 Fix error/success from send feedback dialog 2022-02-22 17:29:17 +01:00
Daniel Barbero Martin
5b0d3fe6d4 remove procedure and retrocompatibility pandora_enterprise#3943 2022-02-22 13:26:13 +01:00
Daniel Barbero Martin
237a7feb98 remove procedure and retrocompatibility pandora_enterprise#3943 2022-02-22 13:20:53 +01:00
Daniel Rodriguez
3092a00edb Merge branch 'ent-8532-widget-agent-modulos-no-muestra-modulos' into 'develop' 
Fix agentmodules widget conf style

See merge request artica/pandorafms!4693
 2022-02-22 11:47:55 +00:00
Daniel Rodriguez
dcfe55f2dd Merge branch 'ent-8600-fallo-umbrales-creacion-modulo-snmp-interface' into 'develop' 
Quick fix

See merge request artica/pandorafms!4707
 2022-02-22 11:47:19 +00:00
José González
604633dd35 Fixed issues with interfaces view and limited to show only agents with ifaces 2022-02-22 12:37:01 +01:00
Daniel Barbero Martin
3b1b9938ee fixed select2 multiple pandora_enterprise#8606 2022-02-22 11:00:11 +01:00
artica
4eaee57c75 Auto-updated build strings. 2022-02-22 01:00:51 +01:00
Calvo
b67683adff Fix agent modules selector on meta for dashboards 2022-02-21 16:38:09 +01:00
alejandro.campos@artica.es
abae27e361 implement new netflow item 2022-02-21 15:27:41 +01:00
Calvo
bacd0a616f Merge remote-tracking branch 'origin/develop' into ent-8532-widget-agent-modulos-no-muestra-modulos 2022-02-21 13:43:20 +01:00
alejandro.campos@artica.es
931477fcd5 implement new netflow item 2022-02-21 12:26:48 +01:00
alejandro.campos@artica.es
362898681e Implement new netflow item 2022-02-21 11:51:52 +01:00