MantisBT: master 8d92e853

Diff Back to Repository
Author Committer Branch Timestamp Parent
Rafik Robeal Rafik Robeal master 2016-05-13 19:07 master 1a28acf3
Changeset

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

Conflicts:

adm_config_report.php

bug_reminder_page.php

js/common.js

lost_pwd_page.php

manage_user_edit_page.php

print_bug_page.php

view_user_page.php
mod - adm_config_report.php Diff File
mod - adm_config_set.php Diff File
mod - admin/upgrade_unattended.php Diff File
mod - api/soap/mc_issue_api.php Diff File
mod - billing_export_to_csv.php Diff File
mod - billing_export_to_excel.php Diff File
mod - bug_actiongroup.php Diff File
mod - bug_actiongroup_add_note_inc.php Diff File
mod - bug_reminder.php Diff File
mod - bug_reminder_page.php Diff File
mod - bug_report.php Diff File
mod - bug_update.php Diff File
mod - bugnote_add.php Diff File
mod - config_defaults_inc.php Diff File
mod - core.php Diff File
mod - core/access_api.php Diff File
mod - core/authentication_api.php Diff File
mod - core/billing_api.php Diff File
mod - core/bug_api.php Diff File
mod - core/bugnote_api.php Diff File
mod - core/classes/Avatar.class.php Diff File
add - core/classes/ConfigParser.class.php Diff File
add - core/classes/Tokenizer.class.php Diff File
mod - core/collapse_api.php Diff File
mod - core/columns_api.php Diff File
mod - core/compress_api.php Diff File
mod - core/constant_inc.php Diff File
mod - core/email_api.php Diff File
mod - core/filter_api.php Diff File
mod - core/graphviz_api.php Diff File
add - core/mention_api.php Diff File
mod - core/obsolete.php Diff File
mod - core/plugin_api.php Diff File
mod - core/print_api.php Diff File
mod - csv_export.php Diff File
mod - docbook/Admin_Guide/en-US/Configuration.xml Diff File
mod - docbook/Admin_Guide/en-US/Customizing.xml Diff File
mod - docbook/Admin_Guide/en-US/User_Management.xml Diff File
mod - docbook/Admin_Guide/en-US/config/email.xml Diff File
mod - docbook/Admin_Guide/en-US/config/html.xml Diff File
mod - docbook/Admin_Guide/en-US/config/reminders.xml Diff File
add - docbook/Admin_Guide/en-US/config/user.xml Diff File
mod - excel_xml_export.php Diff File
mod - js/common.js Diff File
mod - lang/strings_belarusian_tarask.txt Diff File
mod - lang/strings_chinese_simplified.txt Diff File
mod - lang/strings_english.txt Diff File
mod - lang/strings_french.txt Diff File
mod - lang/strings_galician.txt Diff File
mod - lang/strings_german.txt Diff File
mod - lang/strings_hebrew.txt Diff File
mod - lang/strings_italian.txt Diff File
mod - lang/strings_macedonian.txt Diff File
mod - lang/strings_occitan.txt Diff File
mod - lang/strings_portuguese_brazil.txt Diff File
mod - lang/strings_ripoarisch.txt Diff File
mod - lang/strings_spanish.txt Diff File
mod - lang/strings_swedish.txt Diff File
mod - lang/strings_ukrainian.txt Diff File
mod - lost_pwd_page.php Diff File
mod - manage_user_edit_page.php Diff File
add - manage_user_impersonate.php Diff File
mod - plugins/MantisCoreFormatting/MantisCoreFormatting.php Diff File
mod - plugins/XmlImportExport/lang/strings_lithuanian.txt Diff File
mod - print_all_bug_page.php Diff File
mod - print_bug_page.php Diff File
mod - tests/AllTests.php Diff File
mod - tests/Mantis/AllTests.php Diff File
add - tests/Mantis/ConfigParserTest.php Diff File
mod - tests/Mantis/HelperTest.php Diff File
add - tests/Mantis/MentionParsingTest.php Diff File
mod - tests/Mantis/StringTest.php Diff File
mod - tests/TestConfig.php Diff File
mod - tests/soap/AllTests.php Diff File
add - tests/soap/MentionTest.php Diff File
mod - view_all_inc.php Diff File
mod - view_user_page.php Diff File