MantisBT: master 009109ce

Diff Back to Repository
Author Committer Branch Timestamp Parent
Paul Richards Paul Richards master 2014-03-28 14:34 master 8fb46a24
Changeset

Merge branch 'master' of github.com:mantisbt/mantisbt

Conflicts:
core/file_api.php
mod - .gitmodules Diff File
mod - .travis.yml Diff File
mod - account_page.php Diff File
mod - account_update.php Diff File
mod - adm_config_report.php Diff File
mod - adm_config_set.php Diff File
mod - admin/check/check_api.php Diff File
mod - admin/check/check_database_inc.php Diff File
mod - admin/check/check_display_inc.php Diff File
mod - admin/check/index.php Diff File
mod - admin/db_stats.php Diff File
mod - admin/index.php Diff File
mod - admin/install.php Diff File
mod - api/soap/mantisconnect.php Diff File
mod - api/soap/mc_file_api.php Diff File
mod - api/soap/mc_project_api.php Diff File
mod - bug_actiongroup.php Diff File
mod - bug_actiongroup_page.php Diff File
mod - bug_file_upload_inc.php Diff File
mod - bug_report.php Diff File
mod - bug_report_page.php Diff File
mod - bugnote_view_inc.php Diff File
mod - config_defaults_inc.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/columns_api.php Diff File
mod - core/config_api.php Diff File
mod - core/constant_inc.php Diff File
mod - core/custom_field_api.php Diff File
mod - core/database_api.php Diff File
mod - core/email_api.php Diff File
mod - core/file_api.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/html_api.php Diff File
mod - core/install_helper_functions_api.php Diff File
mod - core/news_api.php Diff File
mod - core/obsolete.php Diff File
mod - core/print_api.php Diff File
mod - core/profile_api.php Diff File
mod - core/project_api.php Diff File
mod - core/summary_api.php Diff File
mod - core/user_api.php Diff File
mod - core/user_pref_api.php Diff File
mod - core/version_api.php Diff File
mod - css/default.css Diff File
mod - css/status_config.php Diff File
mod - docbook/Admin_Guide/en-US/Configuration.xml Diff File
mod - docbook/Admin_Guide/en-US/Installation.xml Diff File
mod - docbook/Admin_Guide/en-US/Page_Descriptions.xml Diff File
mod - file_download.php Diff File
mod - lang/strings_english.txt Diff File
mod - lang/strings_qqq.txt Diff File
mod - library/adodb Diff File
rm - library/disposable/changelog.txt Diff
rm - library/disposable/disposable.php Diff
rm - library/disposable/index.html Diff
rm - library/disposable/license.txt Diff
rm - library/disposable/readme.txt Diff
rm - library/disposable/readme_mantis.txt Diff
rm - library/securimage/AHGBold.ttf Diff
rm - library/securimage/LICENSE.txt Diff
rm - library/securimage/README.FONT.txt Diff
rm - library/securimage/README.txt Diff
rm - library/securimage/WavFile.php Diff
rm - library/securimage/audio/en/0.wav Diff
rm - library/securimage/audio/en/1.wav Diff
rm - library/securimage/audio/en/10.wav Diff
rm - library/securimage/audio/en/11.wav Diff
rm - library/securimage/audio/en/12.wav Diff
rm - library/securimage/audio/en/13.wav Diff
rm - library/securimage/audio/en/14.wav Diff
rm - library/securimage/audio/en/15.wav Diff
rm - library/securimage/audio/en/16.wav Diff
rm - library/securimage/audio/en/17.wav Diff
rm - library/securimage/audio/en/18.wav Diff
rm - library/securimage/audio/en/19.wav Diff
rm - library/securimage/audio/en/2.wav Diff
rm - library/securimage/audio/en/20.wav Diff
rm - library/securimage/audio/en/3.wav Diff
rm - library/securimage/audio/en/4.wav Diff
rm - library/securimage/audio/en/5.wav Diff
rm - library/securimage/audio/en/6.wav Diff
rm - library/securimage/audio/en/7.wav Diff
rm - library/securimage/audio/en/8.wav Diff
rm - library/securimage/audio/en/9.wav Diff
rm - library/securimage/audio/en/A.wav Diff
rm - library/securimage/audio/en/B.wav Diff
rm - library/securimage/audio/en/C.wav Diff
rm - library/securimage/audio/en/D.wav Diff
rm - library/securimage/audio/en/E.wav Diff
rm - library/securimage/audio/en/F.wav Diff
rm - library/securimage/audio/en/G.wav Diff
rm - library/securimage/audio/en/H.wav Diff
rm - library/securimage/audio/en/I.wav Diff
rm - library/securimage/audio/en/J.wav Diff
rm - library/securimage/audio/en/K.wav Diff
rm - library/securimage/audio/en/L.wav Diff
rm - library/securimage/audio/en/M.wav Diff
rm - library/securimage/audio/en/MINUS.wav Diff
rm - library/securimage/audio/en/N.wav Diff
rm - library/securimage/audio/en/O.wav Diff
rm - library/securimage/audio/en/P.wav Diff
rm - library/securimage/audio/en/PLUS.wav Diff
rm - library/securimage/audio/en/Q.wav Diff
rm - library/securimage/audio/en/R.wav Diff
rm - library/securimage/audio/en/S.wav Diff
rm - library/securimage/audio/en/T.wav Diff
rm - library/securimage/audio/en/TIMES.wav Diff
rm - library/securimage/audio/en/U.wav Diff
rm - library/securimage/audio/en/V.wav Diff
rm - library/securimage/audio/en/W.wav Diff
rm - library/securimage/audio/en/X.wav Diff
rm - library/securimage/audio/en/Y.wav Diff
rm - library/securimage/audio/en/Z.wav Diff
rm - library/securimage/audio/en/error.wav Diff
rm - library/securimage/audio/noise/check-point-1.wav Diff
rm - library/securimage/audio/noise/crowd-talking-1.wav Diff
rm - library/securimage/audio/noise/crowd-talking-6.wav Diff
rm - library/securimage/audio/noise/crowd-talking-7.wav Diff
rm - library/securimage/audio/noise/kids-playing-1.wav Diff
rm - library/securimage/backgrounds/bg3.jpg Diff
rm - library/securimage/backgrounds/bg4.jpg Diff
rm - library/securimage/backgrounds/bg5.jpg Diff
rm - library/securimage/backgrounds/bg6.png Diff
rm - library/securimage/captcha.html Diff
rm - library/securimage/database/.htaccess Diff
rm - library/securimage/database/index.html Diff
rm - library/securimage/database/securimage.sq3 Diff
rm - library/securimage/example_form.ajax.php Diff
rm - library/securimage/example_form.php Diff
rm - library/securimage/images/audio_icon.png Diff
rm - library/securimage/images/refresh.png Diff
rm - library/securimage/securimage.php Diff
rm - library/securimage/securimage_play.php Diff
rm - library/securimage/securimage_play.swf Diff
rm - library/securimage/securimage_show.php Diff
rm - library/securimage/web.config Diff
rm - library/securimage/words/words.txt Diff
mod - manage_proj_update.php Diff File
mod - plugin.php Diff File
mod - plugins/MantisGraph/core/graph_api.php Diff File
mod - plugins/MantisGraph/pages/bug_graph_bycategory.php Diff File
mod - plugins/MantisGraph/pages/bug_graph_bystatus.php Diff File
mod - proj_doc_add_page.php Diff File
mod - proj_doc_edit_page.php Diff File
mod - proj_doc_page.php Diff File
mod - proj_doc_update.php Diff File
mod - scripts/travis_before_script.sh Diff File
mod - signup.php Diff File
mod - tests/bootstrap.php.sample Diff File
mod - tests/soap/AllTests.php Diff File
mod - tests/soap/ProjectTest.php Diff File
mod - tests/soap/SoapBase.php Diff File
mod - verify.php Diff File
mod - view_filters_page.php Diff File