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

24765 Commits

Author SHA1 Message Date
fbsanchez 534aa8c7c5 Merge remote-tracking branch 'origin/develop' into ent-6012-servicios-dinamicos 2020-07-06 14:31:55 +02:00
fbsanchez 53a2215a41 minor fix 2020-07-06 14:01:51 +02:00
fbsanchez 2442336f45 Minor fix 2020-07-06 13:58:35 +02:00
fbsanchez c6db39dce1 Smart services RC1 2020-07-06 12:06:12 +02:00
fbsanchez a0d489b90e Smart services 2020-07-06 11:10:43 +02:00
artica 50ef2f6e54 Auto-updated build strings. 2020-07-06 01:00:12 +02:00
artica ba9f22f7f9 Auto-updated build strings. 2020-07-05 01:00:12 +02:00
artica d2410e07e0 Auto-updated build strings. 2020-07-04 01:00:16 +02:00
fbsanchez 352da65640 WIP Smart services 2020-07-03 17:52:44 +02:00
artica f7922b7607 Auto-updated build strings. 2020-07-03 01:00:15 +02:00
fbsanchez d1d47c721d missed logger for new log location 2020-07-02 18:32:32 +02:00
fbsanchez af7981ed05 Service tree view 2020-07-02 14:53:33 +02:00
artica 40659c01da Updated version and build strings. 2020-07-02 10:52:47 +02:00
artica 7eee14de55 Auto-updated build strings. 2020-07-02 01:00:14 +02:00
fbsanchez 112f578512 wip smart services 2020-07-01 20:50:07 +02:00
Daniel Rodriguez 5397586470 Merge branch 'ent-6030-Problema-codificacion' into 'develop' 
Ent 6030 problema codificacion

See merge request artica/pandorafms!3329
 2020-07-01 17:55:16 +02:00
alejandro-campos 63df6c15f0 Merge branch 'develop' into ent-6030-Problema-codificacion 2020-07-01 16:39:00 +02:00
alejandro-campos 27770b91da fix encoding 2020-07-01 12:51:00 +02:00
Daniel Rodriguez 9e939f1979 Merge branch 'ent-6095-error-500-en-vista-de-modulos-de-invetario-en-meta' into 'develop' 
Fixed bug in module manage meta

See merge request artica/pandorafms!3344
 2020-07-01 11:33:58 +02:00
manuel.montes 5502ee6b01 Fixed bug in module manage meta 2020-07-01 10:16:55 +02:00
artica 0a69318d88 Auto-updated build strings. 2020-07-01 01:01:14 +02:00
fbsanchez ffba7b8285 wip services improvements 2020-06-30 18:59:47 +02:00
fbsanchez faaf14bfd4 Merge remote-tracking branch 'origin/develop' into ent-6012-servicios-dinamicos 
Conflicts:
	pandora_console/extras/mr/39.sql
	pandora_console/include/lib/Module.php
 2020-06-30 17:04:33 +02:00
fbsanchez 1d621bd3d5 WIP services 2020-06-30 16:57:08 +02:00
Daniel Rodriguez f0cbd61ad3 Merge branch 'ent-5649-visor-de-log-en-metaconsola' into 'develop' 
Added log_viewer in metaconsole

See merge request artica/pandorafms!3312
 2020-06-30 15:51:51 +02:00
Alejandro Fraguas ed04527a96 Merge branch 'ent-5310-Mejorar-datos-Wizard-SNMP-WMI' into 'develop' 
Backup upload

See merge request artica/pandorafms!3160
 2020-06-30 12:16:51 +02:00
José González 311b259684 Backup upload 2020-06-30 12:16:51 +02:00
artica 8882124487 Auto-updated build strings. 2020-06-30 01:00:17 +02:00
fbsanchez c07daa3199 WIP Services 2020-06-29 19:17:40 +02:00
Daniel Rodriguez 57c7a98990 Merge branch 'ent-6038-Comprobar-funcionamiento-de-la-funcionalidad-de-feedback' into 'develop' 
changed text

