Commit Graph

24336 Commits

Author SHA1 Message Date
artica 5ad9e5dbd7 Auto-updated build strings. 2020-05-06 01:00:18 +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
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
fbsanchez 8d73339887 Windows environment spaces in binary file names 2020-04-28 10:37:09 +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
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
Daniel Rodriguez 6e22e1919e Merge branch 'ent-5684-Se-ha-roto-la-vista-de-arbol' into 'develop'
Fix tree

See merge request artica/pandorafms!3153
2020-04-22 12:21:47 +02:00
Alejandro Fraguas 253312bdb3 Merge branch 'ent-5731-9922-agente-32-bit-no-funciona-error-compilacion' into 'develop'
Do not set ARCH if it was already set by other build scripts.

See merge request artica/pandorafms!3180
2020-04-22 12:11:52 +02:00
Ramon Novoa f061813769 Do not set ARCH if it was already set by other build scripts.
Ref pandora_enterprise#5731
2020-04-22 11:21:14 +02:00
artica 60f4f21297 Auto-updated build strings. 2020-04-22 01:00:15 +02:00
Daniel Rodriguez 59fc1f334f Merge branch 'ent-5733-bug-agent-alerts-list' into 'develop'
Fixed agent aler list

See merge request artica/pandorafms!3177
2020-04-21 18:12:49 +02:00
Luis Calvo d44aa7b1e1 Fixed agent aler list 2020-04-21 16:02:36 +02:00
Daniel Rodriguez f8b4e9ae4e Merge branch 'ent-5314-autodiscovery-2' into 'develop'
Ent 5314 autodiscovery 2

See merge request artica/pandorafms!3176
2020-04-21 13:44:52 +02:00
Kevin 629604aab4 Added plugin to sources, deleted from pandora_plugins 2020-04-21 13:21:32 +02:00
Kevin 8801b8a032 Merge branch 'develop' of brutus.artica.es:artica/pandorafms into ent-5314-autodiscovery-2 2020-04-21 13:10:43 +02:00
artica b3d7c56de4 Auto-updated build strings. 2020-04-21 01:00:18 +02:00
artica 3992b81900 Auto-updated build strings. 2020-04-20 01:00:19 +02:00