Commit Graph

19409 Commits

Author SHA1 Message Date
alejandro-campos 072aec1690 Prevent from showing toast notifications in more than one tab and change check period 2020-05-19 12:03:23 +02:00
Daniel Rodriguez 96947d32fc Merge branch 'ent-5807-Bugs-al-eliminar-widget-y-visual-con-nuevos-Dashboards' into 'develop'
Fixed errors in dashboards

See merge request artica/pandorafms!3207
2020-05-19 08:23:37 +02:00
Daniel Rodriguez 1275a550bc Merge branch 'ent-5552-error-descarga-colecciones-consola' into 'develop'
Avoid collections case for files download

Closes pandora_enterprise#5552

See merge request artica/pandorafms!3093
2020-05-19 08:21:07 +02:00
Tatiana Llorente b99298786e Ent 5754 editor de usuarios de godmode que sea visualmente similar al editor de usuarios el propio usuario 2020-05-19 08:20:04 +02:00
Daniel Rodriguez 1bc22adecd Merge branch 'ent-5789-cierre-ventanas-de-notificaciones' into 'develop'
add close option in toast

See merge request artica/pandorafms!3204
2020-05-19 08:19:04 +02:00
artica d2c2ae7502 Auto-updated build strings. 2020-05-19 01:00:16 +02:00
marcos 347f6b1bf3 add return error if group = 0 on new agent api 2020-05-18 10:15:20 +02:00
artica e8dd2b13c7 Auto-updated build strings. 2020-05-18 01:00:13 +02:00
artica eece9281e2 Auto-updated build strings. 2020-05-17 01:00:13 +02:00
artica 71cb3e0164 Auto-updated build strings. 2020-05-16 01:00:14 +02:00
artica 277a610709 Auto-updated build strings. 2020-05-15 01:00:15 +02:00
fbsanchez 585f0f011e WIP cluster rebuild 2020-05-14 17:49:02 +02:00
fbsanchez 57ccd783b0 Merge branch 'develop' into 'ent-5756-pantallas-de-configuracion-del-cluster' 2020-05-14 17:42:58 +02:00
Alejandro Fraguas aaf64e591c Merge branch 'ent-5708-review-discovery-h-d' into 'develop'
Ent 5708 review discovery h d

See merge request artica/pandorafms!3195
2020-05-14 10:32:43 +02:00
artica 44b5f2671e Auto-updated build strings. 2020-05-14 01:00:51 +02:00
Luis Calvo 4f52a693ac CSV flot export fixes 2020-05-13 19:19:58 +02:00
Alejandro Fraguas 3db0f557c9 Merge branch 'ent-4852-api-get-the-mc-event-id-from-console-event-id' into 'develop'
Ent 4852 api get the mc event id from console event

See merge request artica/pandorafms!3151
2020-05-13 11:24:43 +02:00
artica 9fc993519b Auto-updated build strings. 2020-05-13 01:00:20 +02:00
José González e435c09a01 Update get_file.php with lastest corrections 2020-05-12 18:01:47 +02:00
Daniel Rodriguez 5cab51c99d Merge branch 'ent-5554-Creador-de-mapas-de-red-se-vuelve-inoperable-despues-de-borrar-un-nodo' into 'develop'
fix accessing wrong index after deletion of node

See merge request artica/pandorafms!3122
2020-05-12 12:59:12 +02:00
Daniel Rodriguez bd5b320725 Merge branch 'ent-5559-bug-al-anadir-nuevos-permisos-en-active-directory-advanced-permissions' into 'develop'
Ent 5559 bug al anadir nuevos permisos en active directory advanced permissions

See merge request artica/pandorafms!3174
2020-05-12 12:57:55 +02:00
Daniel Rodriguez bc794918d4 Merge branch 'ent-5538-redireccion-incorrecta-en-pantalla-sin-permisos' into 'develop'
fixed error

See merge request artica/pandorafms!3143
2020-05-12 12:56:27 +02:00
Tatiana Llorente fabace239d Ent 5675 textos del sistema de licencias 2020-05-12 12:54:20 +02:00
Daniel Rodriguez 46f1f44883 Merge branch 'ent-5574-field-description-not-in-general-search-nor-agent-detailed' into 'develop'
Added agent description to search and agent detail

