Commit Graph

24370 Commits

Author SHA1 Message Date
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
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
artica 3dfef47b24 Auto-updated build strings. 2020-05-12 01:00:20 +02:00
Alejandro Fraguas f2c0a62cec Merge branch 'ent-1096-integracion-cmdb' into 'develop'
CMDB integration needs

See merge request artica/pandorafms!3045
2020-05-11 13:58:50 +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
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
Daniel Rodriguez 53ee668209 Merge branch 'ent-5701-Quitar-feature-de-chat' into 'develop'
Ent 5701 quitar feature de chat

See merge request artica/pandorafms!3158
2020-05-08 15:39: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
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
Daniel Rodriguez acbb4b119c Merge branch 'ent-5802-No-se-pueden-crear-usuarios-en-la-meta' into 'develop'
Changed path in a required file

See merge request artica/pandorafms!3199
2020-05-05 13:46:18 +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
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
Alejandro Fraguas ad5f728414 Merge branch 'ent-5575-wizard-de-modulos-y-recon-by-steps' into 'develop'
fix

See merge request artica/pandorafms!3196
2020-04-30 18:38:07 +02:00
marcos e215cdc194 add cache false on functions_module_library 2020-04-30 18:20:09 +02:00
fbsanchez 55392bac47 weird json 2020-04-30 18:11:50 +02:00
fbsanchez eaf10f7d6e weird json 2020-04-30 18:07:52 +02:00
fbsanchez c7f0181209 fix 2020-04-30 16:53:45 +02:00
Alejandro Fraguas 2b99bfb803 Merge branch 'ent-5749-Script-exteno-de-migración-de-dashboard' into 'develop'
Fix retrocompatibility

See merge request artica/pandorafms!3187
2020-04-30 14:08:56 +02:00
daniel c308d49c25 Fix retrocompatibility 2020-04-30 14:08:56 +02: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
Alejandro Fraguas 75f5df874b Merge branch 'ent-5575-rebuild-recon-y-modulos-con-pen' into 'develop'
Windows environment spaces in binary file names

See merge request artica/pandorafms!3188
2020-04-28 14:15:14 +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
fbsanchez dfa31d5227 updates 2020-04-28 13:26:57 +02:00
fbsanchez 2bfee57a67 perl multilib json workaround 2020-04-28 12:46:13 +02:00
fbsanchez 3ad1b5f2e3 trace if failed to encode json (summary) 2020-04-28 12:19:46 +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
fbsanchez 744bac6736 avoid problems while encoding json 2020-04-28 11:21:33 +02:00
marcos 72f9c051eb changed message confirmation dialog 2020-04-28 10:44:13 +02:00