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

14592 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Arturo Gonzalez 0c57d35f53 Added a first version to multi origin macros feature. 2017-06-05 17:48:37 +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
artica 9f041fb76b Auto-updated build strings. 2017-06-03 00:01:19 +02:00
vgilc a4ecc9374d Merge branch '949-node-events-with-event-replication-dev' into 'develop' 
Fixed readonly validation in nodes

See merge request !542
 2017-06-02 11:04:22 +02:00
vgilc eab92ce1c8 Merge branch '925-UM-Offline-y-current_package_enterprise-dev' into 'develop' 
Changed current_package_enterprise

See merge request !516
 2017-06-02 11:00:51 +02:00
vgilc 69c64fa7dd Merge branch '852-Bug-en-llave-de-Consola-Visual' into 'develop' 
No unselect elements when click over vconsole settings key - #852

See merge request !488
 2017-06-02 11:00:00 +02:00
vgilc 1c4f64ac2a Merge branch '936-weird-general-item-in-reports-dev' into 'develop' 
Fixed general item in reports

See merge request !526
 2017-06-02 10:59:02 +02:00
vgilc 5ed3e01afc Merge branch '957-sound-events-style-dev' into 'develop' 
Added styles to sound events window

See merge request !543
 2017-06-02 10:34:05 +02:00
vgilc db43f909fd Merge branch '920-Wrong-visualization-with-custom-graphs-items-in-visual-console-dev' into 'develop' 
Changed custom graph size specs in visual console

See merge request !517
 2017-06-02 10:32:58 +02:00
vgilc 12008fee56 Revert "Merge branch '961_Error_al_cambiar_ruta_de_pandora_v7' into 'develop'" 
This reverts merge request !547
 2017-06-02 10:31:48 +02:00
vgilc 5ed4aa3397 Merge branch '958-fixed-target-ip-in-policy-modules-dev' into 'develop' 
Added target_ip to policy_modules table

See merge request !544
 2017-06-02 10:11:18 +02:00
vgilc 6ad0dde2b7 Merge branch '961_Error_al_cambiar_ruta_de_pandora_v7' into 'develop' 
fixed errors in errors login

See merge request !547
 2017-06-02 09:19:35 +02:00
artica 475a56f6bd Auto-updated build strings. 2017-06-02 00:01:19 +02:00
daniel 00f5c2027c fixed errors in errors login 2017-06-01 18:23:06 +02:00
vgilc da2adc25d2 Merge branch '959-Masivas-de-plugins-no-funcionan' into 'develop' 
Change processGet jquery call get to post - #959

See merge request !545
 2017-06-01 15:50:16 +02:00
enriquecd 7ab1748be6 Change processGet jquery call get to post - #959 2017-06-01 15:27:55 +02:00
vgilc b2960f55e5 Merge branch '956-Fixed-full-legend-feature-in-dashboards-simple-graphs-dev' into 'develop' 
Added new condition to dashboard and non avg only in simple graphs

See merge request !541
 2017-06-01 14:35:12 +02:00
Arturo Gonzalez 4d46470e96 Added target_ip to policy_modules table 2017-06-01 14:24:24 +02:00