tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
25,404 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

25404 Commits

Author SHA1 Message Date
Luis 35f231ac8c Restored alert actions help (needed for macros) 2020-08-07 09:36:43 +02:00
Daniel Rodriguez d5e8e43d85 Merge branch 'ent-6028-no-se-puede-marcar-tip-checkbox-custom-graphs' into 'develop' 
Fixed missing ckbox custom graphs

See merge request artica/pandorafms!3345
 2020-08-07 09:35:27 +02:00
Luis 20addda9fe Fixed missing ckbox custom graphs 2020-08-07 09:35:27 +02:00
marcos 248c5936b6 fixed error with filter form 2020-08-07 09:19:46 +02:00
marcos bb2fb0c631 Merge remote-tracking branch 'origin/develop' into ent-6099-bug-al-duplicar-modulo 2020-08-07 08:47:11 +02:00
marcos e3a126c260 Merge remote-tracking branch 'origin/develop' into ent-6080-cambiar-text-advertencia-modulos-no-inicializados-en-vista-agente 2020-08-07 08:45:21 +02:00
Marcos Alconada 50c089587d Update estado_monitores.php 2020-08-07 08:39:58 +02:00
artica a8d3c50467 Auto-updated build strings. 2020-08-07 01:00:17 +02:00
rafael 1a58bf87ef Merge branch 'develop' of https://brutus.artica.es:8081/artica/pandorafms into ent-6199-error-de-encoding-en-plugintools-pm 2020-08-06 13:04:09 +02:00
artica b812399ca3 Auto-updated build strings. 2020-08-06 01:00:16 +02:00
Alejandro Fraguas 2d25c19a5f Merge branch 'ent-6139-formatos-fecha-no-muestran-bien' into 'develop' 
Fixed and added strfdate formats

See merge request artica/pandorafms!3383
 2020-08-05 11:51:01 +02:00
artica bdec27d2a3 Auto-updated build strings. 2020-08-05 01:00:13 +02:00
artica b6d8cc1f2c Auto-updated build strings. 2020-08-04 01:00:14 +02:00
artica 6e6e194e73 Updated version and build strings. 2020-08-03 14:50:49 +02:00
vanessa gil 9fafb931e9 Updated translations. 2020-08-03 14:38:16 +02:00
Daniel Rodriguez d56ee82f07 Merge branch 'ent-5874-bug-module-min-module-max-rev' into 'develop' 
Fixed module_max/min bug

See merge request artica/pandorafms!3393
 2020-08-03 10:42:02 +02:00
Daniel Rodriguez 830b203f66 Merge branch 'ent-5607-10405-9779-10123-problema-con-el-envio-de-correos-mediante-la-configuracion-en-consola' into 'develop' 
Suppress error messages from IO::Socket::SSL->start_SSL.

See merge request artica/pandorafms!3394
 2020-08-03 09:01:10 +02:00
artica add395279f Auto-updated build strings. 2020-08-03 01:00:14 +02:00
artica ed7928b8aa Auto-updated build strings. 2020-08-02 01:00:14 +02:00
artica ee69438620 Auto-updated build strings. 2020-08-01 01:00:18 +02:00
Ramón Novoa 5e7d7da25e
Add a link to: https://pandorafms.com/server-monitoring/ 2020-07-31 15:07:59 +02:00
Ramon Novoa c3a98753b3 Suppress error messages from IO::Socket::SSL->start_SSL. 
Ref pandora_enterprise#5607
 2020-07-31 15:01:07 +02:00
Daniel Rodriguez 05446b6e3e Merge branch 'ent-5824-connection-lost-warn-mejora' into 'develop' 
Ent 5824 connection lost warn mejora

See merge request artica/pandorafms!3392
 2020-07-31 14:24:03 +02:00
