diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index 3275300..3e2f6be 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -105,6 +105,8 @@ class IssuesController < ApplicationController @journals.reject!(&:private_notes?) unless User.current.allowed_to?(:view_private_notes, @issue.project) @journals.reverse! if User.current.wants_comments_in_reverse_order? + @parent_issue = @issue.parent unless @issue.parent_issue_id.blank? + @changesets = @issue.changesets.visible.all @changesets.reverse! if User.current.wants_comments_in_reverse_order? diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb index 83b4f56..f213201 100644 --- a/app/views/issues/show.html.erb +++ b/app/views/issues/show.html.erb @@ -68,6 +68,18 @@ end %> <%= call_hook(:view_issues_show_details_bottom, :issue => @issue) %> +<% if Setting.parent_issue_description? && @parent_issue %> + <% if @parent_issue.description? || @parent_issue.attachments.any? %> +
+
+

<%=l(:field_parent_description)%>

+
+ <%= textilizable @parent_issue, :description, :attachments => @parent_issue.attachments %> +
+
+ <% end %> +<% end %> + <% if @issue.description? || @issue.attachments.any? -%>
<% if @issue.description? %> diff --git a/app/views/settings/_issues.html.erb b/app/views/settings/_issues.html.erb index 83b4acd..325bdbf 100644 --- a/app/views/settings/_issues.html.erb +++ b/app/views/settings/_issues.html.erb @@ -5,6 +5,8 @@

<%= setting_select :cross_project_subtasks, cross_project_subtasks_options %>

+

<%= setting_check_box :parent_issue_description %>

+

<%= setting_check_box :issue_group_assignment %>

<%= setting_check_box :default_issue_start_date_to_creation_date %>

