24159 Commits

Author SHA1 Message Date
Jose Gonzalez
5db6ba6c5d Merge branch 'ent-5575-wizard-de-modulos-y-recon-by-steps' of brutus.artica.es:artica/pandorafms into ent-5575-wizard-de-modulos-y-recon-by-steps 2020-04-06 16:49:35 +02:00
Jose Gonzalez
3537731ee7 WIP: minor fix with CSV file names 2020-04-06 16:49:22 +02:00
fbsanchez
eb64fd8758 minor fixes 2020-04-06 16:10:37 +02:00
fbsanchez
c743a2b204 minor fix 2020-04-06 14:32:20 +02:00
fbsanchez
6cb9b06cea minor fix, license limits while reapplying queue 2020-04-06 13:42:39 +02:00
fbsanchez
3f9bdf65df minor fixes and target selection (buttons) 2020-04-06 13:00:09 +02:00
Jose Gonzalez
dacde2d0b2 Merge branch 'ent-5575-wizard-de-modulos-y-recon-by-steps' of brutus.artica.es:artica/pandorafms into ent-5575-wizard-de-modulos-y-recon-by-steps 2020-04-06 12:15:05 +02:00
Jose Gonzalez
fc2ea5aabf Solved issue with CSV Export 2020-04-06 12:14:57 +02:00
fbsanchez
5205e0e06f minor update 2020-04-06 12:05:03 +02:00
Jose Gonzalez
0aa9976640 Merge branch 'ent-5575-wizard-de-modulos-y-recon-by-steps' of brutus.artica.es:artica/pandorafms into ent-5575-wizard-de-modulos-y-recon-by-steps 2020-04-06 11:58:48 +02:00
Jose Gonzalez
a93812d1a8 Solved issues in ModuleTemplates class 2020-04-06 11:58:42 +02:00
fbsanchez
2d4b977d26 Merge remote-tracking branch 'origin/develop' into ent-5575-wizard-de-modulos-y-recon-by-steps 2020-04-06 11:05:18 +02:00
fbsanchez
1523dca9b2 Merge branch 'ent-5575-wizard-de-modulos-y-recon-by-steps' of brutus.artica.es:artica/pandorafms into ent-5575-wizard-de-modulos-y-recon-by-steps 2020-04-06 11:04:57 +02:00
fbsanchez
72f026f152 Minor fixes, group and review while exceeded license 2020-04-06 11:04:53 +02:00
Jose Gonzalez
a6ce19db66 WIP: Backup upload 2020-04-06 09:49:59 +02:00
artica
a8043e98f9 Auto-updated build strings. 2020-04-06 01:00:14 +02:00
artica
e013e26892 Auto-updated build strings. 2020-04-05 01:00:14 +02:00
artica
d18dbc10e7 Auto-updated build strings. 2020-04-04 01:00:20 +02:00
Daniel Rodriguez
846e6100b8 Merge branch 'ent-5395-Pelayo-Fallo-en-el-eje-de-titulos-de-los-custom-graphs-de-barra' into 'develop'
fix format function for X axis of custom graphs

See merge request artica/pandorafms!3138
2020-04-03 13:55:59 +02:00
Jose Gonzalez
5c04c6c03b Minor fixes with data 2020-04-03 12:55:48 +02:00
Daniel Rodriguez
a901e91274 Merge branch 'ent-5652-Grafica-de-modulo-en-los-email-gigante' into 'develop'
Ent 5652 grafica de modulo en los email gigante

See merge request artica/pandorafms!3135
2020-04-03 12:28:28 +02:00
Daniel Rodriguez
89e7d1921f Merge branch 'ent-5657-al-añadir-accion-en-la-lista-de-alertas-el-dialogo-modal-no-muestra-en-nombre-de-agente' into 'develop'
fixed minnnor error

See merge request artica/pandorafms!3137
2020-04-03 12:06:50 +02:00
Daniel Rodriguez
c4bec9c36c Merge branch 'ent-5654-El-sistema-de-modificacion-de-notificaciones-no-funciona' into 'develop'
minor visual changes on user notifications editor

See merge request artica/pandorafms!3134
2020-04-03 11:29:53 +02:00
Alejandro Fraguas
23e3f69065 Merge branch 'ent-4827-8899-crear-nuevo-agente-con-binario-y-anadirlo-en-el-repositorio' into 'develop'
spec version

