Commit Graph

19108 Commits

Author SHA1 Message Date
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
marcos ad4781eb3c fixed error with dialog task list 2020-04-03 12:48:52 +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-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
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
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
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
Jose Gonzalez 6be6e19ad3 WIP: Ready for testing 2020-04-01 16:21:28 +02:00
Jose Gonzalez 4f2ad67f58 WIP: Deleted legacy menu entry 2020-04-01 13:13:31 +02:00
Jose Gonzalez faf7c5462e Applied solution for image size issues in toggle bar 2020-04-01 09:25:18 +02:00
artica f68d84940c Auto-updated build strings. 2020-04-01 01:00:19 +02:00
Jose Gonzalez cba95e4423 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-03-31 17:56:46 +02:00
fbsanchez 7f1d4725bd minor fix mr 2020-03-31 17:52:20 +02:00
Jose Gonzalez a715b7d74a WIP 2020-03-31 13:00:07 +02:00
Jose Gonzalez 4c332a3543 WIP: Must do low changes 2020-03-31 10:47:00 +02:00
Jose Gonzalez 6cad02635e 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-03-31 10:45:37 +02:00
Jose Gonzalez f28de6f4d0 Fixed db issue 2020-03-31 10:45:30 +02:00
fbsanchez 3ad3a07d93 Merge remote-tracking branch 'origin/develop' into ent-5575-wizard-de-modulos-y-recon-by-steps 2020-03-31 10:02:52 +02:00
daniel 263eaeeebd Fix bundle Ehorus 2020-03-31 09:33:39 +02:00
artica a2106a2056 Auto-updated build strings. 2020-03-31 01:00:18 +02:00
fbsanchez acabe543c4 csv recon0 2020-03-30 19:44:44 +02:00
Jose Gonzalez c2d81238d6 WIP: Near to finish 2020-03-30 19:03:55 +02:00
Jose Gonzalez fa372656f4 Fixed issue with DB 2020-03-30 17:48:09 +02:00
Jose Gonzalez c0b7c7e339 Changed breadcrumb for PEN form 2020-03-30 17:12:49 +02:00
Jose Gonzalez dc55ca5eff WIP: Changes with PEN tables 2020-03-30 17:02:34 +02:00
Jose Gonzalez 85765099ea 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-03-30 17:01:03 +02:00
Jose Gonzalez d09c5f355b WIP: Fixes and refactor 2020-03-30 17:00:48 +02:00
fbsanchez 6ea901e7ee Limitations 2020-03-30 15:07:05 +02:00
fbsanchez c556bf3ba8 License validation 2020-03-30 15:03:22 +02:00
fbsanchez a7c783242d Remaining stuff 2020-03-30 12:51:52 +02:00
Jose Gonzalez e883312038 Modified menu 2020-03-30 08:22:07 +02:00
artica 7991d6f215 Auto-updated build strings. 2020-03-30 01:00:14 +02:00
artica ea4b3bff04 Auto-updated build strings. 2020-03-29 01:00:15 +01:00
artica 9ca21e8768 Auto-updated build strings. 2020-03-28 01:00:19 +01:00
Jose Gonzalez 4e019fe193 Modified name for Network component to Remote component 2020-03-27 13:47:49 +01:00
Jose Gonzalez a150417ad3 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
Merge to get the new code
2020-03-27 12:18:17 +01:00
Jose Gonzalez 1be120b1dc Solved issue with display style 2020-03-27 12:18:09 +01:00
fbsanchez 6a14ddea73 minor fix 2020-03-27 11:50:41 +01:00
fbsanchez dffaafbf6a 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-03-27 11:42:09 +01:00
fbsanchez 3a74e25068 PEN management 2020-03-27 11:41:56 +01:00
Jose Gonzalez 75de601f57 Forms modified for be able add raw inputs 2020-03-27 08:51:17 +01:00
artica d2eac81d39 Auto-updated build strings. 2020-03-27 01:00:18 +01:00
Jose Gonzalez 161c1eb643 WIP: Minor fixes 2020-03-26 14:41:54 +01:00
fbsanchez e48ef76f35 merge 2020-03-26 14:38:23 +01:00
daniel 709201bf23 dashboards 2020-03-26 12:29:38 +01:00
Jose Gonzalez 1d11e9324f 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
Accept input changes
2020-03-26 12:17:39 +01:00
Jose Gonzalez 2b21266a38 WIP: At this point, PEN form is operative and functional 2020-03-26 12:17:28 +01:00
fbsanchez 2fb3d664cf 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-03-26 09:10:13 +01:00
fbsanchez d40035a716 restoration 2020-03-26 09:10:08 +01:00
fbsanchez 2c8655b1a3 restored install.php 2020-03-26 09:09:54 +01:00
Jose Gonzalez 86cbecc9a0 WIP: PEN form near to clear 2020-03-26 09:04:10 +01:00
artica 63fca15ead Auto-updated build strings. 2020-03-26 01:00:17 +01:00
Daniel Rodriguez 87f2e434a4 Merge branch 'ent-5530-Mostrar-el-tiempo-en-que-un-elemento-se-ha-mantenido-en-un-estado' into 'develop'
changes to show last status change of modules