See merge request artica/pandorafms!3130
2020-05-12 12:53:32 +02:00
Alejandro Fraguas e8461e19f3 Merge branch 'ent-5503-pop-up-imagenes-detras-de-un-server-proxy' into 'develop'
change url for pop up reverse proxy

See merge request artica/pandorafms!3168
2020-05-12 12:50:02 +02:00
José González d1d51dcde6 Update get_file.php resolving issue with collections 2020-05-12 11:56:53 +02:00
Alejandro Fraguas 464699cbaa Merge branch 'ent-5481-agregar-nombre-a-llamada-api-get-agent-id-name-by-alias' into 'develop'
add nombre in api_get_i_name_by_alias API method

See merge request artica/pandorafms!3150
2020-05-12 09:51:09 +02:00
Jose Gonzalez 13339d5f68 Solved issue with metaconsole filemanager 2020-05-12 08:43:16 +02:00
artica 3dfef47b24 Auto-updated build strings. 2020-05-12 01:00:20 +02:00
Daniel Barbero Martin 24f4f68b33 Fixed errors in dashboards 2020-05-11 14:50:13 +02:00
Alejandro Fraguas 5f1066a342 Merge branch 'ent-5412-mensaje-de-allowoverride-en-apache' into 'develop'
notify for allowoverride

See merge request artica/pandorafms!3149
2020-05-11 12:53:12 +02:00
marcos 86f52fd8e6 changed message allow override 2020-05-11 12:24:18 +02:00
Luis Calvo 1422e076ac Fixed two times encription on wmi module pass 2020-05-11 11:18:08 +02:00
Alejandro Fraguas 46b5f13350 Merge branch 'ent-5482-php-warning-visual-console-group-item' into 'develop'
Metaconsole const replaced by function on visual map

See merge request artica/pandorafms!3145
2020-05-11 10:11:28 +02:00
artica 8514cdc378 Auto-updated build strings. 2020-05-11 01:00:15 +02:00
artica 87445c28ef Auto-updated build strings. 2020-05-10 01:00:15 +02:00
artica 3c01526ea9 Auto-updated build strings. 2020-05-09 01:00:24 +02:00
Tatiana Llorente 1f16abd4bd Ent 5701 quitar feature de chat 2020-05-08 15:39:24 +02:00
Daniel Rodriguez b655094f3a Merge branch 'ent-5619-se-muestran-2-veces-el-mensaje-de-realizado' into 'develop'
duplicated enable/disable message

See merge request artica/pandorafms!3128
2020-05-08 15:38:24 +02:00
Daniel Rodriguez fbd9902dc7 Merge branch 'ent-5746-problema-libreria-de-modulos' into 'develop'
add cache false on functions_module_library

See merge request artica/pandorafms!3197
2020-05-08 15:36:44 +02:00
Daniel Rodriguez 3db9247ec0 Merge branch 'ent-5757-mejoras-visuales-en-el-treeview' into 'develop'
Ent 5757 mejoras visuales en el treeview

See merge request artica/pandorafms!3200
2020-05-08 15:34:43 +02:00
Alejandro Fraguas 73ce23bfd8 Merge branch 'ent-5702-problema-de-seguridad-en-quicksell-escalado-de-privilegios-remoto' into 'develop'
1st approach avoid quick_shell vulnerability (telnet)

See merge request artica/pandorafms!3170
2020-05-08 14:16:06 +02:00
marcos 72e32ab5de add close option in toast 2020-05-08 11:32:44 +02:00
artica 36d15f3de5 Auto-updated build strings. 2020-05-08 01:00:18 +02:00
fbsanchez 3684bf8ea2 Minor changes tree style 2020-05-07 09:36:14 +02:00
artica bc3e21af6d Auto-updated build strings. 2020-05-07 01:00:17 +02:00
fbsanchez bd3ffc0c8d Tree view style review 2020-05-06 17:35:05 +02:00
artica 5ad9e5dbd7 Auto-updated build strings. 2020-05-06 01:00:18 +02:00
fbsanchez 92ff713651 1st approach 2020-05-05 18:58:45 +02:00
vgilc d17299e290 Merge branch 'update-japanese-console-translation' into 'develop'
Japanese console translation