See merge request artica/pandorafms!3129
2020-04-03 10:44:41 +02:00
alejandro-campos
80ce89e650 fix format function for X axis of custom graphs 2020-04-03 10:41:24 +02:00
alejandro-campos
0c3a7166e0 fix format function for X axis of custom graphs 2020-04-03 10:34:54 +02:00
Jose Gonzalez
17fbde311e Merge branch 'ent-5575-wizard-de-modulos-y-recon-by-steps' of brutus.artica.es:artica/pandorafms into ent-5575-wizard-de-modulos-y-recon-by-steps 2020-04-03 07:43:47 +02:00
Jose Gonzalez
b8c8590e0b Finished module templates 2020-04-03 07:43:38 +02:00
artica
297693a9d3 Auto-updated build strings. 2020-04-03 01:00:18 +02:00
Kike
d908a9f7f6 Added default modules templates for recon tasks 2020-04-02 19:12:49 +02:00
marcos
f229dada52 fixed minnnor error 2020-04-02 19:02:14 +02:00
fbsanchez
79378994b4 schema minor fixes 2020-04-02 17:56:17 +02:00
Daniel Rodriguez
81e7e9a7d9 Merge branch 'ent-5656-Admin-lista-de-usuarios-cambios-menores-en-la-visualizacion' into 'develop'
minor visual changes

See merge request artica/pandorafms!3132
2020-04-02 15:25:40 +02:00
Daniel Maya
9b1d8a52de Fixed graph height when send email by alert 2020-04-02 14:58:03 +02:00
Daniel Rodriguez
1c596ea8af Merge branch 'ent-5640-9818-Alertas-SNMP-no-inserta-grupo-en-creacion-de-eventos' into 'develop'
Ent 5640 9818 alertas snmp no inserta grupo en creacion de eventos

See merge request artica/pandorafms!3127
2020-04-02 14:33:00 +02:00
Daniel Rodriguez
557864fdab Merge branch 'ent-5389-Errores-agente-debian' into 'develop'
copy plugins instead of moving

See merge request artica/pandorafms!3124
2020-04-02 14:32:23 +02:00
Daniel Rodriguez
16e7b4245d Merge branch 'ent-5604-policy-modules-japanese-bug' into 'develop'
Ent 5604 policy modules japanese bug

See merge request artica/pandorafms!3120
2020-04-02 14:30:02 +02:00
Luis
bcd9aabcd8 Ent 5604 policy modules japanese bug 2020-04-02 14:30:02 +02:00
Jose Gonzalez
172bbed817 Added onKeyDown feature for text inputs 2020-04-02 12:53:21 +02:00
Jose Gonzalez
6a7e9ba400 Added filter for components. Also wiped dirty code 2020-04-02 12:48:25 +02:00
alejandro-campos
60c766ca29 minor visual changes on user notifications editor 2020-04-02 10:37:59 +02:00
Jose Gonzalez
933bdef165 Added solution for multiple template delete 2020-04-02 08:10:37 +02:00
artica
e30b9a32d8 Auto-updated build strings. 2020-04-02 01:00:16 +02:00
fbsanchez
778d5387d1 Merge branch 'ent-5575-wizard-de-modulos-y-recon-by-steps' of brutus.artica.es:artica/pandorafms into ent-5575-wizard-de-modulos-y-recon-by-steps 2020-04-01 18:17:01 +02:00
fbsanchez
bb1ad4d2a9 Updates sat. compatibility 2020-04-01 18:16:57 +02:00
alejandro-campos
6d6b891650 minor visual changes 2020-04-01 17:32:22 +02:00
Jose Gonzalez
30844bac35 Merge branch 'ent-5575-wizard-de-modulos-y-recon-by-steps' of brutus.artica.es:artica/pandorafms into ent-5575-wizard-de-modulos-y-recon-by-steps 2020-04-01 17:26:09 +02:00
Jose Gonzalez
c31a288cfd Minor fix when create a template and add components 2020-04-01 17:26:04 +02:00
fbsanchez
e249233205 minor fixes 2020-04-01 16:43:04 +02:00
Jose Gonzalez
1b8fa26193 Minor fixes applied 2020-04-01 16:36:06 +02:00