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

14654 Commits

Author SHA1 Message Date
vgilc 2e72025bbf Merge branch '874-Añadir-posibilidad-de-ver-todos-los-eventos' into 'develop' 
add checkbox for show all events in view agent detail

See merge request !585
 2017-06-19 09:09:24 +02:00
artica 5e4b1d6965 Auto-updated build strings. 2017-06-19 00:01:14 +02:00
artica 89ea98f505 Auto-updated build strings. 2017-06-18 00:01:14 +02:00
artica 8e94fd58f4 Auto-updated build strings. 2017-06-17 00:01:16 +02:00
artica 0059f79012 Auto-updated build strings. 2017-06-16 00:01:14 +02:00
Ramon Novoa 035829ce91 Replaced procedures with prepared statements. 
The Update Manager client cannot load MySQL procedures because the
parser breaks them.
 2017-06-15 15:43:00 +02:00
Ramon Novoa d2d56b4b89 Add a missing MR. 2017-06-15 13:47:20 +02:00
Ramon Novoa 7c3ef317b0 Revert "Add a missing MR." 
This reverts commit 16b0da1515.
 2017-06-15 10:50:31 +02:00
Ramon Novoa 16b0da1515 Add a missing MR. 2017-06-15 10:33:30 +02:00
artica 70c651466e Auto-updated build strings. 2017-06-15 00:01:27 +02:00
daniel 80a38cbd9f add checkbox for show all events in view agent detail 2017-06-14 12:45:40 +02:00
vgilc d8fc3ac9e9 Merge branch 'No-funciona-módulo-system-dev' into 'develop' 
Fixed problem in data display snmp wizard

See merge request !534
 2017-06-14 11:50:26 +02:00
vgilc 528b9abba6 Merge branch '996-Filtro-SNMP-desaparece-dev' into 'develop' 
Fixed problem with snmp filter

See merge request !574
 2017-06-14 11:48:49 +02:00
vgilc babc431c82 Merge branch '948-Borrado-de-traps-agrupados-dev' into 'develop' 
fixed deleting grouped traps

See merge request !549
 2017-06-14 11:48:01 +02:00
vgilc 8f693ee9c8 Merge branch '995-Agent-name-en-operaciones-masivas-de-plugins-dev' into 'develop' 
changed agent name by alias

See merge request !566
 2017-06-14 11:46:13 +02:00
vgilc c78711ba6f Merge branch '539-encrypt-agent-custom-fields-in-pandora-console-dev' into 'develop' 
539 encrypt agent custom fields in pandora console dev

See merge request !520
 2017-06-14 11:42:51 +02:00
vgilc 31161ff034 Merge branch '698-Modulos-predictivos-no-se-inician-en-la-versión-open' into 'develop' 
Take prediction_module param when create module and init module - #698

See merge request !548
 2017-06-14 11:36:33 +02:00
vgilc 97be7d4ca3 Merge branch '863-Cambios-en-pandora_df_used-3989-com1' into 'develop' 
Change pandora_df_used plugin data separator fixing netdrives definition - #863

See merge request !554
 2017-06-14 11:34:08 +02:00
vgilc 7bfd3254a7 Merge branch '656-changes-in-system-log-viewer-dev' into 'develop' 
Added changes

See merge request !518
 2017-06-14 11:32:44 +02:00
vgilc 49e3beea27 Merge branch '869-Insert-data-no-funciona' into 'develop' 
Fix insert data extension, bad parameters in xml format - #869

See merge request !492
 2017-06-14 11:30:55 +02:00
vgilc 3ae20056fc Merge branch '990-advise-links-doesnt-work-in-open-version-dev' into 'develop' 
Changed bad ajax call

See merge request !562
 2017-06-14 11:05:38 +02:00
vgilc 773c6e3bc7 Merge branch '945-set-a-default-servername-value-in-pandora_db-dev' into 'develop' 
Set servername default value in pandora_db script

See merge request !539
 2017-06-14 10:49:48 +02:00
vgilc 9b35a7f5ba Merge branch '975-dot-and-plain-files-path-in-windows-dev' into 'develop' 
Added OS filter