See merge request artica/pandorafms!3336
 2020-06-29 12:09:20 +02:00
alejandro-campos b7af840a20 changed text 2020-06-29 10:57:19 +02:00
artica 2cb3c5eb57 Auto-updated build strings. 2020-06-29 01:00:14 +02:00
artica bf52e7bbc8 Auto-updated build strings. 2020-06-28 01:00:14 +02:00
artica 2a641c344d Auto-updated build strings. 2020-06-27 01:00:20 +02:00
fbsanchez 032faf8c0c WIP Smart services 2020-06-26 15:48:58 +02:00
alejandro-campos 2133126182 fix encoding 2020-06-26 14:00:31 +02:00
alejandro-campos 50ed6718d8 Revert "fix encoding" 
This reverts commit 3a042c67f3.
 2020-06-26 13:47:39 +02:00
Daniel Rodriguez 898d29060a Merge branch 'ent-5914-problema-css-con-resolucion-pantalla-1366' into 'develop' 
Ent 5914 problema css con resolucion pantalla 1366

See merge request artica/pandorafms!3257
 2020-06-26 13:29:17 +02:00
Manuel Montes b7411da737 Ent 5914 problema css con resolucion pantalla 1366 2020-06-26 13:29:17 +02:00
Daniel Rodriguez 1adcce21af Merge branch 'ent-5386-9454-Graficas-en-tiempo-real-modulos-snmp-no-funcionan-con-caracteres-especiales-en-comunidad' into 'develop' 
fix broken snmp modules real time graphs when community string has certain chars

See merge request artica/pandorafms!3131
 2020-06-26 13:28:04 +02:00
Daniel Rodriguez 7f1bd68c26 Merge branch 'ent-5865-9984-Error-al-realizar-SNMPWalk-en-consola-con-v3-y-caracteres-especiales' into 'develop' 
fixed ajax call params when using url characters

See merge request artica/pandorafms!3237
 2020-06-26 12:41:25 +02:00
artica 03016871ad Auto-updated build strings. 2020-06-26 01:00:17 +02:00
Daniel Rodriguez 40a5262ae8 Merge branch 'ent-6058-SNMP-Browser-v3-No-funciona' into 'develop' 
Fixed error snmp V3 not working

See merge request artica/pandorafms!3333
 2020-06-25 17:09:38 +02:00
Daniel Rodriguez 8a2b0becd8 Merge branch 'ent-5787-change-default-web-engine-to-curl' into 'develop' 
Changed default web engine from LWP to CURL

See merge request artica/pandorafms!3259
 2020-06-25 16:34:09 +02:00
Luis 5db15e12d8 Changed default web engine from LWP to CURL 2020-06-25 16:34:09 +02:00
Daniel Barbero Martin c588914869 Fixed error snmp V3 not working 2020-06-25 15:31:36 +02:00
Alejandro Fraguas 02bffc7e0d Merge branch 'ent-5935-Logs-de-la-consola-refactorizacion' into 'develop' 
changed console and audit log locations

See merge request artica/pandorafms!3278
 2020-06-25 15:28:13 +02:00
Daniel Rodriguez fad08b9d66 Merge branch 'ent-5945-Fallo-visual-en-graficas-de-tipo-sparse' into 'develop' 
Fixed minor error graph sparse width

See merge request artica/pandorafms!3274
 2020-06-25 15:18:33 +02:00
daniel 7dc759f3ac Fixed minor error graph sparse width 2020-06-25 15:18:33 +02:00
Daniel Rodriguez a645f3c0b2 Merge branch 'ent-5850-error-reports-historical-serialize-command-snapshots' into 'develop' 
Ent 5850 error reports historical serialize command snapshots

See merge request artica/pandorafms!3217
 2020-06-25 15:17:24 +02:00