diff --git a/config/locales/de.yml b/config/locales/de.yml index d1440e5..334c04f 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -297,6 +297,7 @@ de: field_cvsroot: CVSROOT field_default_value: Standardwert field_delay: Pufferzeit + field_parent_description: Beschreibung des übergeordneten Tickets field_description: Beschreibung field_done_ratio: "% erledigt" field_downloads: Downloads @@ -988,6 +989,7 @@ de: setting_new_project_user_role_id: Rolle, die einem Nicht-Administrator zugeordnet wird, der ein Projekt erstellt setting_non_working_week_days: Arbeitsfreie Tage setting_openid: Erlaube OpenID-Anmeldung und -Registrierung + setting_parent_issue_description: Anzeige der übergeordneten Beschreibung erlauben setting_password_min_length: Mindestlänge des Kennworts setting_per_page_options: Objekte pro Seite setting_plain_text_mail: Nur reinen Text (kein HTML) senden diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index 93a0401..a0268b9 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -214,163 +214,165 @@ en-GB: mail_body_wiki_content_updated: "The '%{id}' wiki page has been updated by %{author}." - field_name: Name - field_description: Description - field_summary: Summary - field_is_required: Required - field_firstname: First name - field_lastname: Last name - field_mail: Email - field_filename: File - field_filesize: Size - field_downloads: Downloads + field_account: Account + field_activity: Activity + field_admin: Administrator + field_assignable: Issues can be assigned to this role + field_assigned_to: Assignee + field_assigned_to_role: "Assignee's role" + field_attr_firstname: Firstname attribute + field_attr_lastname: Lastname attribute + field_attr_login: Login attribute + field_attr_mail: Email attribute + field_auth_source: Authentication mode field_author: Author - field_created_on: Created - field_updated_on: Updated - field_field_format: Format - field_is_for_all: For all projects - field_possible_values: Possible values - field_regexp: Regular expression - field_min_length: Minimum length - field_max_length: Maximum length - field_value: Value + field_base_dn: Base DN field_category: Category - field_title: Title - field_project: Project - field_issue: Issue - field_status: Status - field_notes: Notes - field_is_closed: Issue closed - field_is_default: Default value - field_tracker: Tracker - field_subject: Subject + field_column_names: Columns + field_comments: Comment + field_comments_sorting: Display comments + field_content: Content + field_created_on: Created + field_default_value: Default value + field_delay: Delay + field_description: Description + field_done_ratio: "% Done" + field_downloads: Downloads field_due_date: Due date - field_assigned_to: Assignee - field_priority: Priority + field_editable: Editable + field_effective_date: Date + field_estimated_hours: Estimated time + field_field_format: Format + field_filename: File + field_filesize: Size + field_firstname: First name field_fixed_version: Target version - field_user: User - field_principal: Principal - field_role: Role + field_group_by: Group results by + field_hide_mail: Hide my email address field_homepage: Homepage - field_is_public: Public - field_parent: Subproject of + field_host: Host + field_hours: Hours + field_identifier: Identifier + field_identity_url: OpenID URL + field_is_closed: Issue closed + field_is_default: Default value + field_is_filter: Used as a filter + field_is_for_all: For all projects field_is_in_roadmap: Issues displayed in roadmap + field_is_public: Public + field_is_required: Required + field_issue: Issue + field_issue_to: Related issue + field_language: Language + field_last_login_on: Last connection + field_lastname: Last name field_login: Login + field_mail: Email field_mail_notification: Email notifications - field_admin: Administrator - field_last_login_on: Last connection - field_language: Language - field_effective_date: Date - field_password: Password + field_max_length: Maximum length + field_member_of_group: "Assignee's group" + field_min_length: Minimum length + field_name: Name field_new_password: New password + field_notes: Notes + field_onthefly: On-the-fly user creation + field_parent: Subproject of + field_parent_description: Parent Description + field_parent_issue: Parent task + field_parent_title: Parent page + field_password: Password field_password_confirmation: Confirmation - field_version: Version - field_type: Type - field_host: Host field_port: Port - field_account: Account - field_base_dn: Base DN - field_attr_login: Login attribute - field_attr_firstname: Firstname attribute - field_attr_lastname: Lastname attribute - field_attr_mail: Email attribute - field_onthefly: On-the-fly user creation + field_possible_values: Possible values + field_principal: Principal + field_priority: Priority + field_project: Project + field_redirect_existing_links: Redirect existing links + field_regexp: Regular expression + field_role: Role + field_searchable: Searchable + field_sharing: Sharing + field_spent_on: Date field_start_date: Start date - field_done_ratio: "% Done" - field_auth_source: Authentication mode - field_hide_mail: Hide my email address - field_comments: Comment - field_url: URL field_start_page: Start page + field_status: Status + field_subject: Subject field_subproject: Subproject - field_hours: Hours - field_activity: Activity - field_spent_on: Date - field_identifier: Identifier - field_is_filter: Used as a filter - field_issue_to: Related issue - field_delay: Delay - field_assignable: Issues can be assigned to this role - field_redirect_existing_links: Redirect existing links - field_estimated_hours: Estimated time - field_column_names: Columns + field_summary: Summary + field_text: Text field field_time_entries: Log time field_time_zone: Time zone - field_searchable: Searchable - field_default_value: Default value - field_comments_sorting: Display comments - field_parent_title: Parent page - field_editable: Editable - field_watcher: Watcher - field_identity_url: OpenID URL - field_content: Content - field_group_by: Group results by - field_sharing: Sharing - field_parent_issue: Parent task - field_member_of_group: "Assignee's group" - field_assigned_to_role: "Assignee's role" - field_text: Text field + field_title: Title + field_tracker: Tracker + field_type: Type + field_updated_on: Updated + field_url: URL + field_user: User + field_value: Value + field_version: Version field_visible: Visible field_warn_on_leaving_unsaved: "Warn me when leaving a page with unsaved text" + field_watcher: Watcher - setting_app_title: Application title + setting_activity_days_default: Days displayed on project activity setting_app_subtitle: Application subtitle - setting_welcome_text: Welcome text - setting_default_language: Default language - setting_login_required: Authentication required - setting_self_registration: Self-registration + setting_app_title: Application title setting_attachment_max_size: Attachment max. size - setting_issues_export_limit: Issues export limit - setting_mail_from: Emission email address - setting_bcc_recipients: Blind carbon copy recipients (bcc) - setting_plain_text_mail: Plain text mail (no HTML) - setting_host_name: Host name and path - setting_text_formatting: Text formatting - setting_wiki_compression: Wiki history compression - setting_feeds_limit: Feed content limit - setting_default_projects_public: New projects are public by default setting_autofetch_changesets: Autofetch commits - setting_sys_api_enabled: Enable WS for repository management - setting_commit_ref_keywords: Referencing keywords - setting_commit_fix_keywords: Fixing keywords setting_autologin: Autologin - setting_date_format: Date format - setting_time_format: Time format + setting_bcc_recipients: Blind carbon copy recipients (bcc) + setting_cache_formatted_text: Cache formatted text + setting_commit_fix_keywords: Fixing keywords + setting_commit_logtime_activity_id: Activity for logged time + setting_commit_logtime_enabled: Enable time logging + setting_commit_ref_keywords: Referencing keywords setting_cross_project_issue_relations: Allow cross-project issue relations - setting_issue_list_default_columns: Default columns displayed on the issue list - setting_emails_header: Email header - setting_emails_footer: Email footer - setting_protocol: Protocol - setting_per_page_options: Objects per page options - setting_user_format: Users display format - setting_activity_days_default: Days displayed on project activity + setting_date_format: Date format + setting_default_issue_start_date_to_creation_date: Use current date as start date for new issues + setting_default_language: Default language + setting_default_notification_option: Default notification option + setting_default_projects_modules: Default enabled modules for new projects + setting_default_projects_public: New projects are public by default + setting_diff_max_lines_displayed: Max number of diff lines displayed setting_display_subprojects_issues: Display subprojects issues on main projects by default + setting_emails_footer: Email footer + setting_emails_header: Email header setting_enabled_scm: Enabled SCM - setting_mail_handler_body_delimiters: "Truncate emails after one of these lines" - setting_mail_handler_api_enabled: Enable WS for incoming emails - setting_mail_handler_api_key: API key - setting_sequential_project_identifiers: Generate sequential project identifiers - setting_gravatar_enabled: Use Gravatar user icons - setting_gravatar_default: Default Gravatar image - setting_diff_max_lines_displayed: Max number of diff lines displayed + setting_feeds_limit: Feed content limit setting_file_max_size_displayed: Max size of text files displayed inline - setting_repository_log_display_limit: Maximum number of revisions displayed on file log - setting_openid: Allow OpenID login and registration - setting_password_min_length: Minimum password length - setting_new_project_user_role_id: Role given to a non-admin user who creates a project - setting_default_projects_modules: Default enabled modules for new projects + setting_gantt_items_limit: Maximum number of items displayed on the gantt chart + setting_gravatar_default: Default Gravatar image + setting_gravatar_enabled: Use Gravatar user icons + setting_host_name: Host name and path setting_issue_done_ratio: Calculate the issue done ratio with setting_issue_done_ratio_issue_field: Use the issue field setting_issue_done_ratio_issue_status: Use the issue status - setting_start_of_week: Start calendars on - setting_rest_api_enabled: Enable REST web service - setting_cache_formatted_text: Cache formatted text - setting_default_notification_option: Default notification option - setting_commit_logtime_enabled: Enable time logging - setting_commit_logtime_activity_id: Activity for logged time - setting_gantt_items_limit: Maximum number of items displayed on the gantt chart setting_issue_group_assignment: Allow issue assignment to groups - setting_default_issue_start_date_to_creation_date: Use current date as start date for new issues + setting_issue_list_default_columns: Default columns displayed on the issue list + setting_issues_export_limit: Issues export limit + setting_login_required: Authentication required + setting_mail_from: Emission email address + setting_mail_handler_api_enabled: Enable WS for incoming emails + setting_mail_handler_api_key: API key + setting_mail_handler_body_delimiters: "Truncate emails after one of these lines" + setting_new_project_user_role_id: Role given to a non-admin user who creates a project + setting_openid: Allow OpenID login and registration + setting_parent_issue_description: Allow display of parent issue description + setting_password_min_length: Minimum password length + setting_per_page_options: Objects per page options + setting_plain_text_mail: Plain text mail (no HTML) + setting_protocol: Protocol + setting_repository_log_display_limit: Maximum number of revisions displayed on file log + setting_rest_api_enabled: Enable REST web service + setting_self_registration: Self-registration + setting_sequential_project_identifiers: Generate sequential project identifiers + setting_start_of_week: Start calendars on + setting_sys_api_enabled: Enable WS for repository management + setting_text_formatting: Text formatting + setting_time_format: Time format + setting_user_format: Users display format + setting_welcome_text: Welcome text + setting_wiki_compression: Wiki history compression permission_add_project: Create project permission_add_subprojects: Create subprojects diff --git a/config/locales/en.yml b/config/locales/en.yml index 2719c10..5340bd5 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -216,192 +216,194 @@ en: mail_subject_wiki_content_updated: "'%{id}' wiki page has been updated" mail_body_wiki_content_updated: "The '%{id}' wiki page has been updated by %{author}." - field_name: Name - field_description: Description - field_summary: Summary - field_is_required: Required - field_firstname: First name - field_lastname: Last name - field_mail: Email - field_filename: File - field_filesize: Size - field_downloads: Downloads + field_account: Account + field_activity: Activity + field_admin: Administrator + field_assignable: Issues can be assigned to this role + field_assigned_to: Assignee + field_assigned_to_role: "Assignee's role" + field_attr_firstname: Firstname attribute + field_attr_lastname: Lastname attribute + field_attr_login: Login attribute + field_attr_mail: Email attribute + field_auth_source: Authentication mode + field_auth_source_ldap_filter: LDAP filter field_author: Author - field_created_on: Created - field_updated_on: Updated - field_closed_on: Closed - field_field_format: Format - field_is_for_all: For all projects - field_possible_values: Possible values - field_regexp: Regular expression - field_min_length: Minimum length - field_max_length: Maximum length - field_value: Value + field_base_dn: Base DN + field_board_parent: Parent forum field_category: Category - field_title: Title - field_project: Project - field_issue: Issue - field_status: Status - field_notes: Notes - field_is_closed: Issue closed - field_is_default: Default value - field_tracker: Tracker - field_subject: Subject + field_closed_on: Closed + field_column_names: Columns + field_comments: Comment + field_comments_sorting: Display comments + field_commit_logs_encoding: Commit messages encoding + field_content: Content + field_core_fields: Standard fields + field_created_on: Created + field_cvs_module: Module + field_cvsroot: CVSROOT + field_default_value: Default value + field_delay: Delay + field_description: Description + field_done_ratio: "% Done" + field_downloads: Downloads field_due_date: Due date - field_assigned_to: Assignee - field_priority: Priority + field_editable: Editable + field_effective_date: Date + field_estimated_hours: Estimated time + field_field_format: Format + field_filename: File + field_filesize: Size + field_firstname: First name field_fixed_version: Target version - field_user: User - field_principal: Principal - field_role: Role + field_generate_password: Generate password + field_group_by: Group results by + field_hide_mail: Hide my email address field_homepage: Homepage - field_is_public: Public - field_parent: Subproject of + field_host: Host + field_hours: Hours + field_identifier: Identifier + field_identity_url: OpenID URL + field_inherit_members: Inherit members + field_is_closed: Issue closed + field_is_default: Default value + field_is_filter: Used as a filter + field_is_for_all: For all projects field_is_in_roadmap: Issues displayed in roadmap + field_is_private: Private + field_is_public: Public + field_is_required: Required + field_issue: Issue + field_issue_to: Related issue + field_issues_visibility: Issues visibility + field_language: Language + field_last_login_on: Last connection + field_lastname: Last name field_login: Login + field_mail: Email field_mail_notification: Email notifications - field_admin: Administrator - field_last_login_on: Last connection - field_language: Language - field_effective_date: Date - field_password: Password + field_max_length: Maximum length + field_member_of_group: "Assignee's group" + field_min_length: Minimum length + field_multiple: Multiple values + field_name: Name field_new_password: New password + field_notes: Notes + field_onthefly: On-the-fly user creation + field_parent: Subproject of + field_parent_description: Parent Description + field_parent_issue: Parent task + field_parent_title: Parent page + field_password: Password field_password_confirmation: Confirmation - field_version: Version - field_type: Type - field_host: Host + field_path_to_repository: Path to repository field_port: Port - field_account: Account - field_base_dn: Base DN - field_attr_login: Login attribute - field_attr_firstname: Firstname attribute - field_attr_lastname: Lastname attribute - field_attr_mail: Email attribute - field_onthefly: On-the-fly user creation + field_possible_values: Possible values + field_principal: Principal + field_priority: Priority + field_private_notes: Private notes + field_project: Project + field_redirect_existing_links: Redirect existing links + field_regexp: Regular expression + field_repository_is_default: Main repository + field_role: Role + field_root_directory: Root directory + field_scm_path_encoding: Path encoding + field_searchable: Searchable + field_sharing: Sharing + field_spent_on: Date field_start_date: Start date - field_done_ratio: "% Done" - field_auth_source: Authentication mode - field_hide_mail: Hide my email address - field_comments: Comment - field_url: URL field_start_page: Start page + field_status: Status + field_subject: Subject field_subproject: Subproject - field_hours: Hours - field_activity: Activity - field_spent_on: Date - field_identifier: Identifier - field_is_filter: Used as a filter - field_issue_to: Related issue - field_delay: Delay - field_assignable: Issues can be assigned to this role - field_redirect_existing_links: Redirect existing links - field_estimated_hours: Estimated time - field_column_names: Columns + field_summary: Summary + field_text: Text field field_time_entries: Log time field_time_zone: Time zone - field_searchable: Searchable - field_default_value: Default value - field_comments_sorting: Display comments - field_parent_title: Parent page - field_editable: Editable - field_watcher: Watcher - field_identity_url: OpenID URL - field_content: Content - field_group_by: Group results by - field_sharing: Sharing - field_parent_issue: Parent task - field_member_of_group: "Assignee's group" - field_assigned_to_role: "Assignee's role" - field_text: Text field + field_timeout: "Timeout (in seconds)" + field_title: Title + field_tracker: Tracker + field_type: Type + field_updated_on: Updated + field_url: URL + field_user: User + field_value: Value + field_version: Version field_visible: Visible field_warn_on_leaving_unsaved: "Warn me when leaving a page with unsaved text" - field_issues_visibility: Issues visibility - field_is_private: Private - field_commit_logs_encoding: Commit messages encoding - field_scm_path_encoding: Path encoding - field_path_to_repository: Path to repository - field_root_directory: Root directory - field_cvsroot: CVSROOT - field_cvs_module: Module - field_repository_is_default: Main repository - field_multiple: Multiple values - field_auth_source_ldap_filter: LDAP filter - field_core_fields: Standard fields - field_timeout: "Timeout (in seconds)" - field_board_parent: Parent forum - field_private_notes: Private notes - field_inherit_members: Inherit members - field_generate_password: Generate password + field_watcher: Watcher - setting_app_title: Application title + setting_activity_days_default: Days displayed on project activity setting_app_subtitle: Application subtitle - setting_welcome_text: Welcome text - setting_default_language: Default language - setting_login_required: Authentication required - setting_self_registration: Self-registration + setting_app_title: Application title setting_attachment_max_size: Maximum attachment size - setting_issues_export_limit: Issues export limit - setting_mail_from: Emission email address - setting_bcc_recipients: Blind carbon copy recipients (bcc) - setting_plain_text_mail: Plain text mail (no HTML) - setting_host_name: Host name and path - setting_text_formatting: Text formatting - setting_wiki_compression: Wiki history compression - setting_feeds_limit: Maximum number of items in Atom feeds - setting_default_projects_public: New projects are public by default setting_autofetch_changesets: Fetch commits automatically - setting_sys_api_enabled: Enable WS for repository management - setting_commit_ref_keywords: Referencing keywords - setting_commit_fix_keywords: Fixing keywords setting_autologin: Autologin - setting_date_format: Date format - setting_time_format: Time format + setting_bcc_recipients: Blind carbon copy recipients (bcc) + setting_cache_formatted_text: Cache formatted text + setting_commit_cross_project_ref: Allow issues of all the other projects to be referenced and fixed + setting_commit_fix_keywords: Fixing keywords + setting_commit_logtime_activity_id: Activity for logged time + setting_commit_logtime_enabled: Enable time logging + setting_commit_ref_keywords: Referencing keywords setting_cross_project_issue_relations: Allow cross-project issue relations setting_cross_project_subtasks: Allow cross-project subtasks - setting_issue_list_default_columns: Default columns displayed on the issue list - setting_repositories_encodings: Attachments and repositories encodings - setting_emails_header: Email header - setting_emails_footer: Email footer - setting_protocol: Protocol - setting_per_page_options: Objects per page options - setting_user_format: Users display format - setting_activity_days_default: Days displayed on project activity + setting_date_format: Date format + setting_default_issue_start_date_to_creation_date: Use current date as start date for new issues + setting_default_language: Default language + setting_default_notification_option: Default notification option + setting_default_projects_modules: Default enabled modules for new projects + setting_default_projects_public: New projects are public by default + setting_default_projects_tracker_ids: Default trackers for new projects + setting_diff_max_lines_displayed: Maximum number of diff lines displayed setting_display_subprojects_issues: Display subprojects issues on main projects by default + setting_emails_footer: Email footer + setting_emails_header: Email header setting_enabled_scm: Enabled SCM - setting_mail_handler_body_delimiters: "Truncate emails after one of these lines" - setting_mail_handler_api_enabled: Enable WS for incoming emails - setting_mail_handler_api_key: API key - setting_sequential_project_identifiers: Generate sequential project identifiers - setting_gravatar_enabled: Use Gravatar user icons - setting_gravatar_default: Default Gravatar image - setting_diff_max_lines_displayed: Maximum number of diff lines displayed + setting_feeds_limit: Maximum number of items in Atom feeds setting_file_max_size_displayed: Maximum size of text files displayed inline - setting_repository_log_display_limit: Maximum number of revisions displayed on file log - setting_openid: Allow OpenID login and registration - setting_password_min_length: Minimum password length - setting_new_project_user_role_id: Role given to a non-admin user who creates a project - setting_default_projects_modules: Default enabled modules for new projects + setting_gantt_items_limit: Maximum number of items displayed on the gantt chart + setting_gravatar_default: Default Gravatar image + setting_gravatar_enabled: Use Gravatar user icons + setting_host_name: Host name and path setting_issue_done_ratio: Calculate the issue done ratio with setting_issue_done_ratio_issue_field: Use the issue field setting_issue_done_ratio_issue_status: Use the issue status - setting_start_of_week: Start calendars on - setting_rest_api_enabled: Enable REST web service - setting_cache_formatted_text: Cache formatted text - setting_default_notification_option: Default notification option - setting_commit_logtime_enabled: Enable time logging - setting_commit_logtime_activity_id: Activity for logged time - setting_gantt_items_limit: Maximum number of items displayed on the gantt chart setting_issue_group_assignment: Allow issue assignment to groups - setting_default_issue_start_date_to_creation_date: Use current date as start date for new issues - setting_commit_cross_project_ref: Allow issues of all the other projects to be referenced and fixed - setting_unsubscribe: Allow users to delete their own account + setting_issue_list_default_columns: Default columns displayed on the issue list + setting_issues_export_limit: Issues export limit + setting_jsonp_enabled: Enable JSONP support + setting_login_required: Authentication required + setting_mail_from: Emission email address + setting_mail_handler_api_enabled: Enable WS for incoming emails + setting_mail_handler_api_key: API key + setting_mail_handler_body_delimiters: "Truncate emails after one of these lines" + setting_new_project_user_role_id: Role given to a non-admin user who creates a project + setting_non_working_week_days: Non-working days + setting_openid: Allow OpenID login and registration + setting_parent_issue_description: Allow display of parent issue description + setting_password_min_length: Minimum password length + setting_per_page_options: Objects per page options + setting_plain_text_mail: Plain text mail (no HTML) + setting_protocol: Protocol + setting_repositories_encodings: Attachments and repositories encodings + setting_repository_log_display_limit: Maximum number of revisions displayed on file log + setting_rest_api_enabled: Enable REST web service + setting_self_registration: Self-registration + setting_sequential_project_identifiers: Generate sequential project identifiers setting_session_lifetime: Session maximum lifetime setting_session_timeout: Session inactivity timeout + setting_start_of_week: Start calendars on + setting_sys_api_enabled: Enable WS for repository management + setting_text_formatting: Text formatting setting_thumbnails_enabled: Display attachment thumbnails setting_thumbnails_size: Thumbnails size (in pixels) - setting_non_working_week_days: Non-working days - setting_jsonp_enabled: Enable JSONP support - setting_default_projects_tracker_ids: Default trackers for new projects + setting_time_format: Time format + setting_unsubscribe: Allow users to delete their own account + setting_user_format: Users display format + setting_welcome_text: Welcome text + setting_wiki_compression: Wiki history compression permission_add_project: Create project permission_add_subprojects: Create subprojects diff --git a/config/settings.yml b/config/settings.yml index 0c9f270..28dda8b 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -136,6 +136,8 @@ cross_project_issue_relations: # Enables subtasks to be in other projects cross_project_subtasks: default: 'tree' +parent_issue_description: + default: 0 issue_group_assignment: default: 0 default_issue_start_date_to_creation_date: diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 31e56b8..c9a4153 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -331,6 +331,10 @@ div.issue span.private { position:relative; bottom: 2px; text-transform: upperca div.issue .next-prev-links {color:#999;} div.issue table.attributes th {width:22%;} div.issue table.attributes td {width:28%;} +div.issue div.parent_description p.label_parent_description{padding-left: 16px; background: url(../images/arrow_collapsed.png) no-repeat; cursor:pointer; } +div.issue div.parent_description p.label_parent_description.expanded{padding-left: 16px; background: url(../images/arrow_expanded.png) no-repeat; cursor:pointer; } +div.issue div.parent_description div.wiki{display:none;} +div.issue div.parent_description.expanded div.wiki{display:block;} #issue_tree table.issues, #relations table.issues { border: 0; } #issue_tree td.checkbox, #relations td.checkbox {display:none;}