MantisBT: master e63802a7

Diff Back to Repository
Author Committer Branch Timestamp Parent
Rafik Robeal Rafik Robeal master 2014-10-23 19:35 master 577c38e3
Changeset

Merge branch 'master' of https://github.com/mantisbt/mantisbt into modern-ui-2

Conflicts:
account_prefs_inc.php
account_prof_edit_page.php
account_prof_menu_page.php
account_sponsor_page.php
core/authentication_api.php
core/html_api.php
css/default.css
manage_columns_inc.php
manage_overview_page.php
manage_proj_cat_edit_page.php
manage_proj_edit_page.php
manage_proj_page.php
manage_proj_ver_edit_page.php
manage_tags_page.php
manage_user_create_page.php
manage_user_edit_page.php
plugins/MantisGraph/pages/summary_graph_imp_category.php
plugins/MantisGraph/pages/summary_graph_imp_resolution.php
plugins/MantisGraph/pages/summary_graph_imp_status.php
plugins/MantisGraph/pages/summary_jpgraph_page.php
plugins/XmlImportExport/pages/import_action.php
proj_doc_add_page.php
proj_doc_edit_page.php
proj_doc_page.php
summary_page.php
mod - account_page.php Diff File
mod - adm_config_report.php Diff File
mod - adm_permissions_report.php Diff File
rm - config_menu_defaults_inc.php Diff
mod - core.php Diff File
mod - core/authentication_api.php Diff File
rm - core/classes/MantisMenu.class.php Diff
mod - core/html_api.php Diff File
mod - manage_config_columns_page.php Diff File
mod - manage_config_email_page.php Diff File
mod - manage_config_work_threshold_page.php Diff File
mod - manage_config_workflow_graph_page.php Diff File
mod - manage_config_workflow_page.php Diff File
mod - manage_custom_field_edit_page.php Diff File
mod - manage_custom_field_page.php Diff File
mod - manage_plugin_page.php Diff File
mod - manage_proj_cat_edit_page.php Diff File
mod - manage_proj_create_page.php Diff File
mod - manage_proj_edit_page.php Diff File
mod - manage_proj_ver_edit_page.php Diff File
mod - manage_user_create_page.php Diff File
mod - manage_user_page.php Diff File
mod - plugins/MantisCoreFormatting/pages/config.php Diff File
mod - plugins/MantisGraph/pages/config.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_severity.php Diff File
mod - plugins/XmlImportExport/pages/import_action.php Diff File