See merge request artica/pandorafms!3182
2020-05-05 15:25:39 +02:00
tatiana 490213dfed Changed path in a required file 2020-05-05 12:50:15 +02:00
artica b894f63f1f Auto-updated build strings. 2020-05-05 01:00:14 +02:00
alejandro-campos 197e309129 added new module type 2020-05-04 12:22:04 +02:00
alejandro-campos 1140a4345a added new module type 2020-05-04 12:20:50 +02:00
fbsanchez 4815dce8aa H&D port filtering + control tasks cancellation while restarting server 2020-05-04 11:13:15 +02:00
fbsanchez 54a9ebd4ed Merge remote-tracking branch 'origin/develop' into ent-5708-review-discovery-h-d
Conflicts:
	pandora_server/lib/PandoraFMS/Recon/Base.pm
2020-05-04 09:52:15 +02:00
artica 12128ea2f1 Auto-updated build strings. 2020-05-04 01:00:15 +02:00
artica 7006e3febd Auto-updated build strings. 2020-05-03 01:00:14 +02:00
artica f95fed2d79 Auto-updated build strings. 2020-05-02 01:00:15 +02:00
artica 848503babe Auto-updated build strings. 2020-05-01 01:00:14 +02:00
marcos e215cdc194 add cache false on functions_module_library 2020-04-30 18:20:09 +02:00
fbsanchez 7ad06596ff Merge remote-tracking branch 'origin/develop' into ent-5708-review-discovery-h-d 2020-04-30 16:26:47 +02:00
fbsanchez 900e25eef1 WIP rcmd in H&D 2020-04-30 15:00:25 +02:00
fbsanchez 026562e7ee MR changes 2020-04-30 15:00:04 +02:00
daniel c308d49c25 Fix retrocompatibility 2020-04-30 14:08:56 +02:00
Junichi Satoh 64493fc9fa Modified nfdump's arguments order. The 'filters' should be last with some nfdump binary. 2020-04-30 16:00:33 +09:00
Junichi Satoh 788c39008e Fixed the problem that agent cannot be enabled/disabled with open version. 2020-04-30 15:50:45 +09:00
Junichi Satoh 06ae3a61e8 Fixed widget title corruption in dashboard with multi-byte characters. 2020-04-30 15:39:32 +09:00
artica 8a019bd8f4 Auto-updated build strings. 2020-04-30 01:00:16 +02:00
artica 456848485e Auto-updated build strings. 2020-04-29 01:00:16 +02:00
Daniel Rodriguez a28ffda2eb Merge branch 'ent-5762-notificacion-de-chat' into 'develop'
add modal on Webchat

See merge request artica/pandorafms!3189
2020-04-28 16:38:56 +02:00
marcos 2d48c67377 add modal on Webchat 2020-04-28 13:56:43 +02:00
marcos bcc68c0034 add modal on Webchat 2020-04-28 13:42:27 +02:00
Daniel Rodriguez 19713f5040 Merge branch 'ent-5750-dashboards-boton-de-borrado' into 'develop'
add delete confirmation dialog