Luis 3327abc328 Ent 5824 connection lost warn mejora 2020-07-31 14:24:02 +02:00
Luis Calvo b38984eeb3 Fixed module_max/min bug 2020-07-31 12:23:48 +02:00
artica e14c3f7dbd Auto-updated build strings. 2020-07-31 01:00:17 +02:00
Kevin bc21e8cd2b Added encoding lib to prevent errors with PAR Packer 2020-07-30 13:20:00 +02:00
rafael e181199581 change htacces to be compatible with php-fpm 2020-07-30 08:57:54 +02:00
artica 2ca821cc4d Auto-updated build strings. 2020-07-30 01:00:15 +02:00
artica 2b915d4546 Auto-updated build strings. 2020-07-29 01:00:16 +02:00
artica 4c3f0dfc59 Auto-updated build strings. 2020-07-28 01:00:18 +02:00
Daniel Rodriguez b0ed937311 Merge branch 'ent-5801-no-funciona-macro-_policy_' into 'develop' 
Get the name of policy in tpolicies

Closes pandora_enterprise#5801

See merge request artica/pandorafms!3281
 2020-07-27 13:42:09 +02:00
Daniel Rodriguez b93dc7e6e9 Merge branch 'ent-improve-installation-for-freebsd' into 'develop' 
Improved installation task for FreeBSD.

See merge request artica/pandorafms!3388
 2020-07-27 13:23:37 +02:00
Daniel Rodriguez b5a62a9977 Merge branch 'ent-6141-cambios-sistema-de-licencias-trial' into 'develop' 
Do not show the UM registration wizard for trial licenses.

See merge request artica/pandorafms!3385
 2020-07-27 13:07:34 +02:00
Daniel Rodriguez fa834bff1b Merge branch 'ent-update-japanese-console-translation' into 'develop' 
Updated Japanese console translations.

See merge request artica/pandorafms!3389
 2020-07-27 12:28:12 +02:00
Daniel Rodriguez 6e3ff47f0f Merge branch 'ent-mysql80-support' into 'develop' 
Added support for MySQL 8.0 in installer.

See merge request artica/pandorafms!3387
 2020-07-27 12:27:10 +02:00
Daniel Rodriguez 1f2e0e2d80 Merge branch 'ent-4943-identificar-version-instalada-server-enterprise-e6-o-e7' into 'develop' 
Increase the size of tserver.version.

See merge request artica/pandorafms!3368
 2020-07-27 12:17:27 +02:00
Jose Gonzalez 56a71d02c0 Modified the value getted in DB 2020-07-27 11:01:47 +02:00
Daniel Rodriguez d4860bddcc Merge branch 'ent-5447-Referencias-log4x-en-pandora_db' into 'develop' 
deleted references to table log4x

See merge request artica/pandorafms!3380
 2020-07-27 08:42:58 +02:00
Daniel Rodriguez 539e647a68 Merge branch 'ent-5908-agentes-duplicados' into 'develop' 
Lock on LIFO mode if the agent does not exist to prevent duplicates.

See merge request artica/pandorafms!3372
 2020-07-27 08:10:27 +02:00
Junichi Satoh d1146277dc Updated Japanese console translations. 2020-07-27 14:24:58 +09:00
Junichi Satoh b3f724a193 Improved installation task for FreeBSD. 
Updated comments for FreeBSD displayed by the installer.
 2020-07-27 13:52:06 +09:00
Junichi Satoh 81ffa4783f Added support for MySQL 8.0 in installer. 2020-07-27 13:41:18 +09:00
artica f0724446a2 Auto-updated build strings. 2020-07-27 01:00:13 +02:00
artica b3e33f8104 Auto-updated build strings. 2020-07-26 01:00:14 +02:00
artica faccfb275d Auto-updated build strings. 2020-07-25 01:00:16 +02:00
Daniel Rodriguez 5577b42540 Merge branch 'ent-6161-no-abre-ventana-datos-modulo-string' into 'develop' 
Fixed result div for string modules bug

See merge request artica/pandorafms!3386
 2020-07-24 09:43:35 +02:00
artica f2e6d84d04 Auto-updated build strings. 2020-07-24 01:00:16 +02:00
Daniel Rodriguez 9d05b586da Merge branch 'ent-fix-freebsd-tentacle-startup-script' into 'develop' 
Fixed tentacle server startup script for FreeBSD.

See merge request artica/pandorafms!3374
 2020-07-23 17:43:35 +02:00
Luis Calvo 158cbc74e2 Fixed result div for string modules bug 2020-07-23 17:28:44 +02:00