From: GitHub <no...@gi...> - 2016-06-14 10:06:14
|
Branch: refs/heads/master Home: https://github.com/mantisbt/mantisbt Commit: 4ff4f5306cb268f0db8b6f42ce663906d8ece252 https://github.com/mantisbt/mantisbt/commit/4ff4f5306cb268f0db8b6f42ce663906d8ece252 Author: Damien Regad <dr...@ma...> Date: 2016-06-14 (Tue, 14 Jun 2016) Changed paths: M library/adodb M library/disposable A library/ezc/Base A library/ezc/Graph M library/phpmailer M library/securimage Log Message: ----------- Fixing broken submodules following ModernUI merge Commit: 588e824b05bb316505c2838c1e85d560e36fb8d2 https://github.com/mantisbt/mantisbt/commit/588e824b05bb316505c2838c1e85d560e36fb8d2 Author: Damien Regad <dr...@ma...> Date: 2016-06-14 (Tue, 14 Jun 2016) Changed paths: M account_delete.php M account_manage_columns_page.php M account_page.php M account_prefs_inc.php M account_prefs_page.php M account_prefs_update.php M account_prof_edit_page.php M account_prof_menu_page.php M account_sponsor_page.php M account_sponsor_update.php M account_update.php M adm_config_report.php M adm_permissions_report.php M admin/check/check_api.php M admin/check/check_attachments_inc.php M admin/check/index.php M admin/db_stats.php M admin/email_queue.php M admin/index.php M admin/install.php M admin/move_attachments.php M admin/move_attachments_page.php M admin/system_utils.php M admin/test_langs.php M api_token_create.php M api_token_revoke.php M api_tokens_page.php M billing_inc.php M billing_page.php M bug_actiongroup.php M bug_actiongroup_add_note_inc.php M bug_actiongroup_attach_tags_inc.php M bug_actiongroup_ext.php M bug_actiongroup_ext_page.php M bug_actiongroup_page.php M bug_actiongroup_update_product_build_inc.php M bug_actiongroup_update_severity_inc.php M bug_change_status_page.php M bug_file_add.php M bug_file_upload_inc.php M bug_monitor_list_view_inc.php M bug_relationship_graph.php M bug_reminder.php M bug_reminder_page.php M bug_report.php M bug_report_page.php M bug_revision_view_page.php M bug_sponsorship_list_view_inc.php M bug_update_page.php M bug_view_inc.php M bugnote_add_inc.php M bugnote_edit_page.php M bugnote_stats_inc.php M bugnote_view_inc.php M changelog_page.php M config_defaults_inc.php M core/access_api.php M core/authentication_api.php M core/bug_group_action_api.php M core/cfdefs/cfdef_standard.php M core/classes/IssueAssignedTimelineEvent.class.php M core/classes/IssueCreatedTimelineEvent.class.php M core/classes/IssueMonitorTimelineEvent.class.php M core/classes/IssueNoteCreatedTimelineEvent.class.php M core/classes/IssueStatusChangeTimelineEvent.class.php M core/classes/TimelineEvent.class.php M core/collapse_api.php M core/columns_api.php M core/constant_inc.php M core/custom_function_api.php M core/date_api.php M core/error_api.php M core/file_api.php M core/filter_api.php M core/helper_api.php M core/html_api.php M core/http_api.php M core/icon_api.php A core/layout_api.php M core/obsolete.php M core/print_api.php M core/relationship_api.php M core/summary_api.php M core/tag_api.php M core/timeline_api.php M core/timeline_inc.php M core/utility_api.php A css/ace-fonts.css A css/ace-ie.min.css A css/ace-mantis.css A css/ace-part2.min.css A css/ace-rtl.min.css A css/ace-skins.min.css A css/ace.min.css R css/admin.css A css/bootstrap-3.3.5.min.css M css/default.css A css/dropzone.css A css/font-awesome-4.4.0.min.css A css/images/pattern.jpg M css/jquery-ui-1.11.4.min.css M css/rtl.css A doc/INSTALL A doc/modern_my_view.png A doc/modern_view_issue.png A doc/modern_view_issues.png M docbook/Admin_Guide/en-US/config/display.xml M docbook/Admin_Guide/en-US/config/uploads.xml M docbook/Developers_Guide/en-US/Plugins_Building.xml M docbook/Developers_Guide/en-US/Plugins_Building_Source.xml A docbook/administration_guide/en/Makefile A docbook/administration_guide/en/user_management.sgml A docbook/developers/en/developers.sgml A docbook/developers/en/plugins-building-source.sgml A docbook/template/template.sgml A fileupload_inc.php A fonts/.htaccess A fonts/DXI1ORHCpsQm3Vp6mXoaTXhCUOGz7vYGh680lGh-uXM.woff A fonts/FontAwesome.otf A fonts/cJZKeOuBrn4kERxqtaUH3T8E0i7KZn-EPnyo3HZu7kw.woff A fonts/fontawesome-webfont.eot A fonts/fontawesome-webfont.svg A fonts/fontawesome-webfont.ttf A fonts/fontawesome-webfont.woff A fonts/fontawesome-webfont.woff2 A fonts/glyphicons-halflings-regular.eot A fonts/glyphicons-halflings-regular.svg A fonts/glyphicons-halflings-regular.ttf A fonts/glyphicons-halflings-regular.woff A fonts/glyphicons-halflings-regular.woff2 M history_inc.php R images/attachment.png R images/blank.gif R images/calendar-img.gif R images/clock.png R images/delete.png R images/dollars.gif R images/down.gif R images/fileicons/chm.gif R images/fileicons/cpp.gif R images/fileicons/css.gif R images/fileicons/csv.gif R images/fileicons/doc.gif R images/fileicons/eml.gif R images/fileicons/generic.gif R images/fileicons/gif.gif R images/fileicons/html.gif R images/fileicons/jpg.gif R images/fileicons/mhtml.gif R images/fileicons/mid.gif R images/fileicons/mov.gif R images/fileicons/one.gif R images/fileicons/pcx.gif R images/fileicons/pdf.gif R images/fileicons/png.gif R images/fileicons/pot.gif R images/fileicons/pps.gif R images/fileicons/ppt.gif R images/fileicons/pub.gif R images/fileicons/reg.gif R images/fileicons/text.gif R images/fileicons/unknown.gif R images/fileicons/vsd.gif R images/fileicons/vsl.gif R images/fileicons/vst.gif R images/fileicons/wav.gif R images/fileicons/wbk.gif R images/fileicons/wri.gif R images/fileicons/xls.gif R images/fileicons/xlt.gif R images/fileicons/xml.gif R images/fileicons/zip.gif R images/ie.gif R images/mantis_space.gif R images/minus.png R images/notice.gif R images/ok.gif R images/overdue.png R images/plus.png R images/priority_1.gif R images/priority_2.gif R images/priority_3.gif R images/priority_low_1.gif R images/priority_low_2.gif R images/priority_low_3.gif R images/priority_normal.gif R images/protected.gif R images/rss.png R images/synthese.gif R images/synthgraph.gif R images/unread.gif R images/up.gif R images/update.png A js/ace-elements.min.js A js/ace-extra.min.js A js/ace.min.js A js/bootstrap-3.3.5.min.js M js/bugFilter.js M js/common.js A js/dropzone.min.js A js/html5shiv.min.js A js/jquery-2.1.4.min.js M js/jquery-ui-1.11.4.min.js M js/manage_custom_field_edit_page.js A js/respond.min.js M lang/strings_english.txt M login_page.php M login_select_proj_page.php M lost_pwd.php M lost_pwd_page.php M main_page.php M manage_columns_inc.php M manage_config_columns_page.php M manage_config_columns_reset.php M manage_config_columns_set.php M manage_config_email_page.php M manage_config_email_set.php M manage_config_revert.php M manage_config_work_threshold_page.php M manage_config_work_threshold_set.php M manage_config_workflow_graph_page.php M manage_config_workflow_page.php M manage_config_workflow_set.php M manage_custom_field_create.php M manage_custom_field_delete.php M manage_custom_field_edit_page.php M manage_custom_field_page.php M manage_custom_field_update.php M manage_overview_page.php M manage_plugin_page.php M manage_proj_cat_delete.php M manage_proj_cat_edit_page.php M manage_proj_cat_update.php M manage_proj_create.php M manage_proj_create_page.php M manage_proj_custom_field_add_existing.php M manage_proj_custom_field_remove.php M manage_proj_custom_field_update.php M manage_proj_edit_page.php M manage_proj_page.php M manage_proj_subproj_add.php M manage_proj_subproj_delete.php M manage_proj_user_remove.php M manage_proj_ver_add.php M manage_proj_ver_delete.php M manage_proj_ver_edit_page.php M manage_proj_ver_update.php M manage_tags_page.php M manage_user_create.php M manage_user_create_page.php M manage_user_delete.php M manage_user_edit_page.php M manage_user_impersonate.php M manage_user_page.php M manage_user_proj_delete.php M manage_user_reset.php M manage_user_update.php M my_view_inc.php M my_view_page.php M news_add.php M news_edit_page.php M news_list_page.php M news_menu_page.php M news_update.php M news_view_page.php M permalink_page.php M plugins/MantisCoreFormatting/pages/config.php M plugins/MantisGraph/MantisGraph.php M plugins/MantisGraph/core/Period.php M plugins/MantisGraph/pages/bug_graph_bycategory.php M plugins/MantisGraph/pages/bug_graph_bystatus.php M plugins/MantisGraph/pages/bug_graph_page.php M plugins/MantisGraph/pages/config.php M plugins/MantisGraph/pages/summary_graph_imp_category.php M plugins/MantisGraph/pages/summary_graph_imp_priority.php M plugins/MantisGraph/pages/summary_graph_imp_resolution.php M plugins/MantisGraph/pages/summary_graph_imp_severity.php M plugins/MantisGraph/pages/summary_graph_imp_status.php M plugins/MantisGraph/pages/summary_jpgraph_page.php M plugins/XmlImportExport/XmlImportExport.php M plugins/XmlImportExport/pages/config.php M plugins/XmlImportExport/pages/config_page.php M plugins/XmlImportExport/pages/import.php M plugins/XmlImportExport/pages/import_action.php M print_all_bug_options_inc.php M print_all_bug_options_page.php M print_all_bug_options_reset.php M print_all_bug_options_update.php M print_all_bug_page.php M print_all_bug_page_word.php M print_bug_page.php M print_bugnote_inc.php M proj_doc_add.php M proj_doc_add_page.php M proj_doc_delete.php M proj_doc_edit_page.php M proj_doc_page.php M proj_doc_update.php M project_page.php M query_delete.php M query_delete_page.php M query_store_page.php M query_view_page.php M readme.md M roadmap_page.php M set_project.php M signup.php M signup_page.php M summary_page.php M tag_attach.php M tag_update_page.php M tag_view_page.php M view_all_bug_page.php M view_all_inc.php M view_filters_page.php M view_user_page.php Log Message: ----------- Merge Modern UI This extra merge commit fixes the git history as explained in https://github.com/mantisbt/mantisbt/commit/6e62db393b6e3740cec38608551f07259bb40748#commitcomment-17857012 Compare: https://github.com/mantisbt/mantisbt/compare/6e62db393b6e...588e824b05bb |