MantisBT: master fc522feb

Author Committer Branch Timestamp Parent
Rafik Robeal Rafik Robeal master 2014-08-30 11:00 master dcf22636
Changeset

Merge remote-tracking branch 'remotes/syncguru/master' into modern-ui-2

Conflicts:
admin/move_attachments.php
admin/move_attachments_page.php
admin/system_utils.php
core/html_api.php
core/tag_api.php
plugins/MantisGraph/pages/summary_graph_imp_category.php
plugins/MantisGraph/pages/summary_graph_imp_priority.php
plugins/MantisGraph/pages/summary_graph_imp_resolution.php
tag_view_page.php

mod - adm_config_report.php Diff File
mod - admin/move_attachments.php Diff File
mod - admin/move_attachments_page.php Diff File
mod - admin/schema.php Diff File
mod - admin/test_langs.php Diff File
mod - api/soap/mantisconnect.php Diff File
mod - api/soap/mc_api.php Diff File
mod - api/soap/mc_file_api.php Diff File
mod - api/soap/mc_filter_api.php Diff File
mod - config_defaults_inc.php Diff File
mod - core/collapse_api.php Diff File
mod - core/config_api.php Diff File
mod - core/current_user_api.php Diff File
mod - core/custom_field_api.php Diff File
mod - core/database_api.php Diff File
mod - core/file_api.php Diff File
mod - core/filter_api.php Diff File
mod - core/gpc_api.php Diff File
mod - core/history_api.php Diff File
mod - core/html_api.php Diff File
mod - core/install_helper_functions_api.php Diff File
mod - core/print_api.php Diff File
mod - core/profile_api.php Diff File
mod - core/tag_api.php Diff File
mod - core/user_api.php Diff File
mod - docbook/Admin_Guide/en-US/Configuration.xml Diff File
mod - lang/strings_breton.txt Diff File
mod - lang/strings_chinese_simplified.txt Diff File
mod - lang/strings_chinese_traditional.txt Diff File
mod - lang/strings_czech.txt Diff File
mod - lang/strings_galician.txt Diff File
mod - lang/strings_german.txt Diff File
mod - lang/strings_hungarian.txt Diff File
mod - lang/strings_interlingua.txt Diff File
mod - lang/strings_italian.txt Diff File
mod - lang/strings_korean.txt Diff File
mod - lang/strings_macedonian.txt Diff File
mod - lang/strings_polish.txt Diff File
mod - lang/strings_portuguese_standard.txt Diff File
mod - lang/strings_romanian.txt Diff File
mod - lang/strings_russian.txt Diff File
mod - lang/strings_serbian.txt Diff File
mod - lang/strings_slovak.txt Diff File
mod - lang/strings_slovene.txt Diff File
mod - lang/strings_spanish.txt Diff File
mod - lang/strings_swedish.txt Diff File
mod - lang/strings_vietnamese.txt Diff File
mod - manage_config_columns_set.php Diff File
mod - plugins/MantisCoreFormatting/lang/strings_chinese_simplified.txt Diff File
mod - plugins/MantisCoreFormatting/lang/strings_chinese_traditional.txt Diff File
mod - plugins/MantisCoreFormatting/lang/strings_romanian.txt Diff File
mod - plugins/MantisCoreFormatting/lang/strings_russian.txt Diff File
mod - plugins/MantisCoreFormatting/lang/strings_slovak.txt Diff File
mod - plugins/MantisCoreFormatting/lang/strings_spanish.txt Diff File
mod - plugins/MantisCoreFormatting/lang/strings_swedish.txt Diff File
mod - plugins/MantisGraph/lang/strings_macedonian.txt Diff File
mod - plugins/MantisGraph/pages/summary_graph_bycategory.php Diff File
mod - plugins/MantisGraph/pages/summary_graph_bycategory_pct.php Diff File
mod - plugins/MantisGraph/pages/summary_graph_bypriority.php Diff File
mod - plugins/MantisGraph/pages/summary_graph_bypriority_mix.php Diff File
mod - plugins/MantisGraph/pages/summary_graph_bypriority_pct.php Diff File
mod - plugins/MantisGraph/pages/summary_graph_byresolution.php Diff File
mod - plugins/MantisGraph/pages/summary_graph_byresolution_mix.php Diff File
mod - plugins/MantisGraph/pages/summary_graph_byresolution_pct.php Diff File
mod - plugins/MantisGraph/pages/summary_graph_byseverity.php Diff File
mod - plugins/MantisGraph/pages/summary_graph_byseverity_mix.php Diff File
mod - plugins/MantisGraph/pages/summary_graph_byseverity_pct.php Diff File
mod - plugins/MantisGraph/pages/summary_graph_bystatus.php Diff File
mod - plugins/MantisGraph/pages/summary_graph_bystatus_pct.php Diff File
mod - plugins/MantisGraph/pages/summary_graph_imp_category.php Diff File
mod - plugins/MantisGraph/pages/summary_graph_imp_priority.php Diff File
mod - plugins/MantisGraph/pages/summary_graph_imp_resolution.php Diff File
mod - plugins/MantisGraph/pages/summary_graph_imp_severity.php Diff File
mod - plugins/MantisGraph/pages/summary_graph_imp_status.php Diff File
mod - print_all_bug_page.php Diff File
mod - search.php Diff File
mod - tag_view_page.php Diff File
mod - view_all_set.php Diff File