See merge request artica/pandorafms!3185
2020-04-28 11:36:17 +02:00
marcos 72f9c051eb changed message confirmation dialog 2020-04-28 10:44:13 +02:00
marcos 8cd1c0b83f add body message on confirmation modal 2020-04-28 10:12:20 +02:00
artica d644714fcb Auto-updated build strings. 2020-04-28 01:00:18 +02:00
marcos ccd58897ee Add confirmation window 2020-04-27 16:40:50 +02:00
artica a986ed0a48 Auto-updated build strings. 2020-04-27 01:00:15 +02:00
artica bf0596e978 Auto-updated build strings. 2020-04-26 01:00:15 +02:00
artica 202816e309 Auto-updated build strings. 2020-04-25 01:00:18 +02:00
marcos ef30239cc6 add delete confirmation dialog 2020-04-24 16:43:18 +02:00
artica eb9b116311 Auto-updated build strings. 2020-04-24 01:00:16 +02:00
alejandro-campos 750b8397a3 fix bad route of background image 2020-04-23 12:35:52 +02:00
Junichi Satoh 6f0dbf18bd Updated Japanese console translation. 2020-04-23 17:47:10 +09:00
artica 1b641b81fb Auto-updated build strings. 2020-04-23 01:00:15 +02:00
artica 91d1832f8f Updated version and build strings. 2020-04-22 12:42:47 +02:00
artica 60f4f21297 Auto-updated build strings. 2020-04-22 01:00:15 +02:00
alejandro-campos d6ac646046 fixed bug: update owner_user when validating an event 2020-04-21 17:57:36 +02:00
Luis Calvo d44aa7b1e1 Fixed agent aler list 2020-04-21 16:02:36 +02:00
artica b3d7c56de4 Auto-updated build strings. 2020-04-21 01:00:18 +02:00
alejandro-campos 9a66359b3c fix vulnerability in password recovery 2020-04-20 18:00:20 +02:00
Daniel Maya ccb3b8ab7a Fixed Advanced permissions AD 2020-04-20 15:19:28 +02:00
Luis Calvo 5072ff0cd9 Added mf_server installed verdion exception 2020-04-20 12:33:49 +02:00
artica 3992b81900 Auto-updated build strings. 2020-04-20 01:00:19 +02:00
artica 2e44631253 Auto-updated build strings. 2020-04-19 01:00:15 +02:00
artica 04ecb0afa5 Auto-updated build strings. 2020-04-18 01:00:19 +02:00
fbsanchez 2ca9e6fb4a 1st approach avoid quick_shell vulnerability (telnet) 2020-04-17 11:18:49 +02:00
artica 719762105d Auto-updated build strings. 2020-04-17 01:00:19 +02:00
Alejandro Fraguas fdced83e63 Merge branch 'ent-5575-wizard-de-modulos-y-recon-by-steps' into 'develop'
Fixes name resolution

See merge request artica/pandorafms!3167
2020-04-16 18:23:31 +02:00
fbsanchez 290abfe2ce fix css issue window shrink 2020-04-16 17:54:41 +02:00
marcos e3f1f5fe6e change url for pop up reverse proxy 2020-04-16 13:44:23 +02:00
artica 1b028be67f Auto-updated build strings. 2020-04-16 01:00:14 +02:00
Daniel Maya 8ae8ac45f5 Ent 5690 vulnerabilidad critica inyeccion de comandos en llamada a event response 2020-04-15 15:50:08 +02:00
Alejandro Fraguas a4bd4a4c5d Merge branch 'ent-5575-wizard-de-modulos-y-recon-by-steps' into 'develop'
minor style fix

See merge request artica/pandorafms!3166
2020-04-15 12:33:41 +02:00
fbsanchez 83b53e3eb7 minor style fix 2020-04-15 11:53:10 +02:00
Alejandro Fraguas afa53c3398 Merge branch 'ent-5575-wizard-de-modulos-y-recon-by-steps' into 'develop'
minor style change

See merge request artica/pandorafms!3164
2020-04-15 09:17:46 +02:00
artica e695a3f5b5 Auto-updated build strings. 2020-04-15 01:00:17 +02:00
fbsanchez 282b31841d minor style change 2020-04-14 18:24:51 +02:00
fbsanchez 7024863fd7 Merge remote-tracking branch 'origin/develop' into ent-4176-8084-8169-actualizacion-selenium-firefox-wux
Conflicts:
	pandora_console/extras/mr/37.sql
2020-04-14 16:06:17 +02:00
Alejandro Fraguas 254a32be22 Merge branch 'ent-5691-Vulnerabilidad-XSS-en-sistema-de-mensajes' into 'develop'
fix cross-site scripting vulnerability

