Commit Graph

3842 Commits

Author SHA1 Message Date
daniel 5a61f074d7 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-22 09:22:11 +02:00
artica d17ea9891b Auto-updated build strings. 2023-08-22 01:00:41 +02:00
artica b977a2b0cc Updated version and build strings. 2023-08-21 16:13:08 +02:00
Daniel Maya 021c579b2b #11906 Fixed pandora_db 2023-08-21 12:59:35 +02:00
daniel a63824d802 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
Conflicts:
	pandora_console/extras/mr/66.sql
	pandora_console/godmode/users/user_management.php
2023-08-21 08:08:34 +02:00
artica 8ce9d3aa31 Auto-updated build strings. 2023-08-21 01:00:55 +02:00
artica b031f4140c Auto-updated build strings. 2023-08-20 01:00:46 +02:00
artica a6b55c1580 Auto-updated build strings. 2023-08-19 01:01:10 +02:00
Rafael Ameijeiras debd44b7ca Merge branch 'ent-11715-errores-en-pandora_db' into 'develop'
Resolve "Errores en pandora_db"

Closes pandora_enterprise#11715

See merge request artica/pandorafms!6326
2023-08-18 06:48:59 +00:00
daniel b27867d504 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-18 08:28:06 +02:00
artica e54fc904b3 Auto-updated build strings. 2023-08-18 01:00:57 +02:00
artica 6e5f4ef20a Auto-updated build strings. 2023-08-17 01:00:37 +02:00
daniel 7baad52e79 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-16 08:18:05 +02:00
artica 2f4174c0d3 Auto-updated build strings. 2023-08-16 01:00:55 +02:00
artica 4b98cc97a9 Auto-updated build strings. 2023-08-15 01:00:54 +02:00
daniel 133eef456a Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-14 08:14:34 +02:00
artica 841f9fbee0 Auto-updated build strings. 2023-08-14 01:00:35 +02:00
artica 0c7de59b80 Auto-updated build strings. 2023-08-13 01:00:47 +02:00
artica d01416a771 Auto-updated build strings. 2023-08-12 01:00:15 +02:00
daniel dbf98689c2 ITSM pandora_enterprise#11471 2023-08-11 14:30:18 +02:00
artica 30ef320d06 Updated version and build strings. 2023-08-11 11:53:42 +02:00
artica 8be7d85405 Auto-updated build strings. 2023-08-11 01:00:53 +02:00
artica 9affc955e4 Auto-updated build strings. 2023-08-10 01:00:39 +02:00
Félix Suárez 890edd3199 Check for defined values on pandora_purgedb 2023-08-09 10:45:40 -06:00
artica 449d9fe3cb Auto-updated build strings. 2023-08-09 01:00:45 +02:00
artica 96710ed03f Auto-updated build strings. 2023-08-08 01:00:43 +02:00
artica 5e588736ff Auto-updated build strings. 2023-08-07 01:00:15 +02:00
artica cb15459cb3 Auto-updated build strings. 2023-08-06 01:00:07 +02:00
artica 99317de9cf Auto-updated build strings. 2023-08-05 01:00:37 +02:00
artica eb104dd2e4 Auto-updated build strings. 2023-08-04 01:00:26 +02:00
artica ab0fda5a5d Auto-updated build strings. 2023-08-03 01:00:42 +02:00
artica d3fdb28d05 Auto-updated build strings. 2023-08-02 01:00:29 +02:00
artica dcb9f89b5d Auto-updated build strings. 2023-08-01 01:00:44 +02:00
artica 3dae79d593 Auto-updated build strings. 2023-07-31 01:00:25 +02:00
artica c52539ebdc Auto-updated build strings. 2023-07-30 01:00:35 +02:00
artica 0682574cc8 Auto-updated build strings. 2023-07-29 01:00:52 +02:00
artica 5692f69ed4 Auto-updated build strings. 2023-07-28 01:00:46 +02:00
Daniel Rodriguez 42a5fc0716 Merge branch 'ent-9301-anadir-token-de-mantenimiento-para-que-el-pandora_db-elimine-agentes-deshabilitados-manualmente' into 'develop'
Ent-9301-anadir-token-de-mantenimiento-para-que-el-pandora_db-elimine-agentes-deshabilitados

See merge request artica/pandorafms!6051
2023-07-27 13:08:05 +00:00
Daniel Rodriguez 84f61c9022 Merge branch 'ent-10265-eliminar-gestion-de-mapas-via-ntop-antigua-funcionalidad-deprecada' into 'develop'
Ent-10265-eliminar-gestion-de-mapas-via-ntop-antigua-funcionalidad-deprecada

See merge request artica/pandorafms!6028
2023-07-27 10:27:55 +00:00
artica cc9f3c6df2 Auto-updated build strings. 2023-07-27 01:00:55 +02:00
Rafael Ameijeiras 6045d92fa4 Merge branch 'ent-1495-que-el-pandora_server-error-muestre-timestamp-itwerke' into 'develop'
Ent-1495-que-el-pandora_server-error-muestre-timestamp-itwerke

Closes pandora_enterprise#1495

See merge request artica/pandorafms!6274
2023-07-26 05:03:24 +00:00
artica 244c717355 Auto-updated build strings. 2023-07-26 01:00:54 +02:00
artica 1de2fe9898 Auto-updated build strings. 2023-07-25 01:02:35 +02:00
Félix Suárez 60ed07dc1f Remove unused imports 2023-07-24 12:32:25 -06:00
Félix Suárez 93eb93b348 Change to handle as log blocks 2023-07-24 12:27:27 -06:00
Félix Suárez 1fc1c0e9a4 Add current date to error logs without date 2023-07-23 17:02:26 -06:00
artica c57fb14bc2 Auto-updated build strings. 2023-07-24 01:00:48 +02:00
artica 3e6f88e812 Auto-updated build strings. 2023-07-23 01:00:51 +02:00
artica 13552e74f1 Auto-updated build strings. 2023-07-22 01:00:52 +02:00
artica 6da7520dd1 Auto-updated build strings. 2023-07-21 01:00:53 +02:00