Commit Graph

26234 Commits

Author SHA1 Message Date
Daniel Rodriguez 8d5a950be2 Merge branch 'ent-6985-cambios-visuales-en-setting-de-correo' into 'develop'
changed ssl/tls to ssl

See merge request artica/pandorafms!3808
2021-02-03 11:09:38 +01:00
Marcos Alconada b7bf265cb4 changed ssl/tls to ssl 2021-02-03 11:09:38 +01:00
artica 7ed515afd1 Auto-updated build strings. 2021-02-03 01:00:20 +01:00
fbsanchez da2ee342e6 Full metal jacket QA tester fighting 2021-02-02 19:06:05 +01:00
fbsanchez 4d00270b78 Minor fixes 2021-02-02 18:55:38 +01:00
fbsanchez 906ac7f13f fixes VC in MC 2021-02-02 18:40:55 +01:00
fbsanchez 000f8d4b66 smooth movement in parent-lines + std-lines + network-link-lines 2021-02-02 17:55:52 +01:00
fbsanchez 9052a02c1b Smooth sticky lines 2021-02-02 16:54:01 +01:00
fbsanchez 0b15f27699 minor CDE 2021-02-02 16:22:17 +01:00
fbsanchez 03b605cd54 removed networklink button from legacy vc 2021-02-02 13:17:03 +01:00
fbsanchez cae68eac35 Fixed latency modules 2021-02-02 12:27:01 +01:00
fbsanchez 380c77be02 Merge remote-tracking branch 'origin/develop' into ent-6384-consola-visual-nuevo-elemento-interfaz-de-red
Conflicts:
	pandora_console/include/lib/Module.php
	pandora_console/include/visual-console-client/vc.main.css.map
2021-02-02 12:15:24 +01:00
artica ff7516cd23 Auto-updated build strings. 2021-02-02 01:00:19 +01:00
Daniel Rodriguez 18471d043a Merge branch 'ent-6151-revisar-el-instalador-rpm-de-suse-me-esta-dando-errores' into 'develop'
ent-6151-revisar-el-instalador-rpm-de-suse-me-esta-dando-errores

See merge request artica/pandorafms!3629
2021-02-01 19:08:30 +01:00
Kevin 467b5d5103 minor rephrasing 2021-02-01 14:35:14 +01:00
Kevin 6abc0a59b4 minor fix 2021-02-01 14:26:18 +01:00
Daniel Rodriguez 231981bcc9 Merge branch 'ent-fix-special-day-related-api' into 'develop'
Fixed wrong behavior of special_day related APIs.

See merge request artica/pandorafms!3787
2021-02-01 13:41:20 +01:00
Daniel Rodriguez 897064183c Merge branch 'ent-fix-multi-byte-chars-treatment' into 'develop'
Fixed garbled characters with multi-byte characters.

See merge request artica/pandorafms!3802
2021-02-01 12:18:19 +01:00
artica 466ebb8b6b Auto-updated build strings. 2021-02-01 01:00:15 +01:00
artica 705e1e4623 Auto-updated build strings. 2021-01-31 01:00:11 +01:00
artica 6871aaf358 Auto-updated build strings. 2021-01-30 01:00:19 +01:00
Daniel Rodriguez 2676d326b9 Merge branch 'ent-5840-cambio-politica-passwords' into 'develop'
Changed password generation for installator

Closes pandora_enterprise#5840

See merge request artica/pandorafms!3682
2021-01-29 14:54:39 +01:00
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
José González 8dfb5434ae Update install.php for avoid wildcards, single and double quote chars 2021-01-29 14:06:01 +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
Junichi Satoh a88a563b45 Fixed garbled characters with multi-byte characters. 2021-01-28 10:49:54 +09: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