MantisBT: master a46ed46b

Diff Back to Repository
Author Committer Branch Timestamp Parent
Rafik Robeal Rafik Robeal master 2014-11-11 21:10 master f5bd6a59
Changeset

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

Conflicts:
bug_report_page.php
bug_view_inc.php
bugnote_view_inc.php
core/html_api.php
css/default.css
docbook/Admin_Guide/en-US/Configuration.xml
login_page.php
manage_columns_inc.php
manage_config_columns_set.php
manage_config_work_threshold_page.php
manage_config_workflow_page.php
manage_custom_field_edit_page.php
my_view_inc.php
plugins/XmlImportExport/XmlImportExport.php
plugins/XmlImportExport/pages/import.php
print_bugnote_inc.php
mod - .gitignore Diff File
mod - adm_config_set.php Diff File
mod - adm_permissions_report.php Diff File
mod - admin/check/check_config_inc.php Diff File
mod - api/soap/mc_issue_api.php Diff File
mod - api/soap/mc_project_api.php Diff File
mod - bugnote_view_inc.php Diff File
mod - core/authentication_api.php Diff File
mod - core/bug_api.php Diff File
mod - core/bugnote_api.php Diff File
mod - core/category_api.php Diff File
mod - core/collapse_api.php Diff File
mod - core/constant_inc.php Diff File
mod - core/current_user_api.php Diff File
mod - core/database_api.php Diff File
mod - core/email_api.php Diff File
mod - core/error_api.php Diff File
mod - core/events_inc.php Diff File
mod - core/filter_api.php Diff File
mod - core/helper_api.php Diff File
mod - core/history_api.php Diff File
mod - core/install_helper_functions_api.php Diff File
mod - core/project_api.php Diff File
mod - core/user_api.php Diff File
mod - docbook/Admin_Guide/en-US/Configuration.xml Diff File
mod - docbook/Admin_Guide/en-US/Troubleshooting.xml Diff File
add - docbook/Admin_Guide/en-US/config/auth.xml Diff File
add - docbook/Admin_Guide/en-US/config/bughistory.xml Diff File
add - docbook/Admin_Guide/en-US/config/bugnote.xml Diff File
add - docbook/Admin_Guide/en-US/config/cookies.xml Diff File
add - docbook/Admin_Guide/en-US/config/customfields.xml Diff File
add - docbook/Admin_Guide/en-US/config/database.xml Diff File
add - docbook/Admin_Guide/en-US/config/date.xml Diff File
add - docbook/Admin_Guide/en-US/config/defaults.xml Diff File
add - docbook/Admin_Guide/en-US/config/display.xml Diff File
add - docbook/Admin_Guide/en-US/config/email.xml Diff File
add - docbook/Admin_Guide/en-US/config/fields.xml Diff File
add - docbook/Admin_Guide/en-US/config/filters.xml Diff File
add - docbook/Admin_Guide/en-US/config/html.xml Diff File
add - docbook/Admin_Guide/en-US/config/language.xml Diff File
add - docbook/Admin_Guide/en-US/config/logging.xml Diff File
add - docbook/Admin_Guide/en-US/config/misc.xml Diff File
add - docbook/Admin_Guide/en-US/config/myview.xml Diff File
add - docbook/Admin_Guide/en-US/config/news.xml Diff File
add - docbook/Admin_Guide/en-US/config/path.xml Diff File
add - docbook/Admin_Guide/en-US/config/relationship.xml Diff File
add - docbook/Admin_Guide/en-US/config/reminders.xml Diff File
add - docbook/Admin_Guide/en-US/config/security.xml Diff File
add - docbook/Admin_Guide/en-US/config/settings.xml Diff File
add - docbook/Admin_Guide/en-US/config/signup.xml Diff File
add - docbook/Admin_Guide/en-US/config/soap.xml Diff File
add - docbook/Admin_Guide/en-US/config/speed.xml Diff File
add - docbook/Admin_Guide/en-US/config/sponsorship.xml Diff File
add - docbook/Admin_Guide/en-US/config/status.xml Diff File
add - docbook/Admin_Guide/en-US/config/subprojects.xml Diff File
add - docbook/Admin_Guide/en-US/config/summary.xml Diff File
add - docbook/Admin_Guide/en-US/config/tables.xml Diff File
add - docbook/Admin_Guide/en-US/config/time.xml Diff File
add - docbook/Admin_Guide/en-US/config/timetracking.xml Diff File
add - docbook/Admin_Guide/en-US/config/timezone.xml Diff File
add - docbook/Admin_Guide/en-US/config/uploads.xml Diff File
add - docbook/Admin_Guide/en-US/config/version.xml Diff File
add - docbook/Admin_Guide/en-US/config/webserver.xml Diff File
mod - docbook/Developers_Guide/en-US/Events_Reference_Manage.xml Diff File
mod - lang/strings_breton.txt Diff File
mod - lang/strings_czech.txt Diff File
mod - lang/strings_english.txt Diff File
mod - lang/strings_japanese.txt Diff File
mod - login.php Diff File
mod - login_page.php Diff File
mod - manage_columns_inc.php Diff File
mod - manage_config_columns_set.php Diff File
mod - manage_config_email_page.php Diff File
mod - manage_config_email_set.php Diff File
mod - manage_config_revert.php Diff File
mod - manage_config_work_threshold_page.php Diff File
mod - manage_config_workflow_page.php Diff File
mod - manage_config_workflow_set.php Diff File
mod - manage_custom_field_edit_page.php Diff File
mod - my_view_page.php Diff File
mod - plugins/XmlImportExport/ImportXml.php Diff File
mod - plugins/XmlImportExport/ImportXml/Issue.php Diff File
mod - plugins/XmlImportExport/ImportXml/Mapper.php Diff File
mod - plugins/XmlImportExport/XmlImportExport.php Diff File
mod - plugins/XmlImportExport/lang/strings_english.txt Diff File
mod - plugins/XmlImportExport/mantis.dtd Diff File
add - plugins/XmlImportExport/pages/config.php Diff File
add - plugins/XmlImportExport/pages/config_page.php Diff File
mod - plugins/XmlImportExport/pages/export.php Diff File
mod - plugins/XmlImportExport/pages/import.php Diff File
mod - print_bugnote_inc.php Diff File
mod - readme.md Diff File
mod - return_dynamic_filters.php Diff File
mod - tests/Mantis/HelperTest.php Diff File
mod - tests/soap/FilterTest.php Diff File
mod - view_all_bug_page.php Diff File
mod - view_all_inc.php Diff File
mod - view_filters_page.php Diff File