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

14777 Commits

Author SHA1 Message Date
enriquecd 131753cfba Inprove event title format and alias rather name - #523 2017-06-12 14:34:03 +02:00
Daniel Maya 4693702741 Fixed sql error in tagente_datos_log4x 2017-06-12 13:43:53 +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
Daniel Maya 4bdc0df5c4 Changed agent name by alias in alerts details 2017-06-08 17:55:04 +02:00
Daniel Maya aec9251b88 Fixed current_interval in data server 2017-06-08 17:04:43 +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
Daniel Maya a27a9e8cb3 Fixed version in footer 2017-06-08 10:22:59 +02:00
vgilc 3e62e03505 Merge branch '850-Trace-in-code-dev' into 'develop' 
Trace removed

See merge request !569
 2017-06-08 09:33:22 +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
vgilc 84b02bdf9d Merge branch '311-Filtrar-por-campo-personalizado-en-eventos-comas' into 'develop' 
Fix bug when there is an event with a bad data in custom_data - #311

See merge request !568
 2017-06-07 18:02:13 +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
vgilc 1be87b0e54 Merge branch '442-Recon-server-aparece-con-la-fuente-en-gris-2' into 'develop' 
Remove pandorfms name column link in server manager - #442

See merge request !564
 2017-06-07 15:55:50 +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
vgilc 2ec69160e3 Merge branch '851-new-report-type-max+min+avg-dev' into 'develop' 
851 new report type max+min+avg dev

See merge request !463
 2017-06-07 15:00:45 +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
Arturo Gonzalez 474957249b Added correct button declaration 2017-06-07 10:29:01 +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
vgilc fe56ad8735 Merge branch 'fixed-errors-in-login' into 'develop' 
fixed errors instalation

See merge request !559
 2017-06-06 16:01:01 +02:00
Arturo Gonzalez 5d9d1cf77b Added better idea, thanks luis 2017-06-06 15:53:56 +02:00
Arturo Gonzalez f0492c370c Changed format 2017-06-06 15:48:58 +02:00
daniel c25c5acfeb fixed errors instalation 2017-06-06 15:22:58 +02:00
vgilc 6e30b9176a Merge branch '961_Error_al_cambiar_ruta_de_pandora_v7_rev' into 'develop' 
fixed errors in login page

See merge request !558
 2017-06-06 14:31:57 +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
vgilc c5698b7070 Merge branch '637-multi-origin-macros-dev' into 'develop' 
637 multi origin macros dev

See merge request !556
 2017-06-06 10:30:50 +02:00
Arturo Gonzalez 6c63067ff5 Added new macro 2017-06-06 10:08:14 +02:00
vgilc aedb440ea2 Merge branch '757-full-scale-graph-dev' into 'develop' 
757 full scale graph dev

See merge request !552
 2017-06-06 09:51:04 +02:00
vgilc 164f70cb7d Merge branch '959-Masivas-de-plugins-no-funcionan' into 'develop' 
Decode html entities in module plugin selector for edit bulk operation - #959

See merge request !553
 2017-06-06 09:50:14 +02:00
artica a90906f2c9 Auto-updated build strings. 2017-06-06 00:01:16 +02:00
enriquecd 38464bf615 Change ajax call method get to post for autorefresh and use new timecount param - #868 2017-06-05 18:36:12 +02:00
Arturo Gonzalez 0c57d35f53 Added a first version to multi origin macros feature. 2017-06-05 17:48:37 +02:00
enriquecd 4bd61b1fb5 Change pandora_df_used plugin data separator fixing netdrives definition - #863 2017-06-05 13:53:06 +02:00
enriquecd ced8050317 Decode html entities in module plugin selector for edit bulk operation - #959 2017-06-05 12:50:22 +02:00
artu30 c0a4cd9df5 Merge branch 'develop' into '757-full-scale-graph-dev' 
# Conflicts:
#   pandora_console/include/functions_graph.php
 2017-06-05 09:38:06 +02:00
artica 291ae3a192 Auto-updated build strings. 2017-06-05 00:01:13 +02:00
artica f9da9b404b Auto-updated build strings. 2017-06-04 00:01:14 +02:00