diff config/settings.yml @ 1337:077b8890835a cannam

Merge from live branch

--- a/config/settings.yml	Fri Jun 14 11:30:07 2013 +0100
+++ b/config/settings.yml	Thu Jun 20 13:14:02 2013 +0100
@@ -1,16 +1,16 @@
-# redMine - project management software
-# Copyright (C) 2006-2007  Jean-Philippe Lang
+# Redmine - project management software
+# Copyright (C) 2006-2012  Jean-Philippe Lang
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; either version 2
 # of the License, or (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
@@ -35,9 +35,19 @@
   default: '2'
 lost_password:
   default: 1
+unsubscribe:
+  default: 1
 password_min_length:
   format: int
-  default: 4
+  default: 8
+# Maximum lifetime of user sessions in minutes
+session_lifetime:
+  format: int
+  default: 0
+# User session timeout in minutes
+session_timeout:
+  format: int
+  default: 0
 attachment_max_size:
   format: int
   default: 5120
@@ -83,7 +93,7 @@
   default: 1500
 enabled_scm:
   serialized: true
-  default: 
+  default:
   - Subversion
   - Darcs
   - Mercurial
@@ -96,6 +106,8 @@
   default: 0
 sys_api_key:
   default: ''
+commit_cross_project_ref:
+  default: 0
 commit_ref_keywords:
   default: 'refs,references,IssueID'
 commit_fix_keywords:
@@ -111,7 +123,7 @@
   format: int
   default: 0
 # autologin duration in days
-# 0 means autologin is disabled 
+# 0 means autologin is disabled
 autologin:
   format: int
   default: 0
@@ -125,13 +137,16 @@
   format: symbol
 cross_project_issue_relations:
   default: 0
+# Enables subtasks to be in other projects
+cross_project_subtasks:
+  default: 'tree'
 issue_group_assignment:
   default: 0
 default_issue_start_date_to_creation_date:
   default: 1
 notified_events:
   serialized: true
-  default: 
+  default:
   - issue_added
   - issue_updated
 mail_handler_body_delimiters:
@@ -139,10 +154,10 @@
 mail_handler_api_enabled:
   default: 0
 mail_handler_api_key:
-  default: 
+  default:
 issue_list_default_columns:
   serialized: true
-  default: 
+  default:
   - tracker
   - status
   - priority
@@ -157,7 +172,7 @@
   default: 1
 default_projects_modules:
   serialized: true
-  default: 
+  default:
   - issue_tracking
   - time_tracking
   - news
@@ -190,7 +205,7 @@
   default: |-
     You have received this notification because you have either subscribed to it, or are involved in it.
     To change your notification preferences, please click here: http://hostname/my/account
-gravatar_enabled:  
+gravatar_enabled:
   default: 0
 openid:
   default: 0
@@ -204,3 +219,13 @@
   default: 'only_my_events'
 emails_header:
   default: ''
+thumbnails_enabled:
+  default: 0
+thumbnails_size:
+  format: int
+  default: 100
+non_working_week_days:
+  serialized: true
+  default:
+  - '6'
+  - '7'