26768 Commits

Author SHA1 Message Date
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
fbsanchez
96c218f21e Some updates and minor fixes DBMaintainer 2021-02-01 13:31:42 +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
fbsanchez
04be237b7a minor method added 2021-01-29 14:30:16 +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
Daniel Maya
0b722f3b62 Fixed master server 2021-01-29 14:02:35 +01:00
Kevin
6978ae7a91 minor fix 2021-01-29 13:04:01 +01:00
fbsanchez
279bd5456d Disabled compactdb while running in historical database 2021-01-29 10:25:14 +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
fbsanchez
b8980c189c Schedule history db schema check after MR update 2021-01-28 18:50:55 +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
fbsanchez
dbc48852aa Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
2021-01-28 16:12:47 +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
fbsanchez
9fc3856f83 WIP historical database automaintenance + minor fixes 2021-01-28 13:20:36 +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
fbsanchez
dd4849f7c3 WIP Scheduled install & update of history database processes 2021-01-27 19:23:31 +01:00
fbsanchez
25b15182e3 DBH auto-updater 2021-01-27 15:48:00 +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
fbsanchez
bbab6d9fe1 WIP update process 2021-01-27 14:06:22 +01:00
Luis
905f8801b7 Update 44.sql 2021-01-27 13:37:20 +01:00
fbsanchez
bcb2447edb WIP Historical database manager (setup) 2021-01-27 13:03:57 +01:00
fbsanchez
c7706a6bfa WIP Historical database manager (setup) 2021-01-27 12:35:37 +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
fbsanchez
12b76a03b1 Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 2021-01-27 10:12:27 +01:00
Luis Calvo
a09ee55d13 Added event_statistics to delete txt 2021-01-27 09:42:50 +01:00