Kevin
|
9b1a4616ef
|
Merge branch 'develop' of brutus.artica.es:artica/pandorafms into ent-6151-revisar-el-instalador-rpm-de-suse-me-esta-dando-errores
|
2021-01-29 14:43:59 +01:00 |
|
Kevin
|
6978ae7a91
|
minor fix
|
2021-01-29 13:04:01 +01:00 |
|
Rafael Ameijeiras
|
0d67538bb3
|
Merge branch 'ent-6970-deploy-script' into 'develop'
fixing selinux
See merge request artica/pandorafms!3807
|
2021-01-29 10:01:57 +01:00 |
|
rafael
|
aca79b82df
|
fixing selinux
|
2021-01-29 09:58:28 +01:00 |
|
artica
|
750670ecf9
|
Auto-updated build strings.
|
2021-01-29 01:00:20 +01:00 |
|
Rafael Ameijeiras
|
598ad2fb1a
|
Merge branch 'ent-6970-deploy-script' into 'develop'
change ssh banner
See merge request artica/pandorafms!3806
|
2021-01-28 17:12:10 +01:00 |
|
rafael
|
08b6a8660c
|
change ssh banner
|
2021-01-28 17:08:32 +01:00 |
|
Rafael Ameijeiras
|
000b1dd993
|
Merge branch 'ent-6970-deploy-script' into 'develop'
changue ssh banner
See merge request artica/pandorafms!3805
|
2021-01-28 17:05:00 +01:00 |
|
rafael
|
19f5f51d7c
|
change ssh banner
|
2021-01-28 16:59:11 +01:00 |
|
Kevin
|
b213c38c10
|
Merge branch 'develop' of brutus.artica.es:artica/pandorafms into ent-6151-revisar-el-instalador-rpm-de-suse-me-esta-dando-errores
|
2021-01-28 16:46:42 +01:00 |
|
Rafael Ameijeiras
|
33b182075a
|
Merge branch 'ent-6970-deploy-script' into 'develop'
adding versioning
See merge request artica/pandorafms!3804
|
2021-01-28 16:30:52 +01:00 |
|
rafael
|
2a20f7e930
|
adding localhost to condole config and adding versioning
|
2021-01-28 16:28:06 +01:00 |
|
Rafael Ameijeiras
|
39c1c05022
|
Merge branch 'ent-6970-deploy-script' into 'develop'
Ent 6970 deploy script
See merge request artica/pandorafms!3803
|
2021-01-28 15:32:51 +01:00 |
|
rafael
|
a5c09bebd7
|
adding localhost to condole config and adding versioning
|
2021-01-28 15:30:09 +01:00 |
|
rafael
|
01742670a5
|
adding localhost to condole config and adding versioning
|
2021-01-28 15:28:05 +01:00 |
|
Rafael Ameijeiras
|
72372520dc
|
Merge branch 'ent-6970-deploy-script' into 'develop'
adding deploy script for centos 7
See merge request artica/pandorafms!3795
|
2021-01-28 13:49:35 +01:00 |
|
Daniel Rodriguez
|
39a060bd99
|
Merge branch 'ent-6849-remove-visual-console-manager' into 'develop'
Remove visual console manager extension
See merge request artica/pandorafms!3737
|
2021-01-28 11:57:52 +01:00 |
|
Luis
|
e6cf2fe9eb
|
Remove visual console manager extension
|
2021-01-28 11:57:52 +01:00 |
|
Daniel Rodriguez
|
4d84ae8b58
|
Merge branch 'ent-6844-quitar-vista-estadisticas-eventos' into 'develop'
Removes event_statistics view
See merge request artica/pandorafms!3738
|
2021-01-28 10:25:13 +01:00 |
|
Daniel Rodriguez
|
147bac8e55
|
Merge branch 'ent-6126-add-csv-json-save-to-disk-console-task' into 'develop'
Added CSV an JSON formats in console task report save to disk
See merge request artica/pandorafms!3613
|
2021-01-28 10:23:22 +01:00 |
|
artica
|
ff80c974da
|
Auto-updated build strings.
|
2021-01-28 01:00:18 +01:00 |
|
Daniel Rodriguez
|
0b661add35
|
Merge branch 'ent-6158-mejoras-a-servicios-dinamicos-expresiones-regulares-y-varios-custom-field' into 'develop'
Definition matching Entity
See merge request artica/pandorafms!3648
|
2021-01-27 14:40:40 +01:00 |
|
fbsanchez
|
d24bcd700d
|
Merge remote-tracking branch 'origin/develop' into ent-6158-mejoras-a-servicios-dinamicos-expresiones-regulares-y-varios-custom-field
|
2021-01-27 14:08:41 +01:00 |
|
Luis
|
905f8801b7
|
Update 44.sql
|
2021-01-27 13:37:20 +01:00 |
|
rafael
|
d3612c9ba9
|
adding features
|
2021-01-27 12:29:49 +01:00 |
|
Daniel Rodriguez
|
ccc10abc16
|
Merge branch 'ent-6643-show-summary-vmware' into 'develop'
Ent 6643 show summary vmware
Closes pandora_enterprise#6643
See merge request artica/pandorafms!3611
|
2021-01-27 11:20:36 +01:00 |
|
Luis Calvo
|
a09ee55d13
|
Added event_statistics to delete txt
|
2021-01-27 09:42:50 +01:00 |
|
Luis Calvo
|
f2addc837a
|
Merge remote-tracking branch 'origin/develop' into ent-6126-add-csv-json-save-to-disk-console-task
|
2021-01-27 09:25:12 +01:00 |
|
artica
|
096bcd1ed3
|
Auto-updated build strings.
|
2021-01-27 01:00:19 +01:00 |
|
Luis Calvo
|
954c12646b
|
Added task save report to disk changes to migrate
|
2021-01-26 16:46:45 +01:00 |
|
Luis Calvo
|
dc3ee2d553
|
Added task save report to disk changes to MR
|
2021-01-26 16:36:13 +01:00 |
|
Jose Gonzalez
|
d5b99f255a
|
Solved issue
|
2021-01-26 13:46:12 +01:00 |
|
Daniel Rodriguez
|
0dcfa08725
|
Merge branch 'ent-6403-usuarios-se-ven-entre-si-workcpace-connected-users' into 'develop'
Fixed connected users seeing all users
See merge request artica/pandorafms!3590
|
2021-01-26 13:35:46 +01:00 |
|
Luis
|
29913883ae
|
Fixed connected users seeing all users
|
2021-01-26 13:35:46 +01:00 |
|
artica
|
7d69ad114d
|
Auto-updated build strings.
|
2021-01-26 01:00:11 +01:00 |
|
Jose Gonzalez
|
bc250f0789
|
Merge branch 'ent-6643-show-summary-vmware' of brutus.artica.es:artica/pandorafms into ent-6643-show-summary-vmware
|
2021-01-25 13:37:44 +01:00 |
|
Jose Gonzalez
|
38ea74ed11
|
Updated merge
|
2021-01-25 13:36:12 +01:00 |
|
Luis Calvo
|
778419e71d
|
Merge remote-tracking branch 'origin/develop' into ent-6844-quitar-vista-estadisticas-eventos
|
2021-01-25 13:06:36 +01:00 |
|
Daniel Rodriguez
|
6063c4f50b
|
Merge branch 'ent-6091-Suprimir-corregir-logs' into 'develop'
Solved issue
Closes pandora_enterprise#6091
See merge request artica/pandorafms!3786
|
2021-01-25 12:15:16 +01:00 |
|
artica
|
831d22bac1
|
Updated version and build strings.
|
2021-01-25 11:52:43 +01:00 |
|
Luis Calvo
|
84f3ead86a
|
Added csv, json, xml formats to save report to disk task
|
2021-01-25 11:51:53 +01:00 |
|
Daniel Rodriguez
|
485220a527
|
Merge branch 'ent-2948-Formulario-para-configuracion-remota-de-server-y-satellite-Proyectos' into 'develop'
implemented new server file editor
See merge request artica/pandorafms!3495
|
2021-01-25 10:17:35 +01:00 |
|
Daniel Rodriguez
|
9b92c5ff34
|
Merge branch 'ent-6932-Tags-no-entran-en-base-de-datos' into 'develop'
Ent 6932 tags no entran en base de datos
See merge request artica/pandorafms!3776
|
2021-01-25 10:15:29 +01:00 |
|
Daniel Rodriguez
|
4358d2a99c
|
Merge branch 'ent-6862-add-enterprise-dependencies-docker' into 'develop'
add dependencies in base docker image
See merge request artica/pandorafms!3727
|
2021-01-25 10:13:26 +01:00 |
|
Daniel Rodriguez
|
77dfba453a
|
Merge branch 'ent-6505-FENIX-Conteo-vista-tactica-modulos-Performance-vs-Total' into 'develop'
fixed count in tactical view
See merge request artica/pandorafms!3671
|
2021-01-25 10:12:43 +01:00 |
|
Daniel Rodriguez
|
f92ba2ce3d
|
Merge branch 'ent-6503-vista-tactica-numero-alertas' into 'develop'
Modified query for show only available alerts
Closes pandora_enterprise#6503
See merge request artica/pandorafms!3672
|
2021-01-25 10:11:25 +01:00 |
|
Daniel Rodriguez
|
e88ca95a8d
|
Merge branch 'ent-6631-Bug-en-dashboard-de-usuario-sin-permiso' into 'develop'
Ent 6631 bug en dashboard de usuario sin permiso
See merge request artica/pandorafms!3781
|
2021-01-25 10:07:53 +01:00 |
|
Daniel Rodriguez
|
7a614fcf48
|
Merge branch 'ent-6354-Bug-de-creacion-de-dashboard-con-permisos-no-ALL' into 'develop'
Ent 6354 bug de creacion de dashboard con permisos no all
See merge request artica/pandorafms!3780
|
2021-01-25 10:02:41 +01:00 |
|
Daniel Rodriguez
|
4d81396956
|
Merge branch 'ent-6930-No-funciona-Min-number-of-alerts-Alerts-templates' into 'develop'
Ent 6930 no funciona min number of alerts alerts templates
See merge request artica/pandorafms!3785
|
2021-01-25 09:55:28 +01:00 |
|
Daniel Rodriguez
|
5d137594a4
|
Merge branch 'ent-6920-no-se-visualiza-dato-de-modulo-tipo-string-en-consola-movil-con-command-line-snapshot-activado' into 'develop'
Ent 6920 no se visualiza dato de modulo tipo string en consola movil con command line snapshot activado
See merge request artica/pandorafms!3767
|
2021-01-25 09:54:06 +01:00 |
|