5042 Commits

Author SHA1 Message Date
fbsanchez
712079c30e RC1 #4755 2021-02-01 15:00:54 +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
fbsanchez
279bd5456d Disabled compactdb while running in historical database 2021-01-29 10:25:14 +01:00
artica
750670ecf9 Auto-updated build strings. 2021-01-29 01:00:20 +01:00
artica
ff80c974da Auto-updated build strings. 2021-01-28 01:00:18 +01:00
artica
096bcd1ed3 Auto-updated build strings. 2021-01-27 01:00:19 +01:00
artica
7d69ad114d Auto-updated build strings. 2021-01-26 01:00:11 +01:00
artica
831d22bac1 Updated version and build strings. 2021-01-25 11:52:43 +01:00
Daniel Rodriguez
d4050ad0ce Merge branch 'ent-6855-Casca-netscan-custom-en-la-open' into 'develop'
several fixes in netscan custom

See merge request artica/pandorafms!3736
2021-01-25 09:50:27 +01:00
artica
82664be930 Auto-updated build strings. 2021-01-25 01:00:14 +01:00
artica
4be65955cb Auto-updated build strings. 2021-01-24 01:00:16 +01:00
artica
e03f02a093 Auto-updated build strings. 2021-01-23 01:00:18 +01:00
artica
a700318815 Auto-updated build strings. 2021-01-22 01:00:18 +01:00
artica
3992841ac5 Auto-updated build strings. 2021-01-21 01:00:18 +01:00
Jose Gonzalez
a5d39365f8 Added feature for fix discovery tasks with server down 2021-01-20 17:56:39 +01:00
artica
6dca4bb4ba Auto-updated build strings. 2021-01-20 01:00:17 +01:00
artica
548f960b83 Auto-updated build strings. 2021-01-19 01:00:18 +01:00
alejandro-campos
9c924db8dc Merge branch 'develop' into ent-6855-Casca-netscan-custom-en-la-open 2021-01-18 10:29:06 +01:00
artica
f0ff1c72d4 Auto-updated build strings. 2021-01-18 01:00:15 +01:00
artica
0cde312850 Auto-updated build strings. 2021-01-17 01:00:14 +01:00
artica
6710cfd957 Auto-updated build strings. 2021-01-16 01:00:19 +01:00
artica
5a837c9aaa Auto-updated build strings. 2021-01-15 01:00:17 +01:00
artica
884a7cabf7 Auto-updated build strings. 2021-01-14 01:00:19 +01:00
artica
53957348be Auto-updated build strings. 2021-01-13 01:00:18 +01:00
artica
a56a0e7023 Auto-updated build strings. 2021-01-12 01:00:17 +01:00
Daniel Rodriguez
d4c161ae58 Merge branch 'ent-6707-Bug-pandora_db-con-compactacion-en-historico' into 'develop'
Ent 6707 bug pandora db con compactacion en historico

See merge request artica/pandorafms!3615
2021-01-11 09:30:56 +01:00
artica
732ba9d030 Auto-updated build strings. 2021-01-11 01:00:14 +01:00
artica
ec6a6db6c0 Auto-updated build strings. 2021-01-10 01:00:15 +01:00
artica
b13fc73b6c Auto-updated build strings. 2021-01-09 01:00:16 +01:00
artica
2b17ab4496 Auto-updated build strings. 2021-01-08 01:00:18 +01:00
fbsanchez
3eb4af5fd7 Merge remote-tracking branch 'origin/develop' into ent-6782-revision-general-de-la-consola-movil
Conflicts:
	pandora_console/mobile/operation/visualmap.php
	pandora_console/mobile/operation/visualmaps.php
2021-01-07 10:59:02 +01:00
fbsanchez
6667b38729 Merge remote-tracking branch 'origin/develop' into ent-6652-pandora_db-en-historico
Conflicts:
	pandora_server/util/pandora_db.pl
2021-01-07 10:42:29 +01:00
artica
1ff2800178 Auto-updated build strings. 2021-01-07 01:00:32 +01:00
artica
b21eca13d5 Auto-updated build strings. 2021-01-06 01:00:36 +01:00
Daniel Rodriguez
705beeac52 Merge branch 'ent-6902-Warning-pandora-db' into 'develop'
added additional check for token

See merge request artica/pandorafms!3757
2021-01-05 17:43:21 +01:00
alejandro.campos@artica.es
84d768853a added additional check for token 2021-01-05 15:50:28 +01:00
Daniel Rodriguez
40921b96f9 Merge branch 'ent-6791-sesiones-se-borran-con-pandora_db' into 'develop'
Avoid erase ALL sessions from tsessions_php (pandora_db)

See merge request artica/pandorafms!3663
2021-01-05 13:43:42 +01:00
artica
93473de7c6 Auto-updated build strings. 2021-01-05 01:00:16 +01:00
artica
a2033961a7 Auto-updated build strings. 2021-01-04 01:00:14 +01:00
artica
dfec568055 Auto-updated build strings. 2021-01-03 01:00:13 +01:00
artica
740e2f6abe Auto-updated build strings. 2021-01-02 01:00:13 +01:00
artica
dca12930fe Auto-updated build strings. 2021-01-01 01:00:15 +01:00
artica
35e5ab60d6 Auto-updated build strings. 2020-12-31 01:00:13 +01:00
artica
de7fe26e65 Auto-updated build strings. 2020-12-30 01:00:14 +01:00
artica
1b80a157e0 Auto-updated build strings. 2020-12-29 01:00:13 +01:00
artica
66afea7289 Auto-updated build strings. 2020-12-28 01:00:14 +01:00
artica
7915ee970a Auto-updated build strings. 2020-12-27 01:00:13 +01:00
artica
223457100a Auto-updated build strings. 2020-12-26 01:00:14 +01:00