See merge request artica/pandorafms!3114
2020-03-25 18:10:09 +01:00
fbsanchez fecff8aa93 Discovery review advanced 2020-03-25 18:02:58 +01:00
alejandro-campos 531e729ebe added N/A in case last status change is not set 2020-03-25 18:01:39 +01:00
alejandro-campos a8325653d4 add N/A in case time last_status_change is not set 2020-03-25 17:40:05 +01:00
alejandro-campos ecc6cd8f4e Merge branch 'ent-5530-Mostrar-el-tiempo-en-que-un-elemento-se-ha-mantenido-en-un-estado' of https://brutus.artica.es:8081/artica/pandorafms into ent-5530-Mostrar-el-tiempo-en-que-un-elemento-se-ha-mantenido-en-un-estado 2020-03-25 16:22:14 +01:00
alejandro-campos 4246c15157 add not available in case there is no last status change registered 2020-03-25 16:21:51 +01:00
Jose Gonzalez e1d233453f Update database files 2020-03-25 13:05:56 +01:00
artica 29cac0477e Auto-updated build strings. 2020-03-25 01:00:16 +01:00
Jose Gonzalez 3a5e7b08e5 WIP: Added class and page for PENs management 2020-03-24 15:14:57 +01:00
Daniel Rodriguez 415a9b4250 Merge branch 'ent-5250-Bug-con-nombres-en-la-task-list' into 'develop'
fixed visual bug in table

See merge request artica/pandorafms!3071
2020-03-24 14:17:21 +01:00
Alejandro Campos b56076044b Merge branch 'develop' into 'ent-5530-Mostrar-el-tiempo-en-que-un-elemento-se-ha-mantenido-en-un-estado'
# Conflicts:
#   pandora_console/extras/mr/37.sql
2020-03-24 13:55:57 +01:00
Alejandro Fraguas e4ea3e036b Merge branch 'ent-5597-9746-primera-carga-de-filtro-no-funciona' into 'develop'
Fixed tags_without

See merge request artica/pandorafms!3116
2020-03-24 11:32:33 +01:00
Tatiana Llorente 4777ecd4bf Ent 5439 error grafica eventos de agente 2020-03-24 10:12:14 +01:00
Jose Gonzalez 2e4de8664e WIP: Changes in menu 2020-03-24 08:04:37 +01:00
Jose Gonzalez 8523d6e429 WIP: Modify menu to apply the proper changes 2020-03-24 07:54:29 +01:00
artica ce2353d54d Auto-updated build strings. 2020-03-24 01:00:17 +01:00
fbsanchez 23c19856b8 minor fixes 2020-03-23 19:09:22 +01:00
Jose Gonzalez c18d339730 WIP: Backup upload 2020-03-23 15:16:54 +01:00
Jose Gonzalez 28cdbf1409 Added rawInputs for forms construtor 2020-03-23 15:15:44 +01:00
alejandro-campos 9d14c25b40 added order functionality to last status change column 2020-03-23 13:19:08 +01:00
Daniel Maya 11324af76a Fixed tags_without 2020-03-23 13:13:45 +01:00