Commit Graph

5299 Commits

Author SHA1 Message Date
artica 58aa1d7a0e Auto-updated build strings. 2020-11-03 01:00:17 +01:00
artica d8fcfd0da4 Auto-updated build strings. 2020-11-02 01:00:16 +01:00
artica 4c298531a9 Auto-updated build strings. 2020-11-01 01:00:15 +01:00
artica 3e181c4b01 Auto-updated build strings. 2020-10-31 01:00:26 +01:00
artica 8c92e5420d Auto-updated build strings. 2020-10-30 01:00:21 +01:00
artica 860024a11a Auto-updated build strings. 2020-10-29 01:00:21 +01:00
artica 288b81dcc4 Auto-updated build strings. 2020-10-28 01:00:18 +01:00
artica 3b9558c7a0 Auto-updated build strings. 2020-10-27 01:00:21 +01:00
artica 76324679ec Auto-updated build strings. 2020-10-26 01:00:14 +01:00
artica 89fc211e6f Auto-updated build strings. 2020-10-25 01:00:15 +02:00
artica bd95c0a4f0 Auto-updated build strings. 2020-10-24 01:00:16 +02:00
artica 002509500c Auto-updated build strings. 2020-10-23 01:00:18 +02:00
artica 7bd7d190c5 Auto-updated build strings. 2020-10-21 01:02:12 +02:00
artica fbccb4ac6b Auto-updated build strings. 2020-10-20 01:00:17 +02:00
artica c560fa6125 Auto-updated build strings. 2020-10-18 01:00:15 +02:00
artica 880c20dcab Auto-updated build strings. 2020-10-17 01:00:17 +02:00
artica dc41879a2c Auto-updated build strings. 2020-10-16 01:00:21 +02:00
artica 3a890dc8b8 Updated version and build strings. 2020-10-15 10:19:42 +02:00
artica 6aaa4802e5 Auto-updated build strings. 2020-10-15 01:00:18 +02:00
Daniel Maya 7cd56b6f94 Ent 6466 borrado de eventos con pandora db 2020-10-14 11:48:34 +02:00
artica 4c67e17e84 Auto-updated build strings. 2020-10-14 01:00:19 +02:00
Daniel Rodriguez 1134113cf3 Merge branch 'ent-6468-fallo-plantillas-automaticas-discovery' into 'develop'
OID naming compatibility when starts with "." or not

See merge request artica/pandorafms!3522
2020-10-13 15:48:59 +02:00
artica 2b06c5babc Auto-updated build strings. 2020-10-13 01:00:16 +02:00
artica 8146e5377e Auto-updated build strings. 2020-10-12 01:00:16 +02:00
artica 2c1ed80925 Auto-updated build strings. 2020-10-11 01:00:16 +02:00
artica d5b0966669 Auto-updated build strings. 2020-10-10 01:00:18 +02:00
fbsanchez 02c4fe30a3 OID naming compatibility when starts with "." or not 2020-10-09 14:50:37 +02:00
artica 70cea5cdff Auto-updated build strings. 2020-10-09 01:00:21 +02:00
Daniel Rodriguez 2b5eb00e6a Merge branch 'ent-6199-error-de-encoding-en-plugintools-pm' into 'develop'
Added encoding lib to prevent errors with PAR Packer

See merge request artica/pandorafms!3391
2020-10-08 15:04:19 +02:00
artica ed434135c2 Auto-updated build strings. 2020-10-08 01:00:17 +02:00
Daniel Rodriguez 9f4397a760 Merge branch 'ent-6373-10641-eventos-de-going-to-normal-cada-5-minutos' into 'develop'
FF keep counters fix

See merge request artica/pandorafms!3489
2020-10-07 16:04:43 +02:00
Daniel Rodriguez f83737b01f Merge branch 'ent-6433-server-does-not-have-access-to-the-api' into 'develop'
Ent 6433 server does not have access to the api

Closes pandora_enterprise#6433

See merge request artica/pandorafms!3503
2020-10-07 14:55:46 +02:00
artica d677fedc0e Auto-updated build strings. 2020-10-07 01:00:18 +02:00
artica 63ed443b98 Auto-updated build strings. 2020-10-06 01:00:19 +02:00
Jose Gonzalez 6459c6aa73 Update the correct file 2020-10-05 15:15:10 +02:00
Jose Gonzalez 0da066954b Modified localhost for 127.0.0.1 for ACL control 2020-10-05 15:12:18 +02:00
Jose Gonzalez e8e20b933c Testing 2020-10-05 12:53:49 +02:00
Jose Gonzalez 50dd166cb3 Testing 2020-10-05 11:48:06 +02:00
artica b1d218d875 Auto-updated build strings. 2020-10-05 01:00:14 +02:00
artica 2965099f2f Auto-updated build strings. 2020-10-04 01:00:17 +02:00
artica 344cf25874 Auto-updated build strings. 2020-10-03 01:00:18 +02:00
Daniel Rodriguez 1cdb91a02d Merge branch 'ent-6302-proyectos-anadir-un-campo-de-numero-de-ticket-para-modulos' into 'develop'
Custom id improvements

See merge request artica/pandorafms!3464
2020-10-02 13:07:59 +02:00
Daniel Rodriguez e9ec50c81f Merge branch 'ent-6315-pandora_db-genere-un-db-lock-cuando-se-este-ejecutando-ha' into 'develop'
pandora_db only runs on the master server.

See merge request artica/pandorafms!3477
2020-10-02 12:26:38 +02:00
artica 354ae84171 Auto-updated build strings. 2020-10-02 01:00:20 +02:00
fbsanchez 308598ba8d minor fix 2020-10-01 16:23:00 +02:00
fbsanchez d052c09f44 Merge remote-tracking branch 'origin/develop' into ent-6302-proyectos-anadir-un-campo-de-numero-de-ticket-para-modulos 2020-10-01 13:36:13 +02:00
artica 43b02efa4e Auto-updated build strings. 2020-10-01 01:00:20 +02:00
fbsanchez b07d24ed25 Merge remote-tracking branch 'origin/develop' into ent-6302-proyectos-anadir-un-campo-de-numero-de-ticket-para-modulos
Conflicts:
	pandora_console/include/functions_api.php
	pandora_console/operation/events/events.php
2020-09-30 18:38:27 +02:00
Daniel Rodriguez ccbbd7909b Merge branch 'ent-6342-10704-wmi-errores-modulos-nuevos-cpu-disk-services-etc' into 'develop'
Ent 6342 10704 wmi errores modulos nuevos cpu disk services etc

See merge request artica/pandorafms!3475
2020-09-30 10:25:32 +02:00
artica 1a2f14a35b Auto-updated build strings. 2020-09-30 01:00:21 +02:00