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

11208 Commits

Author SHA1 Message Date
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
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 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 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
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
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
enriquecd 131753cfba Inprove event title format and alias rather name - #523 2017-06-12 14:34:03 +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
daniel 2d441437a8 fixed errors in login page 2017-06-08 11:26:16 +02:00
Arturo Gonzalez 4e02e31c8b Trace removed 2017-06-08 09:01:36 +02:00
artica bb17348087 Auto-updated build strings. 2017-06-08 00:01:15 +02:00
enriquecd 777713f939 Fix bug when there is an event with a bad data in custom_data - #311 2017-06-07 17:55:53 +02:00
vgilc 1517a7f0e0 Merge branch '850-Added-Summatory-to-general-report-with-show-in-the-same-row-token-enabled-dev' into 'develop' 
Added lost value

See merge request !565
 2017-06-07 16:44:56 +02:00
Daniel Maya 95818e977e changed agent name by alias 2017-06-07 16:39:04 +02:00
Arturo Gonzalez 7782b08b59 Added lost value 2017-06-07 15:10:51 +02:00
enriquecd 912ec3dc34 Remove pandorfms name column link in server manager - #442 2017-06-07 15:05:19 +02:00
artu30 01f6f6ef5b Merge branch 'develop' into '851-new-report-type-max+min+avg-dev' 
# Conflicts:
#   pandora_console/godmode/reporting/reporting_builder.item_editor.php
#   pandora_console/include/functions_reporting_html.php
 2017-06-07 14:56:44 +02:00
Arturo Gonzalez d101d9abdc Changed bad ajax call 2017-06-07 11:28:09 +02:00
vgilc 149a77a559 Revert "Merge branch '961_Error_al_cambiar_ruta_de_pandora_v7_rev' into 'develop'" 
This reverts merge request !558
 2017-06-07 09:32:35 +02:00
vgilc c674892709 Revert "Merge branch 'fixed-errors-in-login' into 'develop'" 
This reverts merge request !559
 2017-06-07 09:31:46 +02:00
artica a19b321f9a Auto-updated build strings. 2017-06-07 00:01:14 +02:00
Arturo Gonzalez 5d9d1cf77b Added better idea, thanks luis 2017-06-06 15:53:56 +02:00
daniel c25c5acfeb fixed errors instalation 2017-06-06 15:22:58 +02:00
daniel 5d3a0c4ab7 fixed errors in login page 2017-06-06 13:57:10 +02:00
Arturo Gonzalez 8b75167cf8 Added OS filter 2017-06-06 13:11:28 +02:00