See merge request !557
 2017-06-14 10:48:44 +02:00
vgilc 91f8e9d65c Merge branch '1010-Actualizar-servername-cuando-haya-cambio-de-mayúculas' into 'develop' 
fixed errors caase sensitive servername

See merge request !583
 2017-06-14 10:41:46 +02:00
artica d090692412 Auto-updated build strings. 2017-06-14 00:01:12 +02:00
daniel d85ec51220 fixed errors caase sensitive servername 2017-06-13 12:42:21 +02:00
vgilc a690187365 Merge branch '757-fullscale-chart-system-final-fix-dev' into 'develop' 
757 fullscale chart system final fix dev

See merge request !582
 2017-06-13 10:07:24 +02:00
Arturo Gonzalez c506c9cce6 Added a condition to small charts 2017-06-13 09:45:08 +02:00
Arturo Gonzalez e237198d06 Added a final fix 2017-06-13 09:26:08 +02:00
artica 8ba1cf66af Auto-updated build strings. 2017-06-13 00:02:03 +02:00
vgilc 03e17e335f Merge branch '637-moduledata-macro-dev' into 'develop' 
Added moduledata macro help text

See merge request !580
 2017-06-12 18:04:54 +02:00
vgilc 0b91390aa7 Merge branch '757-fullscale-chart-system-dev' into 'develop' 
Added some code to manage timestamps in chart data

See merge request !581
 2017-06-12 17:54:07 +02:00
Arturo Gonzalez 0af82fd69d Added some code to manage timestamps in chart data 2017-06-12 17:48:42 +02:00
Arturo Gonzalez 6f343ccd74 Added moduledata macro help text 2017-06-12 17:10:19 +02:00
vgilc dbd510f6a0 Merge branch '757-fullscale-charts-all-data-dev' into 'develop' 
Added some code to put all data in the chart

See merge request !579
 2017-06-12 16:56:32 +02:00
Arturo Gonzalez e3443e044f Added some code to put all data in the chart 2017-06-12 16:39:46 +02:00
artica d3df682528 Updated version and build strings. 2017-06-12 16:05:06 +02:00
vgilc ba9da1a14d Merge branch '637-moduledata-new-macro-dev' into 'develop' 
changed macro name

See merge request !578
 2017-06-12 15:46:35 +02:00
Arturo Gonzalez 722ca036a4 changed macro name 2017-06-12 15:22:31 +02:00
vgilc 9c0efdeeba Merge branch '523-deteccion-de-cambios-en-inventario-modulo-software-y-otros-con-varias-lineas-open-2' into 'develop' 
Improve event title format and alias rather name - #523

See merge request !577
 2017-06-12 15:20:32 +02:00
enriquecd 131753cfba Inprove event title format and alias rather name - #523 2017-06-12 14:34:03 +02:00
vgilc 0a74a35c7e Merge branch '757-Added-code-to-fullscale-charts-dev' into 'develop' 
Added code to manage timestamps in fullscale mode

See merge request !575
 2017-06-12 13:39:16 +02:00
Arturo Gonzalez 00ac431216 Added code to manage timestamps in fullscale mode 2017-06-12 13:33:41 +02:00
Daniel Maya 96ef0fdc4f Fixed problem with snmp filter 2017-06-12 12:05:23 +02:00
artica ff30396595 Auto-updated build strings. 2017-06-12 00:01:16 +02:00
artica 0d458763b9 Auto-updated build strings. 2017-06-11 00:01:13 +02:00
artica 97bf8f1fda Auto-updated build strings. 2017-06-10 00:01:13 +02:00
artica 1f94295c0c Auto-updated build strings. 2017-06-09 00:01:17 +02:00
vgilc 8e230a4883 Merge branch '961_Error_al_cambiar_ruta_de_pandora_v7_rev_2' into 'develop' 
fixed errors in login page

See merge request !571
 2017-06-08 12:02:49 +02:00
daniel 2d441437a8 fixed errors in login page 2017-06-08 11:26:16 +02:00