MantisBT: master 5be74327

Diff Back to Repository
Author Committer Branch Timestamp Parent
Rafik Robeal Rafik Robeal master 2014-07-23 21:45 master a188b042
Changeset

Merge branch 'master' of https://bitbucket.org/vboctor/mantishub into modern-ui-2

Conflicts:
account_page.php
account_sponsor_page.php
adm_config_report.php
admin/check/check_api.php
admin/db_stats.php
admin/install.php
admin/move_attachments_page.php
admin/test_icons.php
admin/test_langs.php
admin/upgrade_warning.php
billing_inc.php
bug_actiongroup.php
bug_actiongroup_page.php
bug_change_status_page.php
bug_monitor_list_view_inc.php
bug_report.php
bug_report_page.php
bug_revision_view_page.php
bug_update_page.php
bug_view_inc.php
bugnote_edit_page.php
bugnote_view_inc.php
changelog_page.php
core/authentication_api.php
core/classes/TimelineEvent.class.php
core/columns_api.php
core/date_api.php
core/error_api.php
core/filter_api.php
core/helper_api.php
core/html_api.php
core/http_api.php
core/icon_api.php
core/print_api.php
core/relationship_api.php
core/tag_api.php
login_page.php
login_select_proj_page.php
main_page.php
manage_config_email_page.php
manage_config_work_threshold_page.php
manage_config_work_threshold_set.php
manage_config_workflow_page.php
manage_config_workflow_set.php
manage_custom_field_edit_page.php
manage_overview_page.php
manage_plugin_page.php
manage_proj_cat_delete.php
manage_proj_edit_page.php
manage_proj_page.php
manage_proj_ver_edit_page.php
manage_tags_page.php
manage_user_create_page.php
manage_user_page.php
manage_user_update.php
my_view_inc.php
my_view_page.php
news_edit_page.php
news_list_page.php
news_update.php
permalink_page.php
plugins/MantisGraph/pages/config.php
plugins/MantisGraph/pages/summary_jpgraph_page.php
plugins/XmlImportExport/pages/import.php
print_all_bug_page.php
print_all_bug_page_word.php
print_bug_page.php
print_bugnote_inc.php
proj_doc_page.php
proj_doc_update.php
project_page.php
query_delete.php
query_store_page.php
query_view_page.php
roadmap_page.php
signup.php
signup_page.php
tag_attach.php
tag_update_page.php
tag_view_page.php
view_all_inc.php
view_filters_page.php
view_user_page.php
mod - account_page.php Diff File
mod - account_prof_update.php Diff File
mod - account_sponsor_page.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_config_inc.php Diff File
mod - admin/check/check_database_inc.php Diff File
mod - admin/check/check_integrity_inc.php Diff File
mod - admin/check/check_paths_inc.php Diff File
mod - admin/db_stats.php Diff File
mod - admin/email_queue.php Diff File
mod - admin/install.php Diff File
mod - admin/move_attachments.php Diff File
mod - admin/move_attachments_page.php Diff File
mod - admin/schema.php Diff File
mod - admin/test_icons.php Diff File
mod - admin/test_langs.php Diff File
mod - admin/upgrade_unattended.php Diff File
mod - admin/upgrade_warning.php Diff File
mod - api/soap/mantisconnect.php Diff File
mod - api/soap/mc_api.php Diff File
mod - api/soap/mc_config_api.php Diff File
mod - api/soap/mc_file_api.php Diff File
mod - api/soap/mc_issue_api.php Diff File
mod - api/soap/mc_project_api.php Diff File
mod - api/soap/mc_tag_api.php Diff File
mod - billing_inc.php Diff File
mod - bug_actiongroup.php Diff File
mod - bug_actiongroup_page.php Diff File
mod - bug_change_status_page.php Diff File
mod - bug_monitor_list_view_inc.php Diff File
mod - bug_relationship_add.php Diff File
mod - bug_relationship_graph.php Diff File
mod - bug_report.php Diff File
mod - bug_report_page.php Diff File
mod - bug_sponsorship_list_view_inc.php Diff File
mod - bug_update.php Diff File
mod - bug_update_page.php Diff File
mod - bug_view_inc.php Diff File
mod - bugnote_edit_page.php Diff File
mod - bugnote_stats_inc.php Diff File
mod - bugnote_view_inc.php Diff File
mod - changelog_page.php Diff File
mod - core.php Diff File
mod - core/access_api.php Diff File
mod - core/authentication_api.php Diff File
mod - core/bug_api.php Diff File
mod - core/bug_revision_api.php Diff File
mod - core/bugnote_api.php Diff File
mod - core/category_api.php Diff File
mod - core/cfdefs/cfdef_standard.php Diff File
mod - core/classes/MantisColumn.class.php Diff File
mod - core/classes/MantisEnum.class.php Diff File
mod - core/collapse_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/crypto_api.php Diff File
mod - core/custom_field_api.php Diff File
mod - core/database_api.php Diff File
mod - core/date_api.php Diff File
mod - core/email_api.php Diff File
mod - core/email_queue_api.php Diff File
mod - core/error_api.php Diff File
mod - core/event_api.php Diff File
mod - core/excel_api.php Diff File
mod - core/file_api.php Diff File
mod - core/filter_api.php Diff File
mod - core/gpc_api.php Diff File
mod - core/graphviz_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/http_api.php Diff File
mod - core/icon_api.php Diff File
mod - core/install_helper_functions_api.php Diff File
mod - core/json_api.php Diff File
mod - core/lang_api.php Diff File
mod - core/ldap_api.php Diff File
mod - core/logging_api.php Diff File
mod - core/news_api.php Diff File
mod - core/php_api.php Diff File
mod - core/plugin_api.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/project_hierarchy_api.php Diff File
mod - core/relationship_api.php Diff File
mod - core/relationship_graph_api.php Diff File
mod - core/rss_api.php Diff File
mod - core/session_api.php Diff File
mod - core/sponsorship_api.php Diff File
mod - core/string_api.php Diff File
mod - core/summary_api.php Diff File
mod - core/tag_api.php Diff File
mod - core/timeline_api.php Diff File
mod - core/tokens_api.php Diff File
mod - core/user_api.php Diff File
mod - core/user_pref_api.php Diff File
mod - core/utility_api.php Diff File
mod - core/version_api.php Diff File
mod - docbook/Admin_Guide/en-US/Customizing.xml Diff File
mod - docbook/Admin_Guide/en-US/Project_Management.xml Diff File
mod - docbook/Developers_Guide/en-US/Plugins_Building.xml Diff File
mod - docbook/Developers_Guide/en-US/Plugins_Building_Source.xml Diff File
mod - excel_xml_export.php Diff File
mod - file_download.php Diff File
mod - issues_rss.php Diff File
mod - lang/strings_english.txt Diff File
mod - library/README.libs Diff File
mod - library/adodb Diff File
mod - login_anon.php Diff File
mod - login_page.php Diff File
mod - login_select_proj_page.php Diff File
mod - main_page.php Diff File
mod - manage_config_email_page.php Diff File
mod - manage_config_work_threshold_page.php Diff File
mod - manage_config_work_threshold_set.php Diff File
mod - manage_config_workflow_page.php Diff File
mod - manage_config_workflow_set.php Diff File
mod - manage_custom_field_create.php Diff File
mod - manage_plugin_page.php Diff File
mod - manage_plugin_update.php Diff File
mod - manage_proj_cat_delete.php Diff File
mod - manage_proj_page.php Diff File
mod - manage_tags_page.php Diff File
mod - manage_user_page.php Diff File
mod - manage_user_prune.php Diff File
mod - manage_user_update.php Diff File
mod - my_view_inc.php Diff File
mod - my_view_page.php Diff File
mod - news_edit_page.php Diff File
mod - news_list_page.php Diff File
mod - news_rss.php Diff File
mod - news_update.php Diff File
mod - permalink_page.php Diff File
mod - plugins/MantisGraph/core/Period.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 - plugins/MantisGraph/pages/config.php Diff File
mod - plugins/MantisGraph/pages/config_edit.php Diff File