MantisBT: master b5bf07b7

Diff Back to Repository
Author Committer Branch Timestamp Parent
dregad dregad master 2016-11-12 07:38 master 24e66c50
Changeset

Merge origin/master-1.3.x into master (using imerge)

There were quite a few merge conflicts here, hopefully I didn't mess
anything up...

Conflicts

  • view_all_inc.php
  • lang/strings_occitan.txt
  • lang/strings_slovene.txt
  • core/obsolete.php
  • config_defaults_inc.php
  • core/email_api.php
  • docbook/Admin_Guide/en-US/config/email.xml
  • core/classes/TimelineEvent.class.php
mod - admin/email_queue.php Diff File
mod - api/soap/mc_issue_api.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/classes/Avatar.class.php Diff File
mod - core/classes/TimelineEvent.class.php Diff File
mod - core/columns_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/obsolete.php Diff File
mod - csv_export.php Diff File
mod - docbook/Admin_Guide/en-US/config/email.xml Diff File
mod - docbook/Admin_Guide/en-US/config/status.xml Diff File
mod - excel_xml_export.php Diff File
mod - lang/strings_arabic.txt Diff File
mod - lang/strings_asturian.txt Diff File
mod - lang/strings_breton.txt Diff File
mod - lang/strings_bulgarian.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_german.txt Diff File
mod - lang/strings_hungarian.txt Diff File
mod - lang/strings_italian.txt Diff File
mod - lang/strings_japanese.txt Diff File
mod - lang/strings_korean.txt Diff File
mod - lang/strings_latvian.txt Diff File
mod - lang/strings_lithuanian.txt Diff File
mod - lang/strings_norwegian_bokmal.txt Diff File
mod - lang/strings_occitan.txt Diff File
mod - lang/strings_portuguese_standard.txt Diff File
mod - lang/strings_qqq.txt Diff File
mod - lang/strings_russian.txt Diff File
mod - lang/strings_serbian.txt Diff File
mod - lang/strings_serbian_latin.txt Diff File
mod - lang/strings_slovene.txt Diff File
mod - lang/strings_swedish.txt Diff File
mod - lang/strings_turkish.txt Diff File
mod - plugins/Gravatar/Gravatar.php Diff File
add - plugins/MantisCoreFormatting/lang/strings_bn.txt Diff File
add - plugins/MantisCoreFormatting/lang/strings_bs.txt Diff File
add - plugins/MantisCoreFormatting/lang/strings_diq.txt Diff File
add - plugins/MantisCoreFormatting/lang/strings_dsb.txt Diff File
add - plugins/MantisCoreFormatting/lang/strings_hsb.txt Diff File
add - plugins/MantisCoreFormatting/lang/strings_id.txt Diff File
add - plugins/MantisCoreFormatting/lang/strings_lb.txt Diff File
add - plugins/MantisCoreFormatting/lang/strings_ms.txt Diff File
add - plugins/MantisCoreFormatting/lang/strings_pms.txt Diff File
add - plugins/MantisCoreFormatting/lang/strings_shi.txt Diff File
add - plugins/MantisCoreFormatting/lang/strings_zh-cn.txt Diff File
add - plugins/MantisCoreFormatting/lang/strings_zh-hk.txt Diff File
mod - plugins/MantisGraph/lang/strings_arabic.txt Diff File
mod - plugins/MantisGraph/lang/strings_asturian.txt Diff File
mod - plugins/MantisGraph/lang/strings_breton.txt Diff File
mod - plugins/MantisGraph/lang/strings_bulgarian.txt Diff File
mod - plugins/MantisGraph/lang/strings_chinese_simplified.txt Diff File
mod - plugins/MantisGraph/lang/strings_chinese_traditional.txt Diff File
add - plugins/MantisGraph/lang/strings_diq.txt Diff File
mod - plugins/MantisGraph/lang/strings_french.txt Diff File
mod - plugins/MantisGraph/lang/strings_galician.txt Diff File
mod - plugins/MantisGraph/lang/strings_german.txt Diff File
mod - plugins/MantisGraph/lang/strings_hungarian.txt Diff File
mod - plugins/MantisGraph/lang/strings_italian.txt Diff File
mod - plugins/MantisGraph/lang/strings_japanese.txt Diff File
mod - plugins/MantisGraph/lang/strings_korean.txt Diff File
add - plugins/MantisGraph/lang/strings_lb.txt Diff File
mod - plugins/MantisGraph/lang/strings_macedonian.txt Diff File
add - plugins/MantisGraph/lang/strings_pms.txt Diff File
mod - plugins/MantisGraph/lang/strings_qqq.txt Diff File
mod - plugins/MantisGraph/lang/strings_russian.txt Diff File
mod - plugins/MantisGraph/lang/strings_spanish.txt Diff File
mod - plugins/MantisGraph/lang/strings_swedish.txt Diff File
add - plugins/MantisGraph/lang/strings_zh-cn.txt Diff File
add - plugins/XmlImportExport/lang/strings_diq.txt Diff File
add - plugins/XmlImportExport/lang/strings_id.txt Diff File
mod - plugins/XmlImportExport/lang/strings_japanese.txt Diff File
add - plugins/XmlImportExport/lang/strings_lb.txt Diff File
add - plugins/XmlImportExport/lang/strings_pms.txt Diff File
add - plugins/XmlImportExport/lang/strings_zh-cn.txt Diff File
mod - print_all_bug_page.php Diff File
mod - print_all_bug_page_word.php Diff File
mod - view_all_bug_page.php Diff File
mod - view_all_inc.php Diff File