See merge request artica/pandorafms!3156
2020-04-14 15:36:48 +02:00
alejandro-campos 268e317ca3 fix cross-site scripting vulnerability 2020-04-14 12:50:19 +02:00
fbsanchez edb3059a09 minor style fix 2020-04-14 12:32:54 +02:00
fbsanchez 36daf76cc5 Merge remote-tracking branch 'origin/develop' into ent-5575-wizard-de-modulos-y-recon-by-steps
Conflicts:
	pandora_console/extras/mr/37.sql
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
2020-04-14 12:00:15 +02:00
fbsanchez 3b71297d56 escaped single quotes (wmi) + refresh button 2020-04-14 11:57:18 +02:00
Daniel Rodriguez 0e6b1ab713 Merge branch 'ent-5684-Se-ha-roto-la-vista-de-arbol' into 'develop'
Fix tree

See merge request artica/pandorafms!3153
2020-04-14 10:48:02 +02:00
Daniel Rodriguez a0881d53e8 Merge branch 'ent-5678-Errores-varios-en-los-nuevos-dashboards' into 'develop'
Fix dashboards

See merge request artica/pandorafms!3152
2020-04-14 10:43:48 +02:00
artica 60ee065f8b Auto-updated build strings. 2020-04-14 01:00:15 +02:00
fbsanchez 13a1e44a5e operation icons on small screens 2020-04-13 19:34:36 +02:00
fbsanchez 58eeffd04d clearer maps 2020-04-13 18:28:56 +02:00
Jose Gonzalez 3fd09c9828 WIP: Reverse develop version for agent_wizard 2020-04-13 17:30:21 +02:00
slerena d13eac3081 Update .htaccess 2020-04-13 17:20:11 +02:00
Daniel Barbero Martin 0c53ff58b2 Fix tree 2020-04-13 16:42:46 +02:00
Jose Gonzalez 6f0b1c005f Added invisible class 2020-04-13 15:41:35 +02:00
Jose Gonzalez d19a667ce9 Added form attribute for inputs 2020-04-13 15:41:00 +02:00
Daniel Barbero Martin 3280ad479f Fix dashboards 2020-04-13 15:01:18 +02:00
marcos d5a7d75169 update function get id_event from meta api 2020-04-13 11:00:11 +02:00
Jose Gonzalez 3f1e7d2ced Solve minor fix 2020-04-13 10:57:32 +02:00
marcos 045f115d95 documented api function 2020-04-13 10:54:37 +02:00
fbsanchez 32538e659a Merge remote-tracking branch 'origin/develop' into ent-4176-8084-8169-actualizacion-selenium-firefox-wux 2020-04-13 10:36:47 +02:00
marcos db7eaaaf20 created function to get id_event from tmetaconsole_even api 2020-04-13 10:36:23 +02:00
artica 8d27ff9350 Auto-updated build strings. 2020-04-13 01:00:08 +02:00
artica 8b609e2d26 Auto-updated build strings. 2020-04-11 01:00:15 +02:00
artica 017fdea2c7 Auto-updated build strings. 2020-04-10 01:00:14 +02:00
artica 6425d4d86d Auto-updated build strings. 2020-04-09 01:00:18 +02:00
marcos 9931b16793 add nombre in api_get_i_name_by_alias API method 2020-04-08 17:01:18 +02:00
Jose Gonzalez d1f565bb1d 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-08 16:52:41 +02:00
Jose Gonzalez 805d96108c Changed position of buttons 2020-04-08 16:52:34 +02:00
fbsanchez a75964fcba minor fix 2020-04-08 16:06:39 +02:00
fbsanchez 748582509a avoid process csv while updating task with no csv changes 2020-04-08 12:29:44 +02:00
fbsanchez 4cf121b45a 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-08 12:26:05 +02:00
fbsanchez 95d7a5d267 minor fix 2020-04-08 12:26:01 +02:00
Jose Gonzalez 725e7d9c16 Solved issue with wrong position in filter 2020-04-08 12:17:22 +02:00
fbsanchez 47857de79f some css adjustments 2020-04-08 11:48:31 +02:00
marcos e86f72958d update AllowOverride notify 2020-04-08 10:36:40 +02:00
fbsanchez 5c405b1d32 Merge remote-tracking branch 'origin/develop' into ent-4176-8084-8169-actualizacion-selenium-firefox-wux 2020-04-08 10:18:13 +02:00
fbsanchez ce5868bbc4 Merge remote-tracking branch 'origin/develop' into ent-5575-wizard-de-modulos-y-recon-by-steps 2020-04-08 10:03:51 +02:00
marcos ff3b285f08 add url on notify 2020-04-08 09:45:18 +02:00
artica 987d8f4c75 Auto-updated build strings. 2020-04-08 01:00:21 +02:00
fbsanchez 56e9275b1a minor fix 2020-04-07 19:10:37 +02:00
fbsanchez 762ad3106d Improvements and fixes H&D with review 2020-04-07 18:50:56 +02:00
fbsanchez 1a2fd7ac09 Merge remote-tracking branch 'origin/develop' into ent-5575-wizard-de-modulos-y-recon-by-steps 2020-04-07 18:50:18 +02:00
marcos c44cb889e0 updates 2020-04-07 18:49:01 +02:00
marcos f8f2da4d40 notify for allowoverride 2020-04-07 18:40:47 +02:00
Jose Gonzalez 396c93c8b8 WIP: Refactor and solve visual issues 2020-04-07 17:46:12 +02:00
Jose Gonzalez 1a080a4e3a WIP: Backup upload 2020-04-07 16:41:33 +02:00
Jose Gonzalez 42d50b4424 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-07 15:20:37 +02:00
Jose Gonzalez 39d19b2016 Added new features to ModuleTemplates 2020-04-07 15:20:30 +02:00
Kike 801624b8a2 Deleted [RT] tag for recon templates 2020-04-07 14:04:06 +02:00
alejandro-campos 9060fdf964 removed not implemented options 2020-04-07 14:01:58 +02:00
Luis Calvo 561150bc09 Metaconsole const replaced by function on visual map 2020-04-07 13:42:44 +02:00
fbsanchez 72d20a6e57 Merge remote-tracking branch 'origin/develop' into ent-5575-wizard-de-modulos-y-recon-by-steps
Conflicts:
	pandora_console/godmode/wizards/DiscoveryTaskList.class.php
2020-04-07 12:55:27 +02:00
fbsanchez d5faabbff5 minor fix review with limitations 2020-04-07 12:43:44 +02:00
Daniel Rodriguez f81e5de8c2 Merge branch 'ent-5662-al-abrir-la-ventana-de-grafica-no-me-cabe' into 'develop'
fixed minnor error

See merge request artica/pandorafms!3142
2020-04-07 10:58:03 +02:00
Daniel Rodriguez bcaf37c60c Merge branch 'ent-5659-ventana-modal-de-la-vista-de-mapa-discovery-task-se-va' into 'develop'
fixed error with dialog task list

See merge request artica/pandorafms!3139
2020-04-07 10:57:12 +02:00
Daniel Rodriguez 29087f886d Merge branch 'ent-5658-cambiar-icono-satelite' into 'develop'
change icon satelite

See merge request artica/pandorafms!3141
2020-04-07 10:56:42 +02:00
Jose Gonzalez 5d5ccf9a6e 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-07 09:11:23 +02:00
Jose Gonzalez 253432d4ee Clean unnecesary file 2020-04-07 09:11:13 +02:00
artica 77b267c596 Auto-updated build strings. 2020-04-07 01:00:15 +02:00
fbsanchez 194c6d6a9a Excluded PENed templates from select 2020-04-06 18:26:55 +02:00
marcos 333f3ba9f0 show full graph 2020-04-06 18:18:39 +02:00
marcos fa522ca896 fixed error 2020-04-06 17:41:56 +02:00
Jose Gonzalez 3d01b918c9 Solved issue with pagination 2020-04-06 17:27:50 +02:00
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
marcos 6a9b55ea36 fixed minnor error 2020-04-06 14:48:26 +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
marcos eab1b7a003 change icon satelite 2020-04-06 13:22:00 +02:00
fbsanchez 3f9bdf65df minor fixes and target selection (buttons) 2020-04-06 13:00:09 +02:00
marcos 3a688c6b3d update task list dialog 2020-04-06 12:29:37 +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
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