diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb index 9d570a9a..6320f1b3 100644 --- a/app/controllers/account_controller.rb +++ b/app/controllers/account_controller.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -20,9 +20,9 @@ class AccountController < ApplicationController # Login request and validation def login - if request.get? - logout_user - else + if User.current.logged? + redirect_to home_url + elsif request.post? authenticate_user end end diff --git a/app/controllers/activities_controller.rb b/app/controllers/activities_controller.rb index 2265284e..cfc2be4b 100644 --- a/app/controllers/activities_controller.rb +++ b/app/controllers/activities_controller.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb index 4b0d4ff4..0b63d0f9 100644 --- a/app/controllers/admin_controller.rb +++ b/app/controllers/admin_controller.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index c5da0b44..6e8dc46e 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb index 908c0206..36fbeee6 100644 --- a/app/controllers/attachments_controller.rb +++ b/app/controllers/attachments_controller.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/controllers/auth_sources_controller.rb b/app/controllers/auth_sources_controller.rb index ba468826..a8d3f1a4 100644 --- a/app/controllers/auth_sources_controller.rb +++ b/app/controllers/auth_sources_controller.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/controllers/auto_completes_controller.rb b/app/controllers/auto_completes_controller.rb index becc957d..36fd4f2e 100644 --- a/app/controllers/auto_completes_controller.rb +++ b/app/controllers/auto_completes_controller.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/controllers/boards_controller.rb b/app/controllers/boards_controller.rb index 04553d7a..58db0690 100644 --- a/app/controllers/boards_controller.rb +++ b/app/controllers/boards_controller.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/controllers/calendars_controller.rb b/app/controllers/calendars_controller.rb index cb16e738..55cf70ea 100644 --- a/app/controllers/calendars_controller.rb +++ b/app/controllers/calendars_controller.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb index d0536c9e..72079ca7 100644 --- a/app/controllers/comments_controller.rb +++ b/app/controllers/comments_controller.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/controllers/context_menus_controller.rb b/app/controllers/context_menus_controller.rb index 628212a2..31487f06 100644 --- a/app/controllers/context_menus_controller.rb +++ b/app/controllers/context_menus_controller.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/controllers/custom_fields_controller.rb b/app/controllers/custom_fields_controller.rb index daf3c0c4..22e55b39 100644 --- a/app/controllers/custom_fields_controller.rb +++ b/app/controllers/custom_fields_controller.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/controllers/documents_controller.rb b/app/controllers/documents_controller.rb index 776b4759..56bddc28 100644 --- a/app/controllers/documents_controller.rb +++ b/app/controllers/documents_controller.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/controllers/enumerations_controller.rb b/app/controllers/enumerations_controller.rb index 5749a35e..7abf5bfe 100644 --- a/app/controllers/enumerations_controller.rb +++ b/app/controllers/enumerations_controller.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb index 0114ea84..2608ae9e 100644 --- a/app/controllers/files_controller.rb +++ b/app/controllers/files_controller.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/controllers/gantts_controller.rb b/app/controllers/gantts_controller.rb index b5404fc4..e3e6f482 100644 --- a/app/controllers/gantts_controller.rb +++ b/app/controllers/gantts_controller.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb index 29b642d2..6097b4cf 100644 --- a/app/controllers/groups_controller.rb +++ b/app/controllers/groups_controller.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/controllers/help_controller.rb b/app/controllers/help_controller.rb index e45d7c9a..505ca9a0 100644 --- a/app/controllers/help_controller.rb +++ b/app/controllers/help_controller.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/controllers/issue_categories_controller.rb b/app/controllers/issue_categories_controller.rb index be7f2b12..4f9300ab 100644 --- a/app/controllers/issue_categories_controller.rb +++ b/app/controllers/issue_categories_controller.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/controllers/issue_moves_controller.rb b/app/controllers/issue_moves_controller.rb index 7bd46c16..65381277 100644 --- a/app/controllers/issue_moves_controller.rb +++ b/app/controllers/issue_moves_controller.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/controllers/issue_relations_controller.rb b/app/controllers/issue_relations_controller.rb index 5df990b0..76e3dd44 100644 --- a/app/controllers/issue_relations_controller.rb +++ b/app/controllers/issue_relations_controller.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/controllers/issue_statuses_controller.rb b/app/controllers/issue_statuses_controller.rb index 5eea0f30..9ad56aa1 100644 --- a/app/controllers/issue_statuses_controller.rb +++ b/app/controllers/issue_statuses_controller.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index 51f677d1..347afe76 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/controllers/journals_controller.rb b/app/controllers/journals_controller.rb index bf217aa6..cb248971 100644 --- a/app/controllers/journals_controller.rb +++ b/app/controllers/journals_controller.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/controllers/ldap_auth_sources_controller.rb b/app/controllers/ldap_auth_sources_controller.rb index 33c7a297..71bc7f30 100644 --- a/app/controllers/ldap_auth_sources_controller.rb +++ b/app/controllers/ldap_auth_sources_controller.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/controllers/mail_handler_controller.rb b/app/controllers/mail_handler_controller.rb index 3ec65bce..f91a6446 100644 --- a/app/controllers/mail_handler_controller.rb +++ b/app/controllers/mail_handler_controller.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb index f3906292..bfea327f 100644 --- a/app/controllers/members_controller.rb +++ b/app/controllers/members_controller.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb index 6b4efbec..f7b50e87 100644 --- a/app/controllers/messages_controller.rb +++ b/app/controllers/messages_controller.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/controllers/my_controller.rb b/app/controllers/my_controller.rb index b0ae6aa0..8e91d95e 100644 --- a/app/controllers/my_controller.rb +++ b/app/controllers/my_controller.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/controllers/news_controller.rb b/app/controllers/news_controller.rb index 32e4590b..6f26d5c9 100644 --- a/app/controllers/news_controller.rb +++ b/app/controllers/news_controller.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/controllers/previews_controller.rb b/app/controllers/previews_controller.rb index 399d63b4..d010f1e3 100644 --- a/app/controllers/previews_controller.rb +++ b/app/controllers/previews_controller.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/controllers/project_enumerations_controller.rb b/app/controllers/project_enumerations_controller.rb index b3bb09c0..c0eeed2e 100644 --- a/app/controllers/project_enumerations_controller.rb +++ b/app/controllers/project_enumerations_controller.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index c096c034..92cebbfd 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/controllers/queries_controller.rb b/app/controllers/queries_controller.rb index e8f6a0a7..fdfedbbd 100644 --- a/app/controllers/queries_controller.rb +++ b/app/controllers/queries_controller.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/controllers/reports_controller.rb b/app/controllers/reports_controller.rb index 4d2d72cd..7ccf015d 100644 --- a/app/controllers/reports_controller.rb +++ b/app/controllers/reports_controller.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index b5abe7a6..376ede00 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/controllers/roles_controller.rb b/app/controllers/roles_controller.rb index ca3295ca..416bf1b4 100644 --- a/app/controllers/roles_controller.rb +++ b/app/controllers/roles_controller.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb index bc262772..8a0f9d8c 100644 --- a/app/controllers/search_controller.rb +++ b/app/controllers/search_controller.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/controllers/settings_controller.rb b/app/controllers/settings_controller.rb index 0bf5180b..e9aa8953 100644 --- a/app/controllers/settings_controller.rb +++ b/app/controllers/settings_controller.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/controllers/sys_controller.rb b/app/controllers/sys_controller.rb index 3fce4da0..62adaf75 100644 --- a/app/controllers/sys_controller.rb +++ b/app/controllers/sys_controller.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/controllers/time_entry_reports_controller.rb b/app/controllers/time_entry_reports_controller.rb index 02cde03a..18eebd41 100644 --- a/app/controllers/time_entry_reports_controller.rb +++ b/app/controllers/time_entry_reports_controller.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/controllers/timelog_controller.rb b/app/controllers/timelog_controller.rb index e3b64fcc..509240be 100644 --- a/app/controllers/timelog_controller.rb +++ b/app/controllers/timelog_controller.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/controllers/trackers_controller.rb b/app/controllers/trackers_controller.rb index 91e265fe..682111c6 100644 --- a/app/controllers/trackers_controller.rb +++ b/app/controllers/trackers_controller.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 9457f753..f4fb70d2 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/controllers/versions_controller.rb b/app/controllers/versions_controller.rb index b8657081..31b28cc0 100644 --- a/app/controllers/versions_controller.rb +++ b/app/controllers/versions_controller.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/controllers/watchers_controller.rb b/app/controllers/watchers_controller.rb index e9479f43..e6b4625e 100644 --- a/app/controllers/watchers_controller.rb +++ b/app/controllers/watchers_controller.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb index 1b5207a4..a9fe2db1 100644 --- a/app/controllers/welcome_controller.rb +++ b/app/controllers/welcome_controller.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/controllers/wiki_controller.rb b/app/controllers/wiki_controller.rb index c83e972d..3b68b82f 100644 --- a/app/controllers/wiki_controller.rb +++ b/app/controllers/wiki_controller.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -173,6 +173,7 @@ class WikiController < ApplicationController def annotate @annotate = @page.annotate(params[:version]) render_404 unless @annotate + @editable = editable? end verify :method => :delete, :only => [:destroy], :redirect_to => { :action => :show } diff --git a/app/controllers/wikis_controller.rb b/app/controllers/wikis_controller.rb index afc431c7..eb56b73a 100644 --- a/app/controllers/wikis_controller.rb +++ b/app/controllers/wikis_controller.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/controllers/workflows_controller.rb b/app/controllers/workflows_controller.rb index 173f6ec5..6fa3fccf 100644 --- a/app/controllers/workflows_controller.rb +++ b/app/controllers/workflows_controller.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/helpers/account_helper.rb b/app/helpers/account_helper.rb index 87f020ce..a475fd89 100644 --- a/app/helpers/account_helper.rb +++ b/app/helpers/account_helper.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/helpers/admin_helper.rb b/app/helpers/admin_helper.rb index 82a138a0..790cb8b6 100644 --- a/app/helpers/admin_helper.rb +++ b/app/helpers/admin_helper.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index df88838a..e3573ac4 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/helpers/attachments_helper.rb b/app/helpers/attachments_helper.rb index a3220f49..666f3cc0 100644 --- a/app/helpers/attachments_helper.rb +++ b/app/helpers/attachments_helper.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/helpers/auth_sources_helper.rb b/app/helpers/auth_sources_helper.rb index 7a01bbcb..d16a1f27 100644 --- a/app/helpers/auth_sources_helper.rb +++ b/app/helpers/auth_sources_helper.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/helpers/boards_helper.rb b/app/helpers/boards_helper.rb index 570a36b6..783c9d45 100644 --- a/app/helpers/boards_helper.rb +++ b/app/helpers/boards_helper.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/helpers/calendars_helper.rb b/app/helpers/calendars_helper.rb index dc3045c7..920d2a89 100644 --- a/app/helpers/calendars_helper.rb +++ b/app/helpers/calendars_helper.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/helpers/custom_fields_helper.rb b/app/helpers/custom_fields_helper.rb index fd421bcf..abf925e1 100644 --- a/app/helpers/custom_fields_helper.rb +++ b/app/helpers/custom_fields_helper.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/helpers/documents_helper.rb b/app/helpers/documents_helper.rb index 3ab39110..662de4dd 100644 --- a/app/helpers/documents_helper.rb +++ b/app/helpers/documents_helper.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/helpers/enumerations_helper.rb b/app/helpers/enumerations_helper.rb index fb6d34d4..1966869d 100644 --- a/app/helpers/enumerations_helper.rb +++ b/app/helpers/enumerations_helper.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/helpers/gantt_helper.rb b/app/helpers/gantt_helper.rb index 5733dd81..613fd0a7 100644 --- a/app/helpers/gantt_helper.rb +++ b/app/helpers/gantt_helper.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/helpers/groups_helper.rb b/app/helpers/groups_helper.rb index c6ac0728..6ebd7d4a 100644 --- a/app/helpers/groups_helper.rb +++ b/app/helpers/groups_helper.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/helpers/issue_categories_helper.rb b/app/helpers/issue_categories_helper.rb index 2dd45cc2..610edd86 100644 --- a/app/helpers/issue_categories_helper.rb +++ b/app/helpers/issue_categories_helper.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/helpers/issue_moves_helper.rb b/app/helpers/issue_moves_helper.rb index c6251816..6527c384 100644 --- a/app/helpers/issue_moves_helper.rb +++ b/app/helpers/issue_moves_helper.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/helpers/issue_relations_helper.rb b/app/helpers/issue_relations_helper.rb index b3e5eded..8f3d5ebe 100644 --- a/app/helpers/issue_relations_helper.rb +++ b/app/helpers/issue_relations_helper.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/helpers/issue_statuses_helper.rb b/app/helpers/issue_statuses_helper.rb index 335ca485..9c9790d5 100644 --- a/app/helpers/issue_statuses_helper.rb +++ b/app/helpers/issue_statuses_helper.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb index dabac782..20c4100a 100644 --- a/app/helpers/issues_helper.rb +++ b/app/helpers/issues_helper.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/helpers/journals_helper.rb b/app/helpers/journals_helper.rb index 34a2f51d..895ce2f4 100644 --- a/app/helpers/journals_helper.rb +++ b/app/helpers/journals_helper.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/helpers/mail_handler_helper.rb b/app/helpers/mail_handler_helper.rb index 980ddbd3..a99375fd 100644 --- a/app/helpers/mail_handler_helper.rb +++ b/app/helpers/mail_handler_helper.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/helpers/members_helper.rb b/app/helpers/members_helper.rb index 843b0314..746b980c 100644 --- a/app/helpers/members_helper.rb +++ b/app/helpers/members_helper.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/helpers/messages_helper.rb b/app/helpers/messages_helper.rb index e5558eaf..ad668315 100644 --- a/app/helpers/messages_helper.rb +++ b/app/helpers/messages_helper.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/helpers/my_helper.rb b/app/helpers/my_helper.rb index e9324e57..15538749 100644 --- a/app/helpers/my_helper.rb +++ b/app/helpers/my_helper.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/helpers/news_helper.rb b/app/helpers/news_helper.rb index fb33ced2..5cf182e2 100644 --- a/app/helpers/news_helper.rb +++ b/app/helpers/news_helper.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index cc2b90e7..0e3c84f7 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/helpers/queries_helper.rb b/app/helpers/queries_helper.rb index d65aad61..92a236eb 100644 --- a/app/helpers/queries_helper.rb +++ b/app/helpers/queries_helper.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/helpers/reports_helper.rb b/app/helpers/reports_helper.rb index 934cb547..42904f02 100644 --- a/app/helpers/reports_helper.rb +++ b/app/helpers/reports_helper.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/helpers/repositories_helper.rb b/app/helpers/repositories_helper.rb index 34311bdc..5c33ce00 100644 --- a/app/helpers/repositories_helper.rb +++ b/app/helpers/repositories_helper.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/helpers/roles_helper.rb b/app/helpers/roles_helper.rb index d4156b5c..0a088ca1 100644 --- a/app/helpers/roles_helper.rb +++ b/app/helpers/roles_helper.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb index 81341755..2493c130 100644 --- a/app/helpers/search_helper.rb +++ b/app/helpers/search_helper.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/helpers/settings_helper.rb b/app/helpers/settings_helper.rb index 49ebe341..a2f96ffa 100644 --- a/app/helpers/settings_helper.rb +++ b/app/helpers/settings_helper.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/helpers/sort_helper.rb b/app/helpers/sort_helper.rb index f882401d..20f4ca0d 100644 --- a/app/helpers/sort_helper.rb +++ b/app/helpers/sort_helper.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/helpers/timelog_helper.rb b/app/helpers/timelog_helper.rb index c4bc80dc..26abb6db 100644 --- a/app/helpers/timelog_helper.rb +++ b/app/helpers/timelog_helper.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/helpers/trackers_helper.rb b/app/helpers/trackers_helper.rb index e2e9660f..9e7f177e 100644 --- a/app/helpers/trackers_helper.rb +++ b/app/helpers/trackers_helper.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb index 949074ee..5e141fcf 100644 --- a/app/helpers/users_helper.rb +++ b/app/helpers/users_helper.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/helpers/versions_helper.rb b/app/helpers/versions_helper.rb index 1c20971d..2c4c28b6 100644 --- a/app/helpers/versions_helper.rb +++ b/app/helpers/versions_helper.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/helpers/watchers_helper.rb b/app/helpers/watchers_helper.rb index c014a154..1af600c0 100644 --- a/app/helpers/watchers_helper.rb +++ b/app/helpers/watchers_helper.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/helpers/welcome_helper.rb b/app/helpers/welcome_helper.rb index 56b8ffb2..8f12c8aa 100644 --- a/app/helpers/welcome_helper.rb +++ b/app/helpers/welcome_helper.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/helpers/wiki_helper.rb b/app/helpers/wiki_helper.rb index 7427df07..2ca13eac 100644 --- a/app/helpers/wiki_helper.rb +++ b/app/helpers/wiki_helper.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/helpers/workflows_helper.rb b/app/helpers/workflows_helper.rb index b52d6bda..bf5ed238 100644 --- a/app/helpers/workflows_helper.rb +++ b/app/helpers/workflows_helper.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/models/attachment.rb b/app/models/attachment.rb index 8dbae846..4a0bb44f 100644 --- a/app/models/attachment.rb +++ b/app/models/attachment.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/models/auth_source.rb b/app/models/auth_source.rb index 3840f66a..b86a831c 100644 --- a/app/models/auth_source.rb +++ b/app/models/auth_source.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/models/auth_source_ldap.rb b/app/models/auth_source_ldap.rb index d009ae33..defc4d51 100644 --- a/app/models/auth_source_ldap.rb +++ b/app/models/auth_source_ldap.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -21,6 +21,7 @@ class AuthSourceLdap < AuthSource validates_length_of :account, :account_password, :base_dn, :maximum => 255, :allow_nil => true validates_length_of :attr_login, :attr_firstname, :attr_lastname, :attr_mail, :maximum => 30, :allow_nil => true validates_numericality_of :port, :only_integer => true + validate :custom_filter_should_be_valid_ldap_filter_syntax before_validation :strip_ldap_attributes @@ -101,10 +102,17 @@ class AuthSourceLdap < AuthSource ldap_con = initialize_ldap_con(self.account, self.account_password) login_filter = Net::LDAP::Filter.eq( self.attr_login, login ) object_filter = Net::LDAP::Filter.eq( "objectClass", "*" ) + custom_ldap_filter = custom_filter_to_ldap + + if custom_ldap_filter.present? + search_filters = object_filter & login_filter & custom_ldap_filter + else + search_filters = object_filter & login_filter + end attrs = {} ldap_con.search( :base => self.base_dn, - :filter => object_filter & login_filter, + :filter => search_filters, :attributes=> search_attributes) do |entry| if onthefly_register? @@ -119,6 +127,27 @@ class AuthSourceLdap < AuthSource attrs end + def custom_filter_to_ldap + return nil unless custom_filter.present? + + begin + return Net::LDAP::Filter.construct(custom_filter) + rescue Net::LDAP::LdapError # Filter syntax error + logger.debug "LDAP custom filter syntax error for: #{custom_filter}" if logger && logger.debug? + return nil + end + end + + def custom_filter_should_be_valid_ldap_filter_syntax + return true unless custom_filter.present? + + begin + return Net::LDAP::Filter.construct(custom_filter) + rescue Net::LDAP::LdapError # Filter syntax error + errors.add(:custom_filter, :invalid) + end + end + def self.get_attr(entry, attr_name) if !attr_name.blank? entry[attr_name].is_a?(Array) ? entry[attr_name].first : entry[attr_name] diff --git a/app/models/board.rb b/app/models/board.rb index 7feb7c83..21851c3d 100644 --- a/app/models/board.rb +++ b/app/models/board.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/models/change.rb b/app/models/change.rb index 4e90689e..44d3def1 100644 --- a/app/models/change.rb +++ b/app/models/change.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -31,7 +31,7 @@ class Change < ActiveRecord::Base def from_path # TODO: shouldn't access Changeset#to_utf8 directly - self.path = Changeset.to_utf8(read_attribute(:from_path), changeset_repository_encoding) + self.from_path = Changeset.to_utf8(read_attribute(:from_path), changeset_repository_encoding) end def init_path diff --git a/app/models/changeset.rb b/app/models/changeset.rb index 24e71659..fbc491bb 100644 --- a/app/models/changeset.rb +++ b/app/models/changeset.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/models/comment.rb b/app/models/comment.rb index 0a52b7fb..76e5adf4 100644 --- a/app/models/comment.rb +++ b/app/models/comment.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/models/comment_observer.rb b/app/models/comment_observer.rb index cedaba89..68bc36f5 100644 --- a/app/models/comment_observer.rb +++ b/app/models/comment_observer.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/models/custom_field.rb b/app/models/custom_field.rb index 7aef8306..66bc61ab 100644 --- a/app/models/custom_field.rb +++ b/app/models/custom_field.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/models/custom_value.rb b/app/models/custom_value.rb index e18025dc..c876a450 100644 --- a/app/models/custom_value.rb +++ b/app/models/custom_value.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/models/document.rb b/app/models/document.rb index 06df9720..7e17997c 100644 --- a/app/models/document.rb +++ b/app/models/document.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/models/document_category.rb b/app/models/document_category.rb index c0da2bc9..ed745347 100644 --- a/app/models/document_category.rb +++ b/app/models/document_category.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/models/document_category_custom_field.rb b/app/models/document_category_custom_field.rb index fc21d647..97646f96 100644 --- a/app/models/document_category_custom_field.rb +++ b/app/models/document_category_custom_field.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/models/document_observer.rb b/app/models/document_observer.rb index 66ac3a8a..9f68ad15 100644 --- a/app/models/document_observer.rb +++ b/app/models/document_observer.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/models/enabled_module.rb b/app/models/enabled_module.rb index 96c09b6f..d8f79fa2 100644 --- a/app/models/enabled_module.rb +++ b/app/models/enabled_module.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/models/enumeration.rb b/app/models/enumeration.rb index d3414f20..748b0134 100644 --- a/app/models/enumeration.rb +++ b/app/models/enumeration.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/models/group.rb b/app/models/group.rb index 2e7d3526..f78f0162 100644 --- a/app/models/group.rb +++ b/app/models/group.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/models/group_custom_field.rb b/app/models/group_custom_field.rb index c787c361..96abb31d 100644 --- a/app/models/group_custom_field.rb +++ b/app/models/group_custom_field.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/models/issue.rb b/app/models/issue.rb index cc754014..446c92e3 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -401,6 +401,11 @@ class Issue < ActiveRecord::Base !due_date.nil? && (due_date < Date.today) && !status.is_closed? end + # Returns true if the issue is due today and not closed + def due_today? + !due_date.nil? && (due_date == Date.today) && !status.is_closed? + end + # Is the amount of work done less than it should for the due date def behind_schedule? return false if start_date.nil? || due_date.nil? @@ -556,6 +561,7 @@ class Issue < ActiveRecord::Base s = "issue status-#{status.position} priority-#{priority.position}" s << ' closed' if closed? s << ' overdue' if overdue? + s << ' due-today' if due_today? s << ' child' if child? s << ' parent' unless leaf? s << ' created-by-me' if User.current.logged? && author_id == User.current.id diff --git a/app/models/issue_category.rb b/app/models/issue_category.rb index c1a9c6d2..9fe34f9f 100644 --- a/app/models/issue_category.rb +++ b/app/models/issue_category.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/models/issue_custom_field.rb b/app/models/issue_custom_field.rb index 53f9d366..fde04b1c 100644 --- a/app/models/issue_custom_field.rb +++ b/app/models/issue_custom_field.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/models/issue_observer.rb b/app/models/issue_observer.rb index 38d7fd29..ea1a592d 100644 --- a/app/models/issue_observer.rb +++ b/app/models/issue_observer.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/models/issue_priority.rb b/app/models/issue_priority.rb index 84b751ca..72a9c98a 100644 --- a/app/models/issue_priority.rb +++ b/app/models/issue_priority.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/models/issue_priority_custom_field.rb b/app/models/issue_priority_custom_field.rb index b0ffaab1..09815794 100644 --- a/app/models/issue_priority_custom_field.rb +++ b/app/models/issue_priority_custom_field.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/models/issue_relation.rb b/app/models/issue_relation.rb index d899926c..e13050aa 100644 --- a/app/models/issue_relation.rb +++ b/app/models/issue_relation.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/models/issue_status.rb b/app/models/issue_status.rb index 7078237d..409fe67b 100644 --- a/app/models/issue_status.rb +++ b/app/models/issue_status.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/models/journal.rb b/app/models/journal.rb index 621fadca..a0ec3000 100644 --- a/app/models/journal.rb +++ b/app/models/journal.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/models/journal_observer.rb b/app/models/journal_observer.rb index 32f17505..ab3571a1 100644 --- a/app/models/journal_observer.rb +++ b/app/models/journal_observer.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/models/mail_handler.rb b/app/models/mail_handler.rb index 4686811d..03b814ff 100644 --- a/app/models/mail_handler.rb +++ b/app/models/mail_handler.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/models/mailer.rb b/app/models/mailer.rb index 8e331011..aaf3228a 100644 --- a/app/models/mailer.rb +++ b/app/models/mailer.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/models/member.rb b/app/models/member.rb index b10dfcca..054b2b79 100644 --- a/app/models/member.rb +++ b/app/models/member.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/models/member_role.rb b/app/models/member_role.rb index 57138ead..4f5a643d 100644 --- a/app/models/member_role.rb +++ b/app/models/member_role.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/models/message.rb b/app/models/message.rb index df1850b6..484abb7b 100644 --- a/app/models/message.rb +++ b/app/models/message.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/models/message_observer.rb b/app/models/message_observer.rb index 59f31a9d..a3a0f93d 100644 --- a/app/models/message_observer.rb +++ b/app/models/message_observer.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/models/news.rb b/app/models/news.rb index 564f82f5..1230bc87 100644 --- a/app/models/news.rb +++ b/app/models/news.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/models/news_observer.rb b/app/models/news_observer.rb index bbf1c347..efd25d49 100644 --- a/app/models/news_observer.rb +++ b/app/models/news_observer.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/models/principal.rb b/app/models/principal.rb index 00207f5e..1080f265 100644 --- a/app/models/principal.rb +++ b/app/models/principal.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/models/project.rb b/app/models/project.rb index 5fe6a8b8..87269f54 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/models/project_custom_field.rb b/app/models/project_custom_field.rb index 5b257b8b..53839f8d 100644 --- a/app/models/project_custom_field.rb +++ b/app/models/project_custom_field.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/models/query.rb b/app/models/query.rb index dd82d301..a28235b4 100644 --- a/app/models/query.rb +++ b/app/models/query.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/models/repository.rb b/app/models/repository.rb index 8a761a76..9411dfb5 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/models/repository/bazaar.rb b/app/models/repository/bazaar.rb index 9011e16f..7fa3cb1e 100644 --- a/app/models/repository/bazaar.rb +++ b/app/models/repository/bazaar.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/models/repository/cvs.rb b/app/models/repository/cvs.rb index 7c3cf4db..99b8ccfa 100644 --- a/app/models/repository/cvs.rb +++ b/app/models/repository/cvs.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/models/repository/darcs.rb b/app/models/repository/darcs.rb index f0249eea..1f5bf69a 100644 --- a/app/models/repository/darcs.rb +++ b/app/models/repository/darcs.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/models/repository/filesystem.rb b/app/models/repository/filesystem.rb index 37084902..722e5316 100644 --- a/app/models/repository/filesystem.rb +++ b/app/models/repository/filesystem.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/models/repository/git.rb b/app/models/repository/git.rb index e38d7e99..7817aff4 100644 --- a/app/models/repository/git.rb +++ b/app/models/repository/git.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/models/repository/mercurial.rb b/app/models/repository/mercurial.rb index 27923197..24c9d7a7 100644 --- a/app/models/repository/mercurial.rb +++ b/app/models/repository/mercurial.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/models/repository/subversion.rb b/app/models/repository/subversion.rb index 46ced476..0515460d 100644 --- a/app/models/repository/subversion.rb +++ b/app/models/repository/subversion.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/models/role.rb b/app/models/role.rb index 59bd4dbc..a659431d 100644 --- a/app/models/role.rb +++ b/app/models/role.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/models/setting.rb b/app/models/setting.rb index 145ee5cc..b8ad1f1a 100644 --- a/app/models/setting.rb +++ b/app/models/setting.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/models/time_entry.rb b/app/models/time_entry.rb index 279ef08c..2a23913a 100644 --- a/app/models/time_entry.rb +++ b/app/models/time_entry.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/models/time_entry_activity.rb b/app/models/time_entry_activity.rb index ced2493f..0217e914 100644 --- a/app/models/time_entry_activity.rb +++ b/app/models/time_entry_activity.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/models/time_entry_activity_custom_field.rb b/app/models/time_entry_activity_custom_field.rb index afec7ef2..db1908b1 100644 --- a/app/models/time_entry_activity_custom_field.rb +++ b/app/models/time_entry_activity_custom_field.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/models/time_entry_custom_field.rb b/app/models/time_entry_custom_field.rb index 75b61601..625090ac 100644 --- a/app/models/time_entry_custom_field.rb +++ b/app/models/time_entry_custom_field.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/models/token.rb b/app/models/token.rb index b3dee08b..6896edc6 100644 --- a/app/models/token.rb +++ b/app/models/token.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/models/tracker.rb b/app/models/tracker.rb index 353645f7..697c728c 100644 --- a/app/models/tracker.rb +++ b/app/models/tracker.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/models/user.rb b/app/models/user.rb index 49a9bf4f..d22eda90 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/models/user_custom_field.rb b/app/models/user_custom_field.rb index 3e77db7e..2afd6e9c 100644 --- a/app/models/user_custom_field.rb +++ b/app/models/user_custom_field.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/models/user_preference.rb b/app/models/user_preference.rb index 5763882e..0de99abb 100644 --- a/app/models/user_preference.rb +++ b/app/models/user_preference.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/models/version.rb b/app/models/version.rb index cf667258..898ab4d1 100644 --- a/app/models/version.rb +++ b/app/models/version.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/models/version_custom_field.rb b/app/models/version_custom_field.rb index 07c11631..276bcf08 100644 --- a/app/models/version_custom_field.rb +++ b/app/models/version_custom_field.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/models/watcher.rb b/app/models/watcher.rb index bc1bed6b..00e044e6 100644 --- a/app/models/watcher.rb +++ b/app/models/watcher.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/models/wiki.rb b/app/models/wiki.rb index 65f2f731..1ed14008 100644 --- a/app/models/wiki.rb +++ b/app/models/wiki.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/models/wiki_content.rb b/app/models/wiki_content.rb index b04ad378..632232ae 100644 --- a/app/models/wiki_content.rb +++ b/app/models/wiki_content.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/models/wiki_content_observer.rb b/app/models/wiki_content_observer.rb index aeb8b587..d771cdff 100644 --- a/app/models/wiki_content_observer.rb +++ b/app/models/wiki_content_observer.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/models/wiki_page.rb b/app/models/wiki_page.rb index 16566f05..ed465ff8 100644 --- a/app/models/wiki_page.rb +++ b/app/models/wiki_page.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/models/wiki_redirect.rb b/app/models/wiki_redirect.rb index f2423732..72fdc141 100644 --- a/app/models/wiki_redirect.rb +++ b/app/models/wiki_redirect.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/models/workflow.rb b/app/models/workflow.rb index cb181bb7..c8310383 100644 --- a/app/models/workflow.rb +++ b/app/models/workflow.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/app/views/ldap_auth_sources/_form.rhtml b/app/views/ldap_auth_sources/_form.rhtml index 9ffffafc..8699a2cd 100644 --- a/app/views/ldap_auth_sources/_form.rhtml +++ b/app/views/ldap_auth_sources/_form.rhtml @@ -25,6 +25,9 @@

<%= check_box 'auth_source', 'onthefly_register' %>

+ +

+<%= text_field 'auth_source', 'custom_filter', :size => 60 %>

<%=l(:label_attribute_plural)%> diff --git a/app/views/wiki/annotate.rhtml b/app/views/wiki/annotate.rhtml index 097ed149..032ff057 100644 --- a/app/views/wiki/annotate.rhtml +++ b/app/views/wiki/annotate.rhtml @@ -1,6 +1,13 @@
-<%= link_to(l(:button_edit), {:action => 'edit', :id => @page.title}, :class => 'icon icon-edit') %> -<%= link_to(l(:label_history), {:action => 'history', :id => @page.title}, :class => 'icon icon-history') %> +<% if @editable %> +<%= link_to_if_authorized(l(:button_edit), {:action => 'edit', :id => @page.title}, :class => 'icon icon-edit', :accesskey => accesskey(:edit)) if @annotate.content.version == @page.content.version %> +<%= watcher_link(@page, User.current) %> +<%= link_to_if_authorized(l(:button_lock), {:action => 'protect', :id => @page.title, :protected => 1}, :method => :post, :class => 'icon icon-lock') if !@page.protected? %> +<%= link_to_if_authorized(l(:button_unlock), {:action => 'protect', :id => @page.title, :protected => 0}, :method => :post, :class => 'icon icon-unlock') if @page.protected? %> +<%= link_to_if_authorized(l(:button_rename), {:action => 'rename', :id => @page.title}, :class => 'icon icon-move') if @annotate.content.version == @page.content.version %> +<%= link_to_if_authorized(l(:button_delete), {:action => 'destroy', :id => @page.title}, :method => :delete, :confirm => l(:text_are_you_sure), :class => 'icon icon-del') %> +<% end %> +<%= link_to_if_authorized(l(:label_history), {:action => 'history', :id => @page.title}, :class => 'icon icon-history') %>

<%= h(@page.pretty_title) %>

diff --git a/config.ru b/config.ru new file mode 100644 index 00000000..9d07fec7 --- /dev/null +++ b/config.ru @@ -0,0 +1,5 @@ +require File.expand_path("../config/environment", __FILE__) + +use Rails::Rack::LogTailer +use Rails::Rack::Static +run ActionController::Dispatcher.new diff --git a/config/boot.rb b/config/boot.rb index d0a09605..ec2b3e7a 100644 --- a/config/boot.rb +++ b/config/boot.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/config/environment.rb b/config/environment.rb index 3c174193..1d2bd651 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -69,6 +69,9 @@ Rails::Initializer.run do |config| # It will automatically turn deliveries on config.action_mailer.perform_deliveries = false + # Insert vendor/chiliproject_plugins at the top of the plugin load paths + config.plugin_paths.insert(0, File.join(Rails.root, "vendor", "chiliproject_plugins")) + # Use redmine's custom plugin locater require File.join(RAILS_ROOT, "lib/redmine_plugin_locator") config.plugin_locators << RedminePluginLocator diff --git a/config/environments/demo.rb b/config/environments/demo.rb index 8d3b878d..72205d9a 100644 --- a/config/environments/demo.rb +++ b/config/environments/demo.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/config/environments/development.rb b/config/environments/development.rb index 8044831d..1a80ce88 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/config/environments/production.rb b/config/environments/production.rb index 858ad0f8..631d5670 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/config/environments/test.rb b/config/environments/test.rb index d64c781f..6df6eb97 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/config/environments/test_pgsql.rb b/config/environments/test_pgsql.rb index 71d2e6b2..5e5aff60 100644 --- a/config/environments/test_pgsql.rb +++ b/config/environments/test_pgsql.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/config/environments/test_sqlite3.rb b/config/environments/test_sqlite3.rb index 71d2e6b2..5e5aff60 100644 --- a/config/environments/test_sqlite3.rb +++ b/config/environments/test_sqlite3.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/config/initializers/10-patches.rb b/config/initializers/10-patches.rb index 12725e9c..697d2736 100644 --- a/config/initializers/10-patches.rb +++ b/config/initializers/10-patches.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -12,6 +12,10 @@ # See doc/COPYRIGHT.rdoc for more details. #++ +# Patches active_support/core_ext/load_error.rb to support 1.9.3 LoadError message +if RUBY_VERSION >= '1.9.3' + MissingSourceFile::REGEXPS << [/^cannot load such file -- (.+)$/i, 1] +end require 'active_record' diff --git a/config/initializers/20-mime_types.rb b/config/initializers/20-mime_types.rb index dabcf111..e9598cee 100644 --- a/config/initializers/20-mime_types.rb +++ b/config/initializers/20-mime_types.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/config/initializers/30-redmine.rb b/config/initializers/30-redmine.rb index 275816ee..7469b743 100644 --- a/config/initializers/30-redmine.rb +++ b/config/initializers/30-redmine.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb index 900ff034..7cadcb28 100644 --- a/config/initializers/backtrace_silencers.rb +++ b/config/initializers/backtrace_silencers.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb index b7f7bbcd..f1a639f7 100644 --- a/config/initializers/inflections.rb +++ b/config/initializers/inflections.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/config/initializers/new_rails_defaults.rb b/config/initializers/new_rails_defaults.rb index eebaa48b..54cd0f0b 100644 --- a/config/initializers/new_rails_defaults.rb +++ b/config/initializers/new_rails_defaults.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/config/locales/bg.yml b/config/locales/bg.yml index e0d413a6..cacd42f1 100644 --- a/config/locales/bg.yml +++ b/config/locales/bg.yml @@ -903,8 +903,8 @@ bg: text_user_wrote: "%{value} написа:" text_enumeration_destroy_question: "%{count} обекта са свързани с тази стойност." text_enumeration_category_reassign_to: 'Пресвържете ги към тази стойност:' - text_email_delivery_not_configured: "Изпращането на e-mail-и не е конфигурирано и известията не са разрешени.\nКонфигурирайте вашия SMTP сървър в config/configuration.yml и рестартирайте Redmine, за да ги разрешите." - text_repository_usernames_mapping: "Изберете или променете потребителите в Redmine, съответстващи на потребителите в дневника на хранилището (repository).\nПотребителите с еднакви имена в Redmine и хранилищата се съвместяват автоматично." + text_email_delivery_not_configured: "Изпращането на e-mail-и не е конфигурирано и известията не са разрешени.\nКонфигурирайте вашия SMTP сървър в config/configuration.yml и рестартирайте ChiliProject, за да ги разрешите." + text_repository_usernames_mapping: "Изберете или променете потребителите в ChiliProject, съответстващи на потребителите в дневника на хранилището (repository).\nПотребителите с еднакви имена в ChiliProject и хранилищата се съвместяват автоматично." text_diff_truncated: '... Този diff не е пълен, понеже е надхвърля максималния размер, който може да бъде показан.' text_custom_field_possible_values_info: 'Една стойност на ред' text_wiki_page_destroy_question: Тази страница има %{descendants} страници деца и descendant(s). Какво желаете да правите? @@ -983,3 +983,4 @@ bg: description_choose_project: Проекти description_date_from: Въведете начална дата label_deleted_custom_field: (изтрито потребителско поле) + field_custom_filter: Custom LDAP filter diff --git a/config/locales/bs.yml b/config/locales/bs.yml index 0cd4fd42..90a3585a 100644 --- a/config/locales/bs.yml +++ b/config/locales/bs.yml @@ -790,7 +790,7 @@ bs: text_enumeration_destroy_question: "Za %{count} objekata je dodjeljenja ova vrijednost." text_enumeration_category_reassign_to: 'Ponovo im dodjeli ovu vrijednost:' text_email_delivery_not_configured: "Email dostava nije konfiguraisana, notifikacija je onemogućena.\nKonfiguriši SMTP server u config/configuration.yml i restartuj aplikaciju nakon toga." - text_repository_usernames_mapping: "Odaberi ili ispravi redmine korisnika mapiranog za svako korisničko ima nađeno u logu repozitorija.\nKorisnici sa istim imenom u redmineu i u repozitoruju se automatski mapiraju." + text_repository_usernames_mapping: "Odaberi ili ispravi ChiliProject korisnika mapiranog za svako korisničko ima nađeno u logu repozitorija.\nKorisnici sa istim imenom u ChiliProjectu i u repozitoruju se automatski mapiraju." text_diff_truncated: '... Ovaj prikaz razlike je odsječen pošto premašuje maksimalnu veličinu za prikaz' text_custom_field_possible_values_info: 'Jedna linija za svaku vrijednost' @@ -997,3 +997,4 @@ bs: description_choose_project: Projects description_date_from: Enter start date label_deleted_custom_field: (deleted custom field) + field_custom_filter: Custom LDAP filter diff --git a/config/locales/ca.yml b/config/locales/ca.yml index c59ab948..3f401c03 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -1,4 +1,4 @@ -# Redmine catalan translation: +# ChiliProject catalan translation: # by Joan Duran ca: @@ -883,7 +883,7 @@ ca: text_enumeration_destroy_question: "%{count} objectes estan assignats a aquest valor." text_enumeration_category_reassign_to: "Torna a assignar-los a aquest valor:" text_email_delivery_not_configured: "El lliurament per correu electrònic no està configurat i les notificacions estan inhabilitades.\nConfigureu el servidor SMTP a config/configuration.yml i reinicieu l'aplicació per habilitar-lo." - text_repository_usernames_mapping: "Seleccioneu l'assignació entre els usuaris del Redmine i cada nom d'usuari trobat al dipòsit.\nEls usuaris amb el mateix nom d'usuari o correu del Redmine i del dipòsit s'assignaran automàticament." + text_repository_usernames_mapping: "Seleccioneu l'assignació entre els usuaris del ChiliProject i cada nom d'usuari trobat al dipòsit.\nEls usuaris amb el mateix nom d'usuari o correu del ChiliProject i del dipòsit s'assignaran automàticament." text_diff_truncated: "... Aquestes diferències s'han trucat perquè excedeixen la mida màxima que es pot mostrar." text_custom_field_possible_values_info: "Una línia per a cada valor" text_wiki_page_destroy_question: "Aquesta pàgina té %{descendants} pàgines fill i descendents. Què voleu fer?" @@ -986,3 +986,4 @@ ca: description_choose_project: Projects description_date_from: Enter start date label_deleted_custom_field: (deleted custom field) + field_custom_filter: Custom LDAP filter diff --git a/config/locales/cs.yml b/config/locales/cs.yml index c681fb0f..7e4878d1 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -904,7 +904,7 @@ cs: text_enumeration_destroy_question: "Několik (%{count}) objektů je přiřazeno k této hodnotě." text_enumeration_category_reassign_to: 'Přeřadit je do této:' text_email_delivery_not_configured: "Doručování e-mailů není nastaveno a odesílání notifikací je zakázáno.\nNastavte Váš SMTP server v souboru config/email.yml a restartujte aplikaci." - text_repository_usernames_mapping: "Vybrat nebo upravit mapování mezi Redmine uživateli a uživatelskými jmény nalezenými v logu repozitáře.\nUživatelé se shodným Redmine uživatelským jménem a uživatelským jménem v repozitáři jsou mapovaní automaticky." + text_repository_usernames_mapping: "Vybrat nebo upravit mapování mezi ChiliProject uživateli a uživatelskými jmény nalezenými v logu repozitáře.\nUživatelé se shodným ChiliProject uživatelským jménem a uživatelským jménem v repozitáři jsou mapovaní automaticky." text_diff_truncated: '... Rozdílový soubor je zkrácen, protože jeho délka přesahuje max. limit.' text_custom_field_possible_values_info: 'Každá hodnota na novém řádku' text_wiki_page_destroy_question: Tato stránka má %{descendants} podstránek a potomků. Co chcete udělat? @@ -1015,7 +1015,7 @@ cs: permission_edit_own_issue_notes: Upravování vlastních poznámek setting_gravatar_enabled: Použít uživatelské ikony Gravatar label_example: Příklad - text_repository_usernames_mapping: "Vybrat nebo upravit mapování mezi Redmine uživateli a uživatelskými jmény nalezenými v logu repozitáře.\nUživatelé se shodným Redmine uživatelským jménem a uživatelským jménem v repozitáři jsou mapovaní automaticky." + text_repository_usernames_mapping: "Vybrat nebo upravit mapování mezi ChiliProject uživateli a uživatelskými jmény nalezenými v logu repozitáře.\nUživatelé se shodným ChiliProject uživatelským jménem a uživatelským jménem v repozitáři jsou mapovaní automaticky." permission_edit_own_messages: Upravit vlastní zprávy permission_delete_own_messages: Smazat vlastní zprávy label_user_activity: "Aktivita uživatele: %{value}" @@ -1207,3 +1207,4 @@ cs: description_choose_project: Projects description_date_from: Enter start date label_deleted_custom_field: (deleted custom field) + field_custom_filter: Custom LDAP filter diff --git a/config/locales/da.yml b/config/locales/da.yml index 0b1502e8..9f31e524 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -814,7 +814,7 @@ da: permission_save_queries: Gem forespørgsler label_copied: kopieret setting_commit_logs_encoding: Kodning af Commit beskeder - text_repository_usernames_mapping: "Vælg eller opdatér de Redmine brugere der svarer til de enkelte brugere fundet i repository loggen.\nBrugere med samme brugernavn eller email adresse i både Redmine og det valgte repository bliver automatisk koblet sammen." + text_repository_usernames_mapping: "Vælg eller opdatér de ChiliProject brugere der svarer til de enkelte brugere fundet i repository loggen.\nBrugere med samme brugernavn eller email adresse i både ChiliProject og det valgte repository bliver automatisk koblet sammen." permission_edit_time_entries: Redigér tidsregistreringer general_csv_decimal_separator: ',' permission_edit_own_time_entries: Redigér egne tidsregistreringer @@ -999,3 +999,4 @@ da: description_choose_project: Projects description_date_from: Enter start date label_deleted_custom_field: (deleted custom field) + field_custom_filter: Custom LDAP filter diff --git a/config/locales/de.yml b/config/locales/de.yml index 264919a4..3dfcbd49 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -903,7 +903,7 @@ de: text_enumeration_destroy_question: "%{count} Objekt(e) sind diesem Wert zugeordnet." text_enumeration_category_reassign_to: 'Die Objekte stattdessen diesem Wert zuordnen:' text_email_delivery_not_configured: "Der SMTP-Server ist nicht konfiguriert und Mailbenachrichtigungen sind ausgeschaltet.\nNehmen Sie die Einstellungen für Ihren SMTP-Server in config/configuration.yml vor und starten Sie die Applikation neu." - text_repository_usernames_mapping: "Bitte legen Sie die Zuordnung der Redmine-Benutzer zu den Benutzernamen der Commit-Log-Meldungen des Projektarchivs fest.\nBenutzer mit identischen Redmine- und Projektarchiv-Benutzernamen oder -E-Mail-Adressen werden automatisch zugeordnet." + text_repository_usernames_mapping: "Bitte legen Sie die Zuordnung der ChiliProject-Benutzer zu den Benutzernamen der Commit-Log-Meldungen des Projektarchivs fest.\nBenutzer mit identischen ChiliProject- und Projektarchiv-Benutzernamen oder -E-Mail-Adressen werden automatisch zugeordnet." text_diff_truncated: '... Dieser Diff wurde abgeschnitten, weil er die maximale Anzahl anzuzeigender Zeilen überschreitet.' text_custom_field_possible_values_info: 'Eine Zeile pro Wert' text_wiki_page_destroy_question: "Diese Seite hat %{descendants} Unterseite(n). Was möchten Sie tun?" @@ -1000,3 +1000,4 @@ de: description_date_range_interval: Zeitraum durch Start- und Enddatum festlegen description_date_from: Startdatum eintragen description_date_to: Enddatum eintragen + field_custom_filter: Custom LDAP filter diff --git a/config/locales/el.yml b/config/locales/el.yml index 04484edd..c263231c 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -801,7 +801,7 @@ el: text_enumeration_destroy_question: "%{count} αντικείμενα έχουν τεθεί σε αυτή την τιμή." text_enumeration_category_reassign_to: 'Επανεκχώρηση τους στην παρούσα αξία:' text_email_delivery_not_configured: "Δεν έχουν γίνει ρυθμίσεις παράδοσης email, και οι ειδοποιήσεις είναι απενεργοποιημένες.\nΔηλώστε τον εξυπηρετητή SMTP στο config/configuration.yml και κάντε επανακκίνηση την εφαρμογή για να τις ρυθμίσεις." - text_repository_usernames_mapping: "Επιλέξτε ή ενημερώστε τον χρήστη Redmine που αντιστοιχεί σε κάθε όνομα χρήστη στο ιστορικό του αποθετηρίου.\nΧρήστες με το ίδιο όνομα χρήστη ή email στο Redmine και στο αποθετηρίο αντιστοιχίζονται αυτόματα." + text_repository_usernames_mapping: "Επιλέξτε ή ενημερώστε τον χρήστη ChiliProject που αντιστοιχεί σε κάθε όνομα χρήστη στο ιστορικό του αποθετηρίου.\nΧρήστες με το ίδιο όνομα χρήστη ή email στο ChiliProject και στο αποθετηρίο αντιστοιχίζονται αυτόματα." text_diff_truncated: '... Αυτό το diff εχεί κοπεί επειδή υπερβαίνει το μέγιστο μέγεθος που μπορεί να προβληθεί.' text_custom_field_possible_values_info: 'Μία γραμμή για κάθε τιμή' text_wiki_page_destroy_question: "Αυτή η σελίδα έχει %{descendants} σελίδες τέκνων και απογόνων. Τι θέλετε να κάνετε ;" @@ -983,3 +983,4 @@ el: description_choose_project: Projects description_date_from: Enter start date label_deleted_custom_field: (deleted custom field) + field_custom_filter: Custom LDAP filter diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index 84772faa..258d9a3f 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -912,7 +912,7 @@ en-GB: text_enumeration_destroy_question: "%{count} objects are assigned to this value." text_enumeration_category_reassign_to: 'Reassign them to this value:' text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/configuration.yml and restart the application to enable them." - text_repository_usernames_mapping: "Select or update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped." + text_repository_usernames_mapping: "Select or update the ChiliProject user mapped to each username found in the repository log.\nUsers with the same ChiliProject and repository username or email are automatically mapped." text_diff_truncated: '... This diff was truncated because it exceeds the maximum size that can be displayed.' text_custom_field_possible_values_info: 'One line for each value' text_wiki_page_destroy_question: "This page has %{descendants} child page(s) and descendant(s). What do you want to do?" @@ -987,3 +987,4 @@ en-GB: description_choose_project: Projects description_date_from: Enter start date label_deleted_custom_field: (deleted custom field) + field_custom_filter: Custom LDAP filter diff --git a/config/locales/en.yml b/config/locales/en.yml index 8560fc8f..f2281b20 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -307,6 +307,7 @@ en: field_text: Text field field_visible: Visible field_warn_on_leaving_unsaved: "Warn me when leaving a page with unsaved text" + field_custom_filter: Custom LDAP filter setting_app_title: Application title setting_app_subtitle: Application subtitle @@ -921,7 +922,7 @@ en: text_enumeration_destroy_question: "%{count} objects are assigned to this value." text_enumeration_category_reassign_to: 'Reassign them to this value:' text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/configuration.yml and restart the application to enable them." - text_repository_usernames_mapping: "Select or update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped." + text_repository_usernames_mapping: "Select or update the ChiliProject user mapped to each username found in the repository log.\nUsers with the same ChiliProject and repository username or email are automatically mapped." text_diff_truncated: '... This diff was truncated because it exceeds the maximum size that can be displayed.' text_custom_field_possible_values_info: 'One line for each value' text_wiki_page_destroy_question: "This page has %{descendants} child page(s) and descendant(s). What do you want to do?" diff --git a/config/locales/es.yml b/config/locales/es.yml index 57792641..2f70a467 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -1,6 +1,6 @@ # Spanish translations for Rails # by Francisco Fernando García Nieto (ffgarcianieto@gmail.com) -# Redmine spanish translation: +# ChiliProject spanish translation: # by J. Cayetano Delgado (Cayetano _dot_ Delgado _at_ ioko _dot_ com) es: @@ -818,7 +818,7 @@ es: text_project_identifier_info: 'Only lower case letters (a-z), numbers, dashes and underscores are allowed.
Once saved, the identifier can not be changed.' text_reassign_time_entries: 'Reasignar las horas a esta petición:' text_regexp_info: ej. ^[A-Z0-9]+$ - text_repository_usernames_mapping: "Establezca la correspondencia entre los usuarios de Redmine y los presentes en el log del repositorio.\nLos usuarios con el mismo nombre o correo en Redmine y en el repositorio serán asociados automáticamente." + text_repository_usernames_mapping: "Establezca la correspondencia entre los usuarios de ChiliProject y los presentes en el log del repositorio.\nLos usuarios con el mismo nombre o correo en ChiliProject y en el repositorio serán asociados automáticamente." text_rmagick_available: RMagick disponible (opcional) text_select_mail_notifications: Seleccionar los eventos a notificar text_select_project_modules: 'Seleccione los módulos a activar para este proyecto:' @@ -1020,3 +1020,4 @@ es: description_choose_project: Projects description_date_from: Enter start date label_deleted_custom_field: (deleted custom field) + field_custom_filter: Custom LDAP filter diff --git a/config/locales/eu.yml b/config/locales/eu.yml index c853b62c..e7cb35bc 100644 --- a/config/locales/eu.yml +++ b/config/locales/eu.yml @@ -1,7 +1,7 @@ -# Redmine EU language +# ChiliProject EU language # Author: Ales Zabala Alava (Shagi), # 2010-01-25 -# Distributed under the same terms as the Redmine itself. +# Distributed under the same terms as the ChiliProject itself. eu: direction: ltr date: @@ -862,7 +862,7 @@ eu: text_enumeration_destroy_question: "%{count} objetu balio honetara esleituta daude." text_enumeration_category_reassign_to: 'Beste balio honetara esleitu:' text_email_delivery_not_configured: "Eposta bidalketa ez dago konfiguratuta eta jakinarazpenak ezgaituta daude.\nKonfiguratu zure SMTP zerbitzaria config/configuration.yml-n eta aplikazioa berrabiarazi hauek gaitzeko." - text_repository_usernames_mapping: "Hautatu edo eguneratu Redmineko erabiltzailea biltegiko egunkarietan topatzen diren erabiltzaile izenekin erlazionatzeko.\nRedmine-n eta biltegian erabiltzaile izen edo eposta berdina duten erabiltzaileak automatikoki erlazionatzen dira." + text_repository_usernames_mapping: "Hautatu edo eguneratu ChiliProjectko erabiltzailea biltegiko egunkarietan topatzen diren erabiltzaile izenekin erlazionatzeko.\nChiliProject-n eta biltegian erabiltzaile izen edo eposta berdina duten erabiltzaileak automatikoki erlazionatzen dira." text_diff_truncated: '... Diff hau moztua izan da erakus daitekeen tamaina maximoa gainditu duelako.' text_custom_field_possible_values_info: 'Lerro bat balio bakoitzeko' text_wiki_page_destroy_question: "Orri honek %{descendants} orri seme eta ondorengo ditu. Zer egin nahi duzu?" @@ -987,3 +987,4 @@ eu: description_choose_project: Projects description_date_from: Enter start date label_deleted_custom_field: (deleted custom field) + field_custom_filter: Custom LDAP filter diff --git a/config/locales/fa.yml b/config/locales/fa.yml index cab17df4..4cc99a89 100644 --- a/config/locales/fa.yml +++ b/config/locales/fa.yml @@ -901,7 +901,7 @@ fa: text_enumeration_destroy_question: "%{count} داده به این برشمردنی وابسته شده‌اند." text_enumeration_category_reassign_to: 'به این برشمردنی وابسته شوند:' text_email_delivery_not_configured: "دریافت ایمیل پیکربندی نشده است و آگاه‌سازی‌ها غیر فعال هستند.\nکارگزار SMTP خود را در config/email.yml پیکربندی کنید و برنامه را بازنشانی کنید تا فعال شوند." - text_repository_usernames_mapping: "کاربر Redmine که به هر نام کاربری پیام‌های انباره نگاشت می‌شود را برگزینید.\nکاربرانی که نام کاربری یا ایمیل همسان دارند، خود به خود نگاشت می‌شوند." + text_repository_usernames_mapping: "کاربر ChiliProject که به هر نام کاربری پیام‌های انباره نگاشت می‌شود را برگزینید.\nکاربرانی که نام کاربری یا ایمیل همسان دارند، خود به خود نگاشت می‌شوند." text_diff_truncated: '... این تفاوت بریده شده چون بیشتر از بیشترین اندازه نمایش دادنی است.' text_custom_field_possible_values_info: 'یک خط برای هر مقدار' text_wiki_page_destroy_question: "این برگه %{descendants} زیربرگه دارد.می‌خواهید چه کنید؟" @@ -986,3 +986,4 @@ fa: description_choose_project: Projects description_date_from: Enter start date label_deleted_custom_field: (deleted custom field) + field_custom_filter: Custom LDAP filter diff --git a/config/locales/fi.yml b/config/locales/fi.yml index a4be9a38..d7cda5f5 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -812,7 +812,7 @@ fi: permission_edit_own_issue_notes: Muokkaa omia muistiinpanoja setting_gravatar_enabled: Käytä Gravatar käyttäjä ikoneita label_example: Esimerkki - text_repository_usernames_mapping: "Valitse päivittääksesi Redmine käyttäjä jokaiseen käyttäjään joka löytyy tietovaraston lokista.\nKäyttäjät joilla on sama Redmine ja tietovaraston käyttäjänimi tai sähköpostiosoite, yhdistetään automaattisesti." + text_repository_usernames_mapping: "Valitse päivittääksesi ChiliProject käyttäjä jokaiseen käyttäjään joka löytyy tietovaraston lokista.\nKäyttäjät joilla on sama ChiliProject ja tietovaraston käyttäjänimi tai sähköpostiosoite, yhdistetään automaattisesti." permission_edit_own_messages: Muokkaa omia viestejä permission_delete_own_messages: Poista omia viestejä label_user_activity: "Käyttäjän %{value} historia" @@ -1004,3 +1004,4 @@ fi: description_choose_project: Projects description_date_from: Enter start date label_deleted_custom_field: (deleted custom field) + field_custom_filter: Custom LDAP filter diff --git a/config/locales/fr.yml b/config/locales/fr.yml index b3a38b9d..3e767836 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -893,7 +893,7 @@ fr: text_enumeration_destroy_question: "Cette valeur est affectée à %{count} objets." text_enumeration_category_reassign_to: 'Réaffecter les objets à cette valeur:' text_email_delivery_not_configured: "L'envoi de mail n'est pas configuré, les notifications sont désactivées.\nConfigurez votre serveur SMTP dans config/configuration.yml et redémarrez l'application pour les activer." - text_repository_usernames_mapping: "Vous pouvez sélectionner ou modifier l'utilisateur Redmine associé à chaque nom d'utilisateur figurant dans l'historique du dépôt.\nLes utilisateurs avec le même identifiant ou la même adresse mail seront automatiquement associés." + text_repository_usernames_mapping: "Vous pouvez sélectionner ou modifier l'utilisateur ChiliProject associé à chaque nom d'utilisateur figurant dans l'historique du dépôt.\nLes utilisateurs avec le même identifiant ou la même adresse mail seront automatiquement associés." text_diff_truncated: '... Ce différentiel a été tronqué car il excède la taille maximale pouvant être affichée.' text_custom_field_possible_values_info: 'Une ligne par valeur' text_wiki_page_destroy_question: "Cette page possède %{descendants} sous-page(s) et descendante(s). Que voulez-vous faire ?" @@ -1001,3 +1001,4 @@ fr: description_filter: Filter description_choose_project: Projects description_date_from: Enter start date + field_custom_filter: Custom LDAP filter diff --git a/config/locales/gl.yml b/config/locales/gl.yml index 061af18b..89e05b4f 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -795,7 +795,7 @@ gl: text_project_identifier_info: 'Only lower case letters (a-z), numbers, dashes and underscores are allowed.
Once saved, the identifier can not be changed.' text_reassign_time_entries: 'Reasignar as horas a esta petición:' text_regexp_info: ex. ^[A-Z0-9]+$ - text_repository_usernames_mapping: "Estableza a correspondencia entre os usuarios de Redmine e os presentes no log do repositorio.\nOs usuarios co mesmo nome ou correo en Redmine e no repositorio serán asociados automaticamente." + text_repository_usernames_mapping: "Estableza a correspondencia entre os usuarios de ChiliProject e os presentes no log do repositorio.\nOs usuarios co mesmo nome ou correo en ChiliProject e no repositorio serán asociados automaticamente." text_rmagick_available: RMagick dispoñible (opcional) text_select_mail_notifications: Seleccionar os eventos a notificar text_select_project_modules: 'Seleccione os módulos a activar para este proxecto:' @@ -995,3 +995,4 @@ gl: description_choose_project: Projects description_date_from: Enter start date label_deleted_custom_field: (deleted custom field) + field_custom_filter: Custom LDAP filter diff --git a/config/locales/he.yml b/config/locales/he.yml index 3e6e099d..c938af6c 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -1,4 +1,4 @@ -# Hebrew translation for Redmine +# Hebrew translation for ChiliProject # Initiated by Dotan Nahum (dipidi@gmail.com) # Jul 2010 - Updated by Orgad Shaneh (orgads@gmail.com) @@ -195,9 +195,9 @@ he: warning_attachments_not_saved: "כשלון בשמירת %{count} קבצים." mail_subject_lost_password: "סיסמת ה־%{value} שלך" - mail_body_lost_password: 'לשינו סיסמת ה־Redmine שלך, לחץ על הקישור הבא:' + mail_body_lost_password: 'לשינו סיסמת ה־ChiliProject שלך, לחץ על הקישור הבא:' mail_subject_register: "הפעלת חשבון %{value}" - mail_body_register: 'להפעלת חשבון ה־Redmine שלך, לחץ על הקישור הבא:' + mail_body_register: 'להפעלת חשבון ה־ChiliProject שלך, לחץ על הקישור הבא:' mail_body_account_information_external: "אתה יכול להשתמש בחשבון %{value} כדי להתחבר" mail_body_account_information: פרטי החשבון שלך mail_subject_account_activation_request: "בקשת הפעלה לחשבון %{value}" @@ -891,8 +891,8 @@ he: text_user_wrote: "%{value} כתב:" text_enumeration_destroy_question: "%{count} אוביקטים מוצבים לערך זה." text_enumeration_category_reassign_to: 'הצב מחדש לערך הזה:' - text_email_delivery_not_configured: 'לא נקבעה תצורה לשליחת דואר, וההתראות כבויות.\nקבע את תצורת שרת ה־SMTP בקובץ /etc/redmine/<instance>/configuration.yml והתחל את האפליקציה מחדש ע"מ לאפשר אותם.' - text_repository_usernames_mapping: "בחר או עדכן את משתמש Redmine הממופה לכל שם משתמש ביומן המאגר.\nמשתמשים בעלי שם או כתובת דואר זהה ב־Redmine ובמאגר ממופים באופן אוטומטי." + text_email_delivery_not_configured: 'לא נקבעה תצורה לשליחת דואר, וההתראות כבויות.\nקבע את תצורת שרת ה־SMTP בקובץ /etc/chiliproject/<instance>/configuration.yml והתחל את האפליקציה מחדש ע"מ לאפשר אותם.' + text_repository_usernames_mapping: "בחר או עדכן את משתמש ChiliProject הממופה לכל שם משתמש ביומן המאגר.\nמשתמשים בעלי שם או כתובת דואר זהה ב־ChiliProject ובמאגר ממופים באופן אוטומטי." text_diff_truncated: '... השינויים עוברים את מספר השורות המירבי לתצוגה, ולכן הם קוצצו.' text_custom_field_possible_values_info: שורה אחת לכל ערך text_wiki_page_destroy_question: לדף זה יש %{descendants} דפים בנים ותלויים. מה ברצונך לעשות? @@ -988,3 +988,4 @@ he: description_choose_project: Projects description_date_from: Enter start date label_deleted_custom_field: (deleted custom field) + field_custom_filter: Custom LDAP filter diff --git a/config/locales/hr.yml b/config/locales/hr.yml index 9d793697..e6ec5237 100644 --- a/config/locales/hr.yml +++ b/config/locales/hr.yml @@ -857,7 +857,7 @@ hr: text_enumeration_destroy_question: "%{count} objekata je pridruženo toj vrijednosti." text_enumeration_category_reassign_to: 'Premjesti ih ovoj vrijednosti:' text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/configuration.yml and restart the application to enable them." - text_repository_usernames_mapping: "Select or update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped." + text_repository_usernames_mapping: "Select or update the ChiliProject user mapped to each username found in the repository log.\nUsers with the same ChiliProject and repository username or email are automatically mapped." text_diff_truncated: '... Ovaj diff je odrezan zato što prelazi maksimalnu veličinu koja može biti prikazana.' text_custom_field_possible_values_info: 'One line for each value' text_wiki_page_destroy_question: "This page has %{descendants} child page(s) and descendant(s). What do you want to do?" @@ -990,3 +990,4 @@ hr: description_choose_project: Projects description_date_from: Enter start date label_deleted_custom_field: (deleted custom field) + field_custom_filter: Custom LDAP filter diff --git a/config/locales/hu.yml b/config/locales/hu.yml index e236ffa1..567cce57 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -191,13 +191,13 @@ error_scm_annotate: "A bejegyzés nem létezik, vagy nics jegyzetekkel ellátva." error_issue_not_found_in_project: 'A feladat nem található, vagy nem ehhez a projekthez tartozik' - mail_subject_lost_password: Az Ön Redmine jelszava - mail_body_lost_password: 'A Redmine jelszó megváltoztatásához, kattintson a következő linkre:' - mail_subject_register: Redmine azonosító aktiválása - mail_body_register: 'A Redmine azonosítója aktiválásához, kattintson a következő linkre:' - mail_body_account_information_external: "A %{value} azonosító használatával bejelentkezhet a Redmine-ba." - mail_body_account_information: Az Ön Redmine azonosítójának információi - mail_subject_account_activation_request: Redmine azonosító aktiválási kérelem + mail_subject_lost_password: Az Ön ChiliProject jelszava + mail_body_lost_password: 'A ChiliProject jelszó megváltoztatásához, kattintson a következő linkre:' + mail_subject_register: ChiliProject azonosító aktiválása + mail_body_register: 'A ChiliProject azonosítója aktiválásához, kattintson a következő linkre:' + mail_body_account_information_external: "A %{value} azonosító használatával bejelentkezhet a ChiliProject-ba." + mail_body_account_information: Az Ön ChiliProject azonosítójának információi + mail_subject_account_activation_request: ChiliProject azonosító aktiválási kérelem mail_body_account_activation_request: "Egy új felhasználó (%{value}) regisztrált, azonosítója jóváhasgyásra várakozik:" gui_validation_error: 1 hiba @@ -810,7 +810,7 @@ permission_edit_own_issue_notes: Saját jegyzetek szerkesztése setting_gravatar_enabled: Felhasználói fényképek engedélyezése label_example: Példa - text_repository_usernames_mapping: "Állítsd be a felhasználó összerendeléseket a Redmine, és a tároló logban található felhasználók között.\nAz azonos felhasználó nevek összerendelése automatikusan megtörténik." + text_repository_usernames_mapping: "Állítsd be a felhasználó összerendeléseket a ChiliProject, és a tároló logban található felhasználók között.\nAz azonos felhasználó nevek összerendelése automatikusan megtörténik." permission_edit_own_messages: Saját üzenetek szerkesztése permission_delete_own_messages: Saját üzenetek törlése label_user_activity: "%{value} tevékenységei" @@ -1002,3 +1002,4 @@ description_choose_project: Projects description_date_from: Enter start date label_deleted_custom_field: (deleted custom field) + field_custom_filter: Custom LDAP filter diff --git a/config/locales/id.yml b/config/locales/id.yml index f3ca947d..353df4b5 100644 --- a/config/locales/id.yml +++ b/config/locales/id.yml @@ -836,7 +836,7 @@ id: text_enumeration_destroy_question: "%{count} obyek ditugaskan untuk nilai ini." text_enumeration_category_reassign_to: 'Tugaskan kembali untuk nilai ini:' text_email_delivery_not_configured: "Pengiriman email belum dikonfigurasi, notifikasi tidak diaktifkan.\nAnda harus mengkonfigur SMTP server anda pada config/configuration.yml dan restart kembali aplikasi untuk mengaktifkan." - text_repository_usernames_mapping: "Pilih atau perbarui pengguna Redmine yang terpetakan ke setiap nama pengguna yang ditemukan di log repositori.\nPengguna dengan nama pengguna dan repositori atau email yang sama secara otomasit akan dipetakan." + text_repository_usernames_mapping: "Pilih atau perbarui pengguna ChiliProject yang terpetakan ke setiap nama pengguna yang ditemukan di log repositori.\nPengguna dengan nama pengguna dan repositori atau email yang sama secara otomasit akan dipetakan." text_diff_truncated: '... Perbedaan terpotong karena melebihi batas maksimum yang bisa ditampilkan.' text_custom_field_possible_values_info: 'Satu baris untuk setiap nilai' text_wiki_page_destroy_question: "Halaman ini mempunyai %{descendants} halaman anak dan turunannya. Apa yang akan anda lakukan ?" @@ -991,3 +991,4 @@ id: description_choose_project: Projects description_date_from: Enter start date label_deleted_custom_field: (deleted custom field) + field_custom_filter: Custom LDAP filter diff --git a/config/locales/it.yml b/config/locales/it.yml index 4d3d36c2..0f84d881 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -792,7 +792,7 @@ it: permission_edit_own_issue_notes: Modifica proprie note setting_gravatar_enabled: Usa icone utente Gravatar label_example: Esempio - text_repository_usernames_mapping: "Seleziona per aggiornare la corrispondenza tra gli utenti Redmine e quelli presenti nel log del repository.\nGli utenti Redmine e repository con lo stesso note utente o email sono mappati automaticamente." + text_repository_usernames_mapping: "Seleziona per aggiornare la corrispondenza tra gli utenti ChiliProject e quelli presenti nel log del repository.\nGli utenti ChiliProject e repository con lo stesso note utente o email sono mappati automaticamente." permission_edit_own_messages: Modifica propri messaggi permission_delete_own_messages: Elimina propri messaggi label_user_activity: "attività di %{value}" @@ -984,3 +984,4 @@ it: description_choose_project: Projects description_date_from: Enter start date label_deleted_custom_field: (deleted custom field) + field_custom_filter: Custom LDAP filter diff --git a/config/locales/ja.yml b/config/locales/ja.yml index a674f606..1f3ed5e1 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -928,7 +928,7 @@ ja: text_enumeration_destroy_question: "%{count}個のオブジェクトがこの値に割り当てられています。" text_enumeration_category_reassign_to: '次の値に割り当て直す:' text_email_delivery_not_configured: "メールを送信するために必要な設定が行われていないため、メール通知は利用できません。\nconfig/configuration.ymlでSMTPサーバの設定を行い、アプリケーションを再起動してください。" - text_repository_usernames_mapping: "リポジトリのログから検出されたユーザー名をどのRedmineユーザーに関連づけるのか選択してください。\nログ上のユーザー名またはメールアドレスがRedmineのユーザーと一致する場合は自動的に関連づけられます。" + text_repository_usernames_mapping: "リポジトリのログから検出されたユーザー名をどのChiliProjectユーザーに関連づけるのか選択してください。\nログ上のユーザー名またはメールアドレスがChiliProjectのユーザーと一致する場合は自動的に関連づけられます。" text_diff_truncated: '... 差分の行数が表示可能な上限を超えました。超過分は表示しません。' text_custom_field_possible_values_info: '選択肢の値は1行に1個ずつ記述してください。' text_wiki_page_destroy_question: "この親ページの配下に%{descendants}ページの子孫ページがあります。" @@ -1005,3 +1005,4 @@ ja: description_choose_project: Projects description_date_from: Enter start date label_deleted_custom_field: (deleted custom field) + field_custom_filter: Custom LDAP filter diff --git a/config/locales/ko.yml b/config/locales/ko.yml index 9c57a6d5..7647ba75 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -1035,3 +1035,4 @@ ko: description_choose_project: Projects description_date_from: Enter start date label_deleted_custom_field: (deleted custom field) + field_custom_filter: Custom LDAP filter diff --git a/config/locales/lt.yml b/config/locales/lt.yml index e6bd2b53..a111eabf 100644 --- a/config/locales/lt.yml +++ b/config/locales/lt.yml @@ -1,6 +1,6 @@ # Lithuanian translations for Ruby on Rails # by Laurynas Butkus (laurynas.butkus@gmail.com) -# Redmine translation by Gediminas Muižis gediminas.muizis@gmail.com +# ChiliProject translation by Gediminas Muižis gediminas.muizis@gmail.com # and Sergej Jegorov sergej.jegorov@gmail.com # and Gytis Gurklys gytis.gurklys@gmail.com lt: @@ -888,7 +888,7 @@ lt: text_enumeration_destroy_question: "%{count} objektai priskirti šiai reikšmei." text_enumeration_category_reassign_to: 'Priskirti juos šiai reikšmei:' text_email_delivery_not_configured: "El.pašto siuntimas nesukonfigūruotas, ir perspėjimai neaktyvus.\nSukonfigūruokite savo SMTP serverį byloje config/configuration.yml ir perleiskite programą norėdami pritaikyti pakeitimus." - text_repository_usernames_mapping: "Parinkite ar atnaujinkite Redmine vartotojo vardą kiekvienam saugyklos vardui, kuris paminėtas saugyklos log'e.\nVartotojai, turintys tą patį Redmine ir saugyklos vardą ar el.paštą automatiškai surišti." + text_repository_usernames_mapping: "Parinkite ar atnaujinkite ChiliProject vartotojo vardą kiekvienam saugyklos vardui, kuris paminėtas saugyklos log'e.\nVartotojai, turintys tą patį ChiliProject ir saugyklos vardą ar el.paštą automatiškai surišti." text_diff_truncated: "... Šis diff'as nukarpytas, nes jis viršijo maksimalų rodomą eilučių skaičių." text_custom_field_possible_values_info: 'Po vieną eilutę kiekvienai reikšmei' text_wiki_page_destroy_question: This page has %{descendants} child page(s) and descendant(s). What do you want to do? @@ -1043,3 +1043,4 @@ lt: description_choose_project: Projects description_date_from: Enter start date label_deleted_custom_field: (deleted custom field) + field_custom_filter: Custom LDAP filter diff --git a/config/locales/lv.yml b/config/locales/lv.yml index 29eb0f73..2a7f1618 100644 --- a/config/locales/lv.yml +++ b/config/locales/lv.yml @@ -857,7 +857,7 @@ lv: text_enumeration_destroy_question: "%{count} objekti ir piešķirti šai vērtībai." text_enumeration_category_reassign_to: 'Piešķirt tos šai vērtībai:' text_email_delivery_not_configured: "E-pastu nosūtīšana nav konfigurēta, un ziņojumi ir izslēgti.\nKonfigurējiet savu SMTP serveri datnē config/configuration.yml un pārstartējiet lietotni." - text_repository_usernames_mapping: "Izvēlieties vai atjaunojiet Redmine lietotāju, saistītu ar katru lietotājvārdu, kas atrodams repozitorija žurnālā.\nLietotāji ar to pašu Redmine un repozitorija lietotājvārdu būs saistīti automātiski." + text_repository_usernames_mapping: "Izvēlieties vai atjaunojiet ChiliProject lietotāju, saistītu ar katru lietotājvārdu, kas atrodams repozitorija žurnālā.\nLietotāji ar to pašu ChiliProject un repozitorija lietotājvārdu būs saistīti automātiski." text_diff_truncated: '... Šis diff tika nošķelts, jo tas pārsniedz maksimālo izmēru, ko var parādīt.' text_custom_field_possible_values_info: 'Katra vērtības savā rindā' text_wiki_page_destroy_question: "Šij lapai ir %{descendants} apakšlapa(as) un pēcnācēji. Ko darīt?" @@ -978,3 +978,4 @@ lv: description_choose_project: Projects description_date_from: Enter start date label_deleted_custom_field: (deleted custom field) + field_custom_filter: Custom LDAP filter diff --git a/config/locales/mk.yml b/config/locales/mk.yml index 77063c52..5440a94e 100644 --- a/config/locales/mk.yml +++ b/config/locales/mk.yml @@ -880,7 +880,7 @@ mk: text_enumeration_destroy_question: "%{count} objects are assigned to this value." text_enumeration_category_reassign_to: 'Reassign them to this value:' text_email_delivery_not_configured: "Доставата по е-пошта не е конфигурирана, и известувањата се оневозможени.\nКонфигурирајте го Вашиот SMTP сервер во config/configuration.yml и рестартирајте ја апликацијата." - text_repository_usernames_mapping: "Select or update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped." + text_repository_usernames_mapping: "Select or update the ChiliProject user mapped to each username found in the repository log.\nUsers with the same ChiliProject and repository username or email are automatically mapped." text_diff_truncated: '... This diff was truncated because it exceeds the maximum size that can be displayed.' text_custom_field_possible_values_info: 'One line for each value' text_wiki_page_destroy_question: "This page has %{descendants} child page(s) and descendant(s). What do you want to do?" @@ -983,3 +983,4 @@ mk: description_choose_project: Projects description_date_from: Enter start date label_deleted_custom_field: (deleted custom field) + field_custom_filter: Custom LDAP filter diff --git a/config/locales/mn.yml b/config/locales/mn.yml index d5494c02..e28035c4 100644 --- a/config/locales/mn.yml +++ b/config/locales/mn.yml @@ -984,3 +984,4 @@ mn: description_choose_project: Projects description_date_from: Enter start date label_deleted_custom_field: (deleted custom field) + field_custom_filter: Custom LDAP filter diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 3f070a1f..85a12b4f 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -766,7 +766,7 @@ nl: text_project_identifier_info: 'Alleen kleine letter (a-z), cijfers, streepjes en liggende streepjes zijn toegestaan.
Eenmaal opgeslagen kan de identifier niet worden gewijzigd.' text_reassign_time_entries: 'Gerapporteerde uren opnieuw toewijzen:' text_regexp_info: bv. ^[A-Z0-9]+$ - text_repository_usernames_mapping: "Koppel de Redminegebruikers aan gebruikers in de repository log.\nGebruikers met dezelfde Redmine en repository gebruikersnaam of email worden automatisch gekoppeld." + text_repository_usernames_mapping: "Koppel de ChiliProjectgebruikers aan gebruikers in de repository log.\nGebruikers met dezelfde ChiliProject en repository gebruikersnaam of email worden automatisch gekoppeld." text_rmagick_available: RMagick beschikbaar (optioneel) text_select_mail_notifications: Selecteer acties waarvoor mededelingen via mail moeten worden verstuurd. text_select_project_modules: 'Selecteer de modules die u wilt gebruiken voor dit project:' @@ -965,3 +965,4 @@ nl: description_choose_project: Projects description_date_from: Enter start date label_deleted_custom_field: (deleted custom field) + field_custom_filter: Custom LDAP filter diff --git a/config/locales/no.yml b/config/locales/no.yml index 5df97464..adda841a 100644 --- a/config/locales/no.yml +++ b/config/locales/no.yml @@ -778,7 +778,7 @@ permission_edit_own_issue_notes: Redigere egne notater setting_gravatar_enabled: Bruk Gravatar-brukerikoner label_example: Eksempel - text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped." + text_repository_usernames_mapping: "Select ou update the ChiliProject user mapped to each username found in the repository log.\nUsers with the same ChiliProject and repository username or email are automatically mapped." permission_edit_own_messages: Edit own messages permission_delete_own_messages: Delete own messages label_user_activity: "%{value}'s activity" @@ -970,3 +970,4 @@ description_choose_project: Projects description_date_from: Enter start date label_deleted_custom_field: (deleted custom field) + field_custom_filter: Custom LDAP filter diff --git a/config/locales/pl.yml b/config/locales/pl.yml index d7309ab8..83036445 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -794,7 +794,7 @@ pl: text_project_identifier_info: 'Only lower case letters (a-z), numbers, dashes and underscores are allowed.
Once saved, the identifier can not be changed.' text_reassign_time_entries: 'Przepnij przepracowany czas do tego zagadnienia:' text_regexp_info: np. ^[A-Z0-9]+$ - text_repository_usernames_mapping: "Wybierz lub uaktualnij przyporządkowanie użytkowników Redmine do użytkowników repozytorium.\nUżytkownicy z taką samą nazwą lub adresem email są przyporządkowani automatycznie." + text_repository_usernames_mapping: "Wybierz lub uaktualnij przyporządkowanie użytkowników ChiliProject do użytkowników repozytorium.\nUżytkownicy z taką samą nazwą lub adresem email są przyporządkowani automatycznie." text_rmagick_available: RMagick dostępne (opcjonalnie) text_select_mail_notifications: Zaznacz czynności przy których użytkownik powinien być powiadomiony mailem. text_select_project_modules: 'Wybierz moduły do aktywacji w tym projekcie:' @@ -1000,3 +1000,4 @@ pl: description_choose_project: Projects description_date_from: Enter start date label_deleted_custom_field: (deleted custom field) + field_custom_filter: Custom LDAP filter diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index 3ec28595..72d31b13 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -814,7 +814,7 @@ pt-BR: permission_edit_own_issue_notes: Editar suas próprias notas setting_gravatar_enabled: Usar ícones do Gravatar label_example: Exemplo - text_repository_usernames_mapping: "Seleciona ou atualiza os usuários do Redmine mapeando para cada usuário encontrado no log do repositório.\nUsuários com o mesmo login ou e-mail no Redmine e no repositório serão mapeados automaticamente." + text_repository_usernames_mapping: "Seleciona ou atualiza os usuários do ChiliProject mapeando para cada usuário encontrado no log do repositório.\nUsuários com o mesmo login ou e-mail no ChiliProject e no repositório serão mapeados automaticamente." permission_edit_own_messages: Editar próprias mensagens permission_delete_own_messages: Excluir próprias mensagens label_user_activity: "Atividade de %{value}" @@ -990,20 +990,21 @@ pt-BR: label_diff: diff description_search: Searchfield - description_user_mail_notification: Mail notification settings - description_date_range_list: Choose range from list - description_date_to: Enter end date + description_user_mail_notification: Configuração de notificações por e-mail + description_date_range_list: Escolha um período a partira da lista + description_date_to: Digite a data final description_query_sort_criteria_attribute: Sort attribute - description_message_content: Message content - description_wiki_subpages_reassign: Choose new parent page - description_available_columns: Available Columns - description_selected_columns: Selected Columns - description_date_range_interval: Choose range by selecting start and end date - description_project_scope: Search scope - description_issue_category_reassign: Choose issue category + description_message_content: Conteúdo da mensagem + description_wiki_subpages_reassign: Escolha uma nova página pai + description_available_columns: Colunas disponíveis + description_selected_columns: Colunas selecionadas + description_date_range_interval: Escolha um período selecionando a data de início e fim + description_project_scope: Escopo da pesquisa + description_issue_category_reassign: Escolha uma categoria de tarefas description_query_sort_criteria_direction: Sort direction - description_notes: Notes - description_filter: Filter - description_choose_project: Projects - description_date_from: Enter start date - label_deleted_custom_field: (deleted custom field) + description_notes: Notas + description_filter: Filtro + description_choose_project: Projetos + description_date_from: Digita a data inicial + label_deleted_custom_field: (campo personalizado excluído) + field_custom_filter: Custom LDAP filter diff --git a/config/locales/pt.yml b/config/locales/pt.yml index 708d8703..5a85439e 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -795,7 +795,7 @@ pt: permission_edit_own_issue_notes: Editar as prórpias notas setting_gravatar_enabled: Utilizar ícones Gravatar label_example: Exemplo - text_repository_usernames_mapping: "Seleccionar ou actualizar o utilizador de Redmine mapeado a cada nome de utilizador encontrado no repositório.\nUtilizadores com o mesmo nome de utilizador ou email no Redmine e no repositório são mapeados automaticamente." + text_repository_usernames_mapping: "Seleccionar ou actualizar o utilizador de ChiliProject mapeado a cada nome de utilizador encontrado no repositório.\nUtilizadores com o mesmo nome de utilizador ou email no ChiliProject e no repositório são mapeados automaticamente." permission_edit_own_messages: Editar as próprias mensagens permission_delete_own_messages: Apagar as próprias mensagens label_user_activity: "Actividade de %{value}" @@ -987,3 +987,4 @@ pt: description_choose_project: Projects description_date_from: Enter start date label_deleted_custom_field: (deleted custom field) + field_custom_filter: Custom LDAP filter diff --git a/config/locales/ro.yml b/config/locales/ro.yml index 693e3a02..37623bc0 100644 --- a/config/locales/ro.yml +++ b/config/locales/ro.yml @@ -777,7 +777,7 @@ ro: text_enumeration_destroy_question: "Această valoare are %{count} obiecte." text_enumeration_category_reassign_to: 'Atribuie la această valoare:' text_email_delivery_not_configured: "Trimiterea de emailuri nu este configurată și ca urmare, notificările sunt dezactivate.\nConfigurați serverul SMTP în config/configuration.yml și reporniți aplicația pentru a le activa." - text_repository_usernames_mapping: "Selectați sau modificați contul Redmine echivalent contului din istoricul depozitului.\nUtilizatorii cu un cont (sau e-mail) identic în Redmine și depozit sunt echivalate automat." + text_repository_usernames_mapping: "Selectați sau modificați contul ChiliProject echivalent contului din istoricul depozitului.\nUtilizatorii cu un cont (sau e-mail) identic în ChiliProject și depozit sunt echivalate automat." text_diff_truncated: '... Comparația a fost trunchiată pentru ca depășește lungimea maximă de text care poate fi afișat.' text_custom_field_possible_values_info: 'O linie pentru fiecare valoare' @@ -976,3 +976,4 @@ ro: description_choose_project: Projects description_date_from: Enter start date label_deleted_custom_field: (deleted custom field) + field_custom_filter: Custom LDAP filter diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 3c2570c9..ebd712c4 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -940,7 +940,7 @@ ru: text_project_identifier_info: 'Only lower case letters (a-z), numbers, dashes and underscores are allowed.
Once saved, the identifier can not be changed.' text_reassign_time_entries: 'Перенести зарегистрированное время на следующую задачу:' text_regexp_info: "например: ^[A-Z0-9]+$" - text_repository_usernames_mapping: "Выберите или обновите пользователя Redmine, связанного с найденными именами в журнале хранилища.\nПользователи с одинаковыми именами или email в Redmine и хранилище связываются автоматически." + text_repository_usernames_mapping: "Выберите или обновите пользователя ChiliProject, связанного с найденными именами в журнале хранилища.\nПользователи с одинаковыми именами или email в ChiliProject и хранилище связываются автоматически." text_rmagick_available: Доступно использование RMagick (опционально) text_select_mail_notifications: Выберите действия, при которых будет отсылаться уведомление на электронную почту. text_select_project_modules: 'Выберите модули, которые будут использованы в проекте:' @@ -1096,3 +1096,4 @@ ru: description_choose_project: Projects description_date_from: Enter start date label_deleted_custom_field: (deleted custom field) + field_custom_filter: Custom LDAP filter diff --git a/config/locales/sk.yml b/config/locales/sk.yml index b8860953..638f4729 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -786,7 +786,7 @@ sk: setting_gravatar_enabled: Použitie užívateľských Gravatar ikon permission_edit_own_messages: Úprava vlastných správ permission_delete_own_messages: Mazanie vlastných správ - text_repository_usernames_mapping: "Vyberte alebo upravte mapovanie medzi užívateľmi systému Redmine a užívateľskými menami nájdenými v logu repozitára.\nUžívatelia s rovnakým prihlasovacím menom alebo emailom v systéme Redmine a repozitára sú mapovaní automaticky." + text_repository_usernames_mapping: "Vyberte alebo upravte mapovanie medzi užívateľmi systému ChiliProject a užívateľskými menami nájdenými v logu repozitára.\nUžívatelia s rovnakým prihlasovacím menom alebo emailom v systéme ChiliProject a repozitára sú mapovaní automaticky." label_example: Príklad label_user_activity: "Aktivita užívateľa %{value}" label_updated_time_by: "Aktualizované užívateľom %{author} pred %{age}" @@ -978,3 +978,4 @@ sk: description_choose_project: Projects description_date_from: Enter start date label_deleted_custom_field: (deleted custom field) + field_custom_filter: Custom LDAP filter diff --git a/config/locales/sl.yml b/config/locales/sl.yml index 06a8cae1..cce87fdf 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -764,7 +764,7 @@ sl: text_enumeration_destroy_question: "%{count} objektov je določenih tej vrednosti." text_enumeration_category_reassign_to: 'Ponastavi jih na to vrednost:' text_email_delivery_not_configured: "E-poštna dostava ni nastavljena in oznanila so onemogočena.\nNastavite vaš SMTP strežnik v config/configuration.yml in ponovno zaženite aplikacijo da ga omogočite.\n" - text_repository_usernames_mapping: "Izberite ali posodobite Redmine uporabnika dodeljenega vsakemu uporabniškemu imenu najdenemu v zapisniku shrambe.\n Uporabniki z enakim Redmine ali shrambinem uporabniškem imenu ali e-poštnem naslovu so samodejno dodeljeni." + text_repository_usernames_mapping: "Izberite ali posodobite ChiliProject uporabnika dodeljenega vsakemu uporabniškemu imenu najdenemu v zapisniku shrambe.\n Uporabniki z enakim ChiliProject ali shrambinem uporabniškem imenu ali e-poštnem naslovu so samodejno dodeljeni." text_diff_truncated: '... Ta sprememba je bila odsekana ker presega največjo velikost ki je lahko prikazana.' default_role_manager: Upravnik @@ -979,3 +979,4 @@ sl: description_choose_project: Projects description_date_from: Enter start date label_deleted_custom_field: (deleted custom field) + field_custom_filter: Custom LDAP filter diff --git a/config/locales/sr-YU.yml b/config/locales/sr-YU.yml index a22625f9..11c305ae 100644 --- a/config/locales/sr-YU.yml +++ b/config/locales/sr-YU.yml @@ -1,4 +1,4 @@ -# Serbian translations for Redmine +# Serbian translations for ChiliProject # by Vladimir Medarović (vlada@medarovic.com) sr-YU: direction: ltr @@ -877,7 +877,7 @@ sr-YU: text_enumeration_destroy_question: "%{count} objekat(a) je dodeljeno ovoj vrednosti." text_enumeration_category_reassign_to: 'Dodeli ih ponovo ovoj vrednosti:' text_email_delivery_not_configured: "Isporuka e-poruka nije konfigurisana i obaveštenja su onemogućena.\nPodesite vaš SMTP server u config/configuration.yml i pokrenite ponovo aplikaciju za njihovo omogućavanje." - text_repository_usernames_mapping: "Odaberite ili ažurirajte Redmine korisnike mapiranjem svakog korisničkog imena pronađenog u evidenciji spremišta.\nKorisnici sa istim Redmine imenom i imenom spremišta ili e-adresom su automatski mapirani." + text_repository_usernames_mapping: "Odaberite ili ažurirajte ChiliProject korisnike mapiranjem svakog korisničkog imena pronađenog u evidenciji spremišta.\nKorisnici sa istim ChiliProject imenom i imenom spremišta ili e-adresom su automatski mapirani." text_diff_truncated: '... Ova razlika je isečena jer je dostignuta maksimalna veličina prikaza.' text_custom_field_possible_values_info: 'Jedan red za svaku vrednost' text_wiki_page_destroy_question: "Ova stranica ima %{descendants} podređenih stranica i podstranica. Šta želite da uradite?" @@ -983,3 +983,4 @@ sr-YU: description_choose_project: Projects description_date_from: Enter start date label_deleted_custom_field: (deleted custom field) + field_custom_filter: Custom LDAP filter diff --git a/config/locales/sr.yml b/config/locales/sr.yml index de5eb8dd..c32682ed 100644 --- a/config/locales/sr.yml +++ b/config/locales/sr.yml @@ -1,4 +1,4 @@ -# Serbian translations for Redmine +# Serbian translations for ChiliProject # by Vladimir Medarović (vlada@medarovic.com) sr: direction: ltr @@ -877,7 +877,7 @@ sr: text_enumeration_destroy_question: "%{count} објекат(а) је додељено овој вредности." text_enumeration_category_reassign_to: 'Додели их поново овој вредности:' text_email_delivery_not_configured: "Испорука е-порука није конфигурисана и обавештења су онемогућена.\nПодесите ваш SMTP сервер у config/configuration.yml и покрените поново апликацију за њихово омогућавање." - text_repository_usernames_mapping: "Одаберите или ажурирајте Redmine кориснике мапирањем сваког корисничког имена пронађеног у евиденцији спремишта.\nКорисници са истим Redmine именом и именом спремишта или е-адресом су аутоматски мапирани." + text_repository_usernames_mapping: "Одаберите или ажурирајте ChiliProject кориснике мапирањем сваког корисничког имена пронађеног у евиденцији спремишта.\nКорисници са истим ChiliProject именом и именом спремишта или е-адресом су аутоматски мапирани." text_diff_truncated: '... Ова разлика је исечена јер је достигнута максимална величина приказа.' text_custom_field_possible_values_info: 'Један ред за сваку вредност' text_wiki_page_destroy_question: "Ова страница има %{descendants} подређених страница и подстраница. Шта желите да урадите?" @@ -984,3 +984,4 @@ sr: description_choose_project: Projects description_date_from: Enter start date label_deleted_custom_field: (deleted custom field) + field_custom_filter: Custom LDAP filter diff --git a/config/locales/sv.yml b/config/locales/sv.yml index c5d54652..bc8a6bca 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -945,7 +945,7 @@ sv: text_enumeration_destroy_question: "%{count} objekt är tilldelade till detta värde." text_enumeration_category_reassign_to: 'Återtilldela till detta värde:' text_email_delivery_not_configured: "Mailfunktionen har inte konfigurerats, och notifieringar via mail kan därför inte skickas.\nKonfigurera din SMTP-server i config/configuration.yml och starta om applikationen för att aktivera dem." - text_repository_usernames_mapping: "Välj eller uppdatera den Redmine-användare som är mappad till varje användarnamn i versionarkivloggen.\nAnvändare med samma användarnamn eller mailadress i både Redmine och versionsarkivet mappas automatiskt." + text_repository_usernames_mapping: "Välj eller uppdatera den ChiliProject-användare som är mappad till varje användarnamn i versionarkivloggen.\nAnvändare med samma användarnamn eller mailadress i både ChiliProject och versionsarkivet mappas automatiskt." text_diff_truncated: '... Denna diff har förminskats eftersom den överskrider den maximala storlek som kan visas.' text_custom_field_possible_values_info: 'Ett värde per rad' text_wiki_page_destroy_question: "Denna sida har %{descendants} underliggande sidor. Vad vill du göra?" @@ -1025,3 +1025,4 @@ sv: description_choose_project: Projects description_date_from: Enter start date label_deleted_custom_field: (deleted custom field) + field_custom_filter: Custom LDAP filter diff --git a/config/locales/th.yml b/config/locales/th.yml index 45e92683..2cb9bdd4 100644 --- a/config/locales/th.yml +++ b/config/locales/th.yml @@ -788,7 +788,7 @@ th: permission_edit_own_issue_notes: Edit own notes setting_gravatar_enabled: Use Gravatar user icons label_example: Example - text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped." + text_repository_usernames_mapping: "Select ou update the ChiliProject user mapped to each username found in the repository log.\nUsers with the same ChiliProject and repository username or email are automatically mapped." permission_edit_own_messages: Edit own messages permission_delete_own_messages: Delete own messages label_user_activity: "%{value}'s activity" @@ -980,3 +980,4 @@ th: description_choose_project: Projects description_date_from: Enter start date label_deleted_custom_field: (deleted custom field) + field_custom_filter: Custom LDAP filter diff --git a/config/locales/tr.yml b/config/locales/tr.yml index ab5c585a..d2d25e36 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -810,7 +810,7 @@ tr: permission_edit_own_issue_notes: Edit own notes setting_gravatar_enabled: Use Gravatar user icons label_example: Example - text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped." + text_repository_usernames_mapping: "Select ou update the ChiliProject user mapped to each username found in the repository log.\nUsers with the same ChiliProject and repository username or email are automatically mapped." permission_edit_own_messages: Edit own messages permission_delete_own_messages: Delete own messages label_user_activity: "%{value}'s activity" @@ -1002,3 +1002,4 @@ tr: description_choose_project: Projects description_date_from: Enter start date label_deleted_custom_field: (deleted custom field) + field_custom_filter: Custom LDAP filter diff --git a/config/locales/uk.yml b/config/locales/uk.yml index bb1074bd..a3e5168d 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -787,7 +787,7 @@ uk: permission_edit_own_issue_notes: Edit own notes setting_gravatar_enabled: Use Gravatar user icons label_example: Example - text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped." + text_repository_usernames_mapping: "Select ou update the ChiliProject user mapped to each username found in the repository log.\nUsers with the same ChiliProject and repository username or email are automatically mapped." permission_edit_own_messages: Edit own messages permission_delete_own_messages: Delete own messages label_user_activity: "%{value}'s activity" @@ -979,3 +979,4 @@ uk: description_choose_project: Projects description_date_from: Enter start date label_deleted_custom_field: (deleted custom field) + field_custom_filter: Custom LDAP filter diff --git a/config/locales/vi.yml b/config/locales/vi.yml index c9d39ab5..6b4c7b55 100644 --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@ -1034,3 +1034,4 @@ vi: description_choose_project: Projects description_date_from: Enter start date label_deleted_custom_field: (deleted custom field) + field_custom_filter: Custom LDAP filter diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index a5700fa2..002bee22 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -272,13 +272,13 @@ error_unable_to_connect: "無法連線至（%{value}）" warning_attachments_not_saved: "%{count} 個附加檔案無法被儲存。" - mail_subject_lost_password: 您的 Redmine 網站密碼 - mail_body_lost_password: '欲變更您的 Redmine 網站密碼, 請點選以下鏈結:' - mail_subject_register: 啟用您的 Redmine 帳號 - mail_body_register: '欲啟用您的 Redmine 帳號, 請點選以下鏈結:' - mail_body_account_information_external: "您可以使用 %{value} 帳號登入 Redmine 網站。" - mail_body_account_information: 您的 Redmine 帳號資訊 - mail_subject_account_activation_request: Redmine 帳號啟用需求通知 + mail_subject_lost_password: 您的 ChiliProject 網站密碼 + mail_body_lost_password: '欲變更您的 ChiliProject 網站密碼, 請點選以下鏈結:' + mail_subject_register: 啟用您的 ChiliProject 帳號 + mail_body_register: '欲啟用您的 ChiliProject 帳號, 請點選以下鏈結:' + mail_body_account_information_external: "您可以使用 %{value} 帳號登入 ChiliProject 網站。" + mail_body_account_information: 您的 ChiliProject 帳號資訊 + mail_subject_account_activation_request: ChiliProject 帳號啟用需求通知 mail_body_account_activation_request: "有位新用戶 (%{value}) 已經完成註冊，正等候您的審核：" mail_subject_reminder: "您有 %{count} 個項目即將到期 (%{days})" mail_body_reminder: "%{count} 個指派給您的項目，將於 %{days} 天之內到期：" @@ -984,8 +984,8 @@ text_user_wrote: "%{value} 先前提到:" text_enumeration_destroy_question: "目前有 %{count} 個物件使用此列舉值。" text_enumeration_category_reassign_to: '重新設定其列舉值為：' - text_email_delivery_not_configured: "您尚未設定電子郵件傳送方式，因此提醒選項已被停用。\n請在 config/configuration.yml 中設定 SMTP 之後，重新啟動 Redmine，以啟用電子郵件提醒選項。" - text_repository_usernames_mapping: "選擇或更新 Redmine 使用者與版本庫使用者之對應關係。\n版本庫中之使用者帳號或電子郵件信箱，與 Redmine 設定相同者，將自動產生對應關係。" + text_email_delivery_not_configured: "您尚未設定電子郵件傳送方式，因此提醒選項已被停用。\n請在 config/configuration.yml 中設定 SMTP 之後，重新啟動 ChiliProject，以啟用電子郵件提醒選項。" + text_repository_usernames_mapping: "選擇或更新 ChiliProject 使用者與版本庫使用者之對應關係。\n版本庫中之使用者帳號或電子郵件信箱，與 ChiliProject 設定相同者，將自動產生對應關係。" text_diff_truncated: '... 這份差異已被截短以符合顯示行數之最大值' text_custom_field_possible_values_info: '一列輸入一個值' text_wiki_page_destroy_question: "此頁面包含 %{descendants} 個子頁面及延伸頁面。 請選擇您想要的動作?" @@ -1065,3 +1065,4 @@ description_choose_project: Projects description_date_from: Enter start date label_deleted_custom_field: (deleted custom field) + field_custom_filter: Custom LDAP filter diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 007c772e..9ba28719 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -872,7 +872,7 @@ zh: text_enumeration_category_reassign_to: '将它们关联到新的枚举值：' text_enumeration_destroy_question: "%{count} 个对象被关联到了这个枚举值。" text_email_delivery_not_configured: "邮件参数尚未配置，因此邮件通知功能已被禁用。\n请在config/configuration.yml中配置您的SMTP服务器信息并重新启动以使其生效。" - text_repository_usernames_mapping: "选择或更新与版本库中的用户名对应的Redmine用户。\n版本库中与Redmine中的同名用户将被自动对应。" + text_repository_usernames_mapping: "选择或更新与版本库中的用户名对应的ChiliProject用户。\n版本库中与ChiliProject中的同名用户将被自动对应。" text_diff_truncated: '... 差别内容超过了可显示的最大行数并已被截断' text_custom_field_possible_values_info: '每项数值一行' text_wiki_page_destroy_question: 此页面有 %{descendants} 个子页面和下级页面。您想进行那种操作？ @@ -997,3 +997,4 @@ zh: description_choose_project: Projects description_date_from: Enter start date label_deleted_custom_field: (deleted custom field) + field_custom_filter: Custom LDAP filter diff --git a/config/preinitializer.rb b/config/preinitializer.rb index 41b8d59b..dcbc9607 100644 --- a/config/preinitializer.rb +++ b/config/preinitializer.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/config/routes.rb b/config/routes.rb index 89fb761c..6b77ac28 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/001_setup.rb b/db/migrate/001_setup.rb index d3a9af5b..f3ba80f8 100644 --- a/db/migrate/001_setup.rb +++ b/db/migrate/001_setup.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/002_issue_move.rb b/db/migrate/002_issue_move.rb index 824f6370..90c43670 100644 --- a/db/migrate/002_issue_move.rb +++ b/db/migrate/002_issue_move.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/003_issue_add_note.rb b/db/migrate/003_issue_add_note.rb index 99baba44..a8cced5d 100644 --- a/db/migrate/003_issue_add_note.rb +++ b/db/migrate/003_issue_add_note.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/004_export_pdf.rb b/db/migrate/004_export_pdf.rb index 794b73dd..0a4c7e0f 100644 --- a/db/migrate/004_export_pdf.rb +++ b/db/migrate/004_export_pdf.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/005_issue_start_date.rb b/db/migrate/005_issue_start_date.rb index 196c141f..4b1ade16 100644 --- a/db/migrate/005_issue_start_date.rb +++ b/db/migrate/005_issue_start_date.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/006_calendar_and_activity.rb b/db/migrate/006_calendar_and_activity.rb index 182bf0c7..180e5704 100644 --- a/db/migrate/006_calendar_and_activity.rb +++ b/db/migrate/006_calendar_and_activity.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/007_create_journals.rb b/db/migrate/007_create_journals.rb index 4d0ec918..87d8a0cb 100644 --- a/db/migrate/007_create_journals.rb +++ b/db/migrate/007_create_journals.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/008_create_user_preferences.rb b/db/migrate/008_create_user_preferences.rb index 2e3cd471..44477b97 100644 --- a/db/migrate/008_create_user_preferences.rb +++ b/db/migrate/008_create_user_preferences.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/009_add_hide_mail_pref.rb b/db/migrate/009_add_hide_mail_pref.rb index b43756e2..67542f22 100644 --- a/db/migrate/009_add_hide_mail_pref.rb +++ b/db/migrate/009_add_hide_mail_pref.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/010_create_comments.rb b/db/migrate/010_create_comments.rb index 39a34dba..c00a3b95 100644 --- a/db/migrate/010_create_comments.rb +++ b/db/migrate/010_create_comments.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/011_add_news_comments_count.rb b/db/migrate/011_add_news_comments_count.rb index 78e1fd7a..671f7ecb 100644 --- a/db/migrate/011_add_news_comments_count.rb +++ b/db/migrate/011_add_news_comments_count.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/012_add_comments_permissions.rb b/db/migrate/012_add_comments_permissions.rb index 803bb413..3b881417 100644 --- a/db/migrate/012_add_comments_permissions.rb +++ b/db/migrate/012_add_comments_permissions.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/013_create_queries.rb b/db/migrate/013_create_queries.rb index 50885c5c..10ba2244 100644 --- a/db/migrate/013_create_queries.rb +++ b/db/migrate/013_create_queries.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/014_add_queries_permissions.rb b/db/migrate/014_add_queries_permissions.rb index b6e9b21b..e372c66d 100644 --- a/db/migrate/014_add_queries_permissions.rb +++ b/db/migrate/014_add_queries_permissions.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/015_create_repositories.rb b/db/migrate/015_create_repositories.rb index 46c4ceaa..ad0e16d7 100644 --- a/db/migrate/015_create_repositories.rb +++ b/db/migrate/015_create_repositories.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/016_add_repositories_permissions.rb b/db/migrate/016_add_repositories_permissions.rb index 3abb0e38..0eb95ab1 100644 --- a/db/migrate/016_add_repositories_permissions.rb +++ b/db/migrate/016_add_repositories_permissions.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/017_create_settings.rb b/db/migrate/017_create_settings.rb index 9259a9ca..17f30bde 100644 --- a/db/migrate/017_create_settings.rb +++ b/db/migrate/017_create_settings.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/018_set_doc_and_files_notifications.rb b/db/migrate/018_set_doc_and_files_notifications.rb index 1cd2329e..8e1af174 100644 --- a/db/migrate/018_set_doc_and_files_notifications.rb +++ b/db/migrate/018_set_doc_and_files_notifications.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/019_add_issue_status_position.rb b/db/migrate/019_add_issue_status_position.rb index 504a3a4f..3ec27846 100644 --- a/db/migrate/019_add_issue_status_position.rb +++ b/db/migrate/019_add_issue_status_position.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/020_add_role_position.rb b/db/migrate/020_add_role_position.rb index 0aad25e6..ef689609 100644 --- a/db/migrate/020_add_role_position.rb +++ b/db/migrate/020_add_role_position.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/021_add_tracker_position.rb b/db/migrate/021_add_tracker_position.rb index a23586b8..60c6f990 100644 --- a/db/migrate/021_add_tracker_position.rb +++ b/db/migrate/021_add_tracker_position.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/022_serialize_possibles_values.rb b/db/migrate/022_serialize_possibles_values.rb index 6c71cfa5..13864591 100644 --- a/db/migrate/022_serialize_possibles_values.rb +++ b/db/migrate/022_serialize_possibles_values.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/023_add_tracker_is_in_roadmap.rb b/db/migrate/023_add_tracker_is_in_roadmap.rb index 18e28474..2039da16 100644 --- a/db/migrate/023_add_tracker_is_in_roadmap.rb +++ b/db/migrate/023_add_tracker_is_in_roadmap.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/024_add_roadmap_permission.rb b/db/migrate/024_add_roadmap_permission.rb index 51acd270..f737a26d 100644 --- a/db/migrate/024_add_roadmap_permission.rb +++ b/db/migrate/024_add_roadmap_permission.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/025_add_search_permission.rb b/db/migrate/025_add_search_permission.rb index 665d8c21..c137a0b7 100644 --- a/db/migrate/025_add_search_permission.rb +++ b/db/migrate/025_add_search_permission.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/026_add_repository_login_and_password.rb b/db/migrate/026_add_repository_login_and_password.rb index 4f7018f8..1246d9c6 100644 --- a/db/migrate/026_add_repository_login_and_password.rb +++ b/db/migrate/026_add_repository_login_and_password.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/027_create_wikis.rb b/db/migrate/027_create_wikis.rb index 4fb4c704..8fb3e7ae 100644 --- a/db/migrate/027_create_wikis.rb +++ b/db/migrate/027_create_wikis.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/028_create_wiki_pages.rb b/db/migrate/028_create_wiki_pages.rb index 71188c15..14f98008 100644 --- a/db/migrate/028_create_wiki_pages.rb +++ b/db/migrate/028_create_wiki_pages.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/029_create_wiki_contents.rb b/db/migrate/029_create_wiki_contents.rb index 461081a5..3b2b9a40 100644 --- a/db/migrate/029_create_wiki_contents.rb +++ b/db/migrate/029_create_wiki_contents.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/030_add_projects_feeds_permissions.rb b/db/migrate/030_add_projects_feeds_permissions.rb index fcb11e64..f4846a7e 100644 --- a/db/migrate/030_add_projects_feeds_permissions.rb +++ b/db/migrate/030_add_projects_feeds_permissions.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/031_add_repository_root_url.rb b/db/migrate/031_add_repository_root_url.rb index 103c21bf..caf09c59 100644 --- a/db/migrate/031_add_repository_root_url.rb +++ b/db/migrate/031_add_repository_root_url.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/032_create_time_entries.rb b/db/migrate/032_create_time_entries.rb index 162c7059..4ce258fd 100644 --- a/db/migrate/032_create_time_entries.rb +++ b/db/migrate/032_create_time_entries.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/033_add_timelog_permissions.rb b/db/migrate/033_add_timelog_permissions.rb index 832215c7..9f26b21c 100644 --- a/db/migrate/033_add_timelog_permissions.rb +++ b/db/migrate/033_add_timelog_permissions.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/034_create_changesets.rb b/db/migrate/034_create_changesets.rb index 1ca7a430..59624d70 100644 --- a/db/migrate/034_create_changesets.rb +++ b/db/migrate/034_create_changesets.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/035_create_changes.rb b/db/migrate/035_create_changes.rb index c81088fc..b86d5038 100644 --- a/db/migrate/035_create_changes.rb +++ b/db/migrate/035_create_changes.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/036_add_changeset_commit_date.rb b/db/migrate/036_add_changeset_commit_date.rb index 5dc9154c..2409ac89 100644 --- a/db/migrate/036_add_changeset_commit_date.rb +++ b/db/migrate/036_add_changeset_commit_date.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/037_add_project_identifier.rb b/db/migrate/037_add_project_identifier.rb index 13789ca1..39418e55 100644 --- a/db/migrate/037_add_project_identifier.rb +++ b/db/migrate/037_add_project_identifier.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/038_add_custom_field_is_filter.rb b/db/migrate/038_add_custom_field_is_filter.rb index 23a274c2..6e996e74 100644 --- a/db/migrate/038_add_custom_field_is_filter.rb +++ b/db/migrate/038_add_custom_field_is_filter.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/039_create_watchers.rb b/db/migrate/039_create_watchers.rb index aba923e3..8588b12c 100644 --- a/db/migrate/039_create_watchers.rb +++ b/db/migrate/039_create_watchers.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/040_create_changesets_issues.rb b/db/migrate/040_create_changesets_issues.rb index c400be0f..d4d729e0 100644 --- a/db/migrate/040_create_changesets_issues.rb +++ b/db/migrate/040_create_changesets_issues.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/041_rename_comment_to_comments.rb b/db/migrate/041_rename_comment_to_comments.rb index 4060f7ea..8f7bfecd 100644 --- a/db/migrate/041_rename_comment_to_comments.rb +++ b/db/migrate/041_rename_comment_to_comments.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/042_create_issue_relations.rb b/db/migrate/042_create_issue_relations.rb index 459bd6cf..64f9916f 100644 --- a/db/migrate/042_create_issue_relations.rb +++ b/db/migrate/042_create_issue_relations.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/043_add_relations_permissions.rb b/db/migrate/043_add_relations_permissions.rb index 057cd663..0fbf4038 100644 --- a/db/migrate/043_add_relations_permissions.rb +++ b/db/migrate/043_add_relations_permissions.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/044_set_language_length_to_five.rb b/db/migrate/044_set_language_length_to_five.rb index 0dee342c..b610ab11 100644 --- a/db/migrate/044_set_language_length_to_five.rb +++ b/db/migrate/044_set_language_length_to_five.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/045_create_boards.rb b/db/migrate/045_create_boards.rb index 3b392b49..edf1d9eb 100644 --- a/db/migrate/045_create_boards.rb +++ b/db/migrate/045_create_boards.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/046_create_messages.rb b/db/migrate/046_create_messages.rb index f85eff72..98a24229 100644 --- a/db/migrate/046_create_messages.rb +++ b/db/migrate/046_create_messages.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/047_add_boards_permissions.rb b/db/migrate/047_add_boards_permissions.rb index 71aa7003..b8c3e0fc 100644 --- a/db/migrate/047_add_boards_permissions.rb +++ b/db/migrate/047_add_boards_permissions.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/048_allow_null_version_effective_date.rb b/db/migrate/048_allow_null_version_effective_date.rb index fba8ea2f..5c8d633a 100644 --- a/db/migrate/048_allow_null_version_effective_date.rb +++ b/db/migrate/048_allow_null_version_effective_date.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/049_add_wiki_destroy_page_permission.rb b/db/migrate/049_add_wiki_destroy_page_permission.rb index 452571d9..3ea31eb8 100644 --- a/db/migrate/049_add_wiki_destroy_page_permission.rb +++ b/db/migrate/049_add_wiki_destroy_page_permission.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/050_add_wiki_attachments_permissions.rb b/db/migrate/050_add_wiki_attachments_permissions.rb index 5682844d..14ffcd9d 100644 --- a/db/migrate/050_add_wiki_attachments_permissions.rb +++ b/db/migrate/050_add_wiki_attachments_permissions.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/051_add_project_status.rb b/db/migrate/051_add_project_status.rb index fbbd42c5..32321eaf 100644 --- a/db/migrate/051_add_project_status.rb +++ b/db/migrate/051_add_project_status.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/052_add_changes_revision.rb b/db/migrate/052_add_changes_revision.rb index fa253ac0..5eacaaa6 100644 --- a/db/migrate/052_add_changes_revision.rb +++ b/db/migrate/052_add_changes_revision.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/053_add_changes_branch.rb b/db/migrate/053_add_changes_branch.rb index b738180e..bb2c21ea 100644 --- a/db/migrate/053_add_changes_branch.rb +++ b/db/migrate/053_add_changes_branch.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/054_add_changesets_scmid.rb b/db/migrate/054_add_changesets_scmid.rb index 256634aa..358a99bc 100644 --- a/db/migrate/054_add_changesets_scmid.rb +++ b/db/migrate/054_add_changesets_scmid.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/055_add_repositories_type.rb b/db/migrate/055_add_repositories_type.rb index e9c72965..46de648d 100644 --- a/db/migrate/055_add_repositories_type.rb +++ b/db/migrate/055_add_repositories_type.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/056_add_repositories_changes_permission.rb b/db/migrate/056_add_repositories_changes_permission.rb index a17f08fe..cc98fa78 100644 --- a/db/migrate/056_add_repositories_changes_permission.rb +++ b/db/migrate/056_add_repositories_changes_permission.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/057_add_versions_wiki_page_title.rb b/db/migrate/057_add_versions_wiki_page_title.rb index 31d67a6a..c2e9f949 100644 --- a/db/migrate/057_add_versions_wiki_page_title.rb +++ b/db/migrate/057_add_versions_wiki_page_title.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/058_add_issue_categories_assigned_to_id.rb b/db/migrate/058_add_issue_categories_assigned_to_id.rb index d21bd843..d336c8fb 100644 --- a/db/migrate/058_add_issue_categories_assigned_to_id.rb +++ b/db/migrate/058_add_issue_categories_assigned_to_id.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/059_add_roles_assignable.rb b/db/migrate/059_add_roles_assignable.rb index e74e6a95..1fbdd12a 100644 --- a/db/migrate/059_add_roles_assignable.rb +++ b/db/migrate/059_add_roles_assignable.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/060_change_changesets_committer_limit.rb b/db/migrate/060_change_changesets_committer_limit.rb index 5df83926..03cf0145 100644 --- a/db/migrate/060_change_changesets_committer_limit.rb +++ b/db/migrate/060_change_changesets_committer_limit.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/061_add_roles_builtin.rb b/db/migrate/061_add_roles_builtin.rb index b27d4285..d4af4087 100644 --- a/db/migrate/061_add_roles_builtin.rb +++ b/db/migrate/061_add_roles_builtin.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/062_insert_builtin_roles.rb b/db/migrate/062_insert_builtin_roles.rb index 03d9f91e..aa466c25 100644 --- a/db/migrate/062_insert_builtin_roles.rb +++ b/db/migrate/062_insert_builtin_roles.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/063_add_roles_permissions.rb b/db/migrate/063_add_roles_permissions.rb index 7c709e99..6149d894 100644 --- a/db/migrate/063_add_roles_permissions.rb +++ b/db/migrate/063_add_roles_permissions.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/064_drop_permissions.rb b/db/migrate/064_drop_permissions.rb index fba707a1..07a29df8 100644 --- a/db/migrate/064_drop_permissions.rb +++ b/db/migrate/064_drop_permissions.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/065_add_settings_updated_on.rb b/db/migrate/065_add_settings_updated_on.rb index fd9fb47d..fc747823 100644 --- a/db/migrate/065_add_settings_updated_on.rb +++ b/db/migrate/065_add_settings_updated_on.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/066_add_custom_value_customized_index.rb b/db/migrate/066_add_custom_value_customized_index.rb index f10dfa35..0eed9b36 100644 --- a/db/migrate/066_add_custom_value_customized_index.rb +++ b/db/migrate/066_add_custom_value_customized_index.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/067_create_wiki_redirects.rb b/db/migrate/067_create_wiki_redirects.rb index fdfb0ba9..86e2c126 100644 --- a/db/migrate/067_create_wiki_redirects.rb +++ b/db/migrate/067_create_wiki_redirects.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/068_create_enabled_modules.rb b/db/migrate/068_create_enabled_modules.rb index 1c2115b1..1c558dfb 100644 --- a/db/migrate/068_create_enabled_modules.rb +++ b/db/migrate/068_create_enabled_modules.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/069_add_issues_estimated_hours.rb b/db/migrate/069_add_issues_estimated_hours.rb index 2b1aba24..11af959b 100644 --- a/db/migrate/069_add_issues_estimated_hours.rb +++ b/db/migrate/069_add_issues_estimated_hours.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/070_change_attachments_content_type_limit.rb b/db/migrate/070_change_attachments_content_type_limit.rb index 3b7a79b0..18125af8 100644 --- a/db/migrate/070_change_attachments_content_type_limit.rb +++ b/db/migrate/070_change_attachments_content_type_limit.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/071_add_queries_column_names.rb b/db/migrate/071_add_queries_column_names.rb index 73dc5b29..1edf6e44 100644 --- a/db/migrate/071_add_queries_column_names.rb +++ b/db/migrate/071_add_queries_column_names.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/072_add_enumerations_position.rb b/db/migrate/072_add_enumerations_position.rb index 4bbfd33c..2cd54189 100644 --- a/db/migrate/072_add_enumerations_position.rb +++ b/db/migrate/072_add_enumerations_position.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/073_add_enumerations_is_default.rb b/db/migrate/073_add_enumerations_is_default.rb index 8e0b4167..fbe8e46d 100644 --- a/db/migrate/073_add_enumerations_is_default.rb +++ b/db/migrate/073_add_enumerations_is_default.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/074_add_auth_sources_tls.rb b/db/migrate/074_add_auth_sources_tls.rb index 3299a9ad..2aeb26e9 100644 --- a/db/migrate/074_add_auth_sources_tls.rb +++ b/db/migrate/074_add_auth_sources_tls.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/075_add_members_mail_notification.rb b/db/migrate/075_add_members_mail_notification.rb index 6813b7f3..ade6ba3b 100644 --- a/db/migrate/075_add_members_mail_notification.rb +++ b/db/migrate/075_add_members_mail_notification.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/076_allow_null_position.rb b/db/migrate/076_allow_null_position.rb index c6ac85fb..daa49456 100644 --- a/db/migrate/076_allow_null_position.rb +++ b/db/migrate/076_allow_null_position.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/077_remove_issue_statuses_html_color.rb b/db/migrate/077_remove_issue_statuses_html_color.rb index 3f1472f0..1affdc73 100644 --- a/db/migrate/077_remove_issue_statuses_html_color.rb +++ b/db/migrate/077_remove_issue_statuses_html_color.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/078_add_custom_fields_position.rb b/db/migrate/078_add_custom_fields_position.rb index 2a37451e..e9130f9e 100644 --- a/db/migrate/078_add_custom_fields_position.rb +++ b/db/migrate/078_add_custom_fields_position.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/079_add_user_preferences_time_zone.rb b/db/migrate/079_add_user_preferences_time_zone.rb index a02c53b6..e8ac087a 100644 --- a/db/migrate/079_add_user_preferences_time_zone.rb +++ b/db/migrate/079_add_user_preferences_time_zone.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/080_add_users_type.rb b/db/migrate/080_add_users_type.rb index a9bfbaa0..c0f79f7f 100644 --- a/db/migrate/080_add_users_type.rb +++ b/db/migrate/080_add_users_type.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/081_create_projects_trackers.rb b/db/migrate/081_create_projects_trackers.rb index e23681e2..cbae81de 100644 --- a/db/migrate/081_create_projects_trackers.rb +++ b/db/migrate/081_create_projects_trackers.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/082_add_messages_locked.rb b/db/migrate/082_add_messages_locked.rb index b02b6a3b..d3490aed 100644 --- a/db/migrate/082_add_messages_locked.rb +++ b/db/migrate/082_add_messages_locked.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/083_add_messages_sticky.rb b/db/migrate/083_add_messages_sticky.rb index fee6ec29..f82b167e 100644 --- a/db/migrate/083_add_messages_sticky.rb +++ b/db/migrate/083_add_messages_sticky.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/084_change_auth_sources_account_limit.rb b/db/migrate/084_change_auth_sources_account_limit.rb index 660b9d64..c5b1d949 100644 --- a/db/migrate/084_change_auth_sources_account_limit.rb +++ b/db/migrate/084_change_auth_sources_account_limit.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/085_add_role_tracker_old_status_index_to_workflows.rb b/db/migrate/085_add_role_tracker_old_status_index_to_workflows.rb index 4a36c610..cb02831f 100644 --- a/db/migrate/085_add_role_tracker_old_status_index_to_workflows.rb +++ b/db/migrate/085_add_role_tracker_old_status_index_to_workflows.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/086_add_custom_fields_searchable.rb b/db/migrate/086_add_custom_fields_searchable.rb index fece998d..d64c6d03 100644 --- a/db/migrate/086_add_custom_fields_searchable.rb +++ b/db/migrate/086_add_custom_fields_searchable.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/087_change_projects_description_to_text.rb b/db/migrate/087_change_projects_description_to_text.rb index 409dd2b6..262605f3 100644 --- a/db/migrate/087_change_projects_description_to_text.rb +++ b/db/migrate/087_change_projects_description_to_text.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/088_add_custom_fields_default_value.rb b/db/migrate/088_add_custom_fields_default_value.rb index fbc0abb3..e6a845f1 100644 --- a/db/migrate/088_add_custom_fields_default_value.rb +++ b/db/migrate/088_add_custom_fields_default_value.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/089_add_attachments_description.rb b/db/migrate/089_add_attachments_description.rb index 672f0845..3dbd4a41 100644 --- a/db/migrate/089_add_attachments_description.rb +++ b/db/migrate/089_add_attachments_description.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/090_change_versions_name_limit.rb b/db/migrate/090_change_versions_name_limit.rb index 6951d5ff..3047d989 100644 --- a/db/migrate/090_change_versions_name_limit.rb +++ b/db/migrate/090_change_versions_name_limit.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/091_change_changesets_revision_to_string.rb b/db/migrate/091_change_changesets_revision_to_string.rb index f8edb588..655e7a24 100644 --- a/db/migrate/091_change_changesets_revision_to_string.rb +++ b/db/migrate/091_change_changesets_revision_to_string.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/092_change_changes_from_revision_to_string.rb b/db/migrate/092_change_changes_from_revision_to_string.rb index 2852b62f..6853a521 100644 --- a/db/migrate/092_change_changes_from_revision_to_string.rb +++ b/db/migrate/092_change_changes_from_revision_to_string.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/093_add_wiki_pages_protected.rb b/db/migrate/093_add_wiki_pages_protected.rb index 713e4138..6c7db5b0 100644 --- a/db/migrate/093_add_wiki_pages_protected.rb +++ b/db/migrate/093_add_wiki_pages_protected.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/094_change_projects_homepage_limit.rb b/db/migrate/094_change_projects_homepage_limit.rb index c2ff176a..ce3959bc 100644 --- a/db/migrate/094_change_projects_homepage_limit.rb +++ b/db/migrate/094_change_projects_homepage_limit.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/095_add_wiki_pages_parent_id.rb b/db/migrate/095_add_wiki_pages_parent_id.rb index abb2e736..2a3bb135 100644 --- a/db/migrate/095_add_wiki_pages_parent_id.rb +++ b/db/migrate/095_add_wiki_pages_parent_id.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/096_add_commit_access_permission.rb b/db/migrate/096_add_commit_access_permission.rb index 553c9429..d9bff7cb 100644 --- a/db/migrate/096_add_commit_access_permission.rb +++ b/db/migrate/096_add_commit_access_permission.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/097_add_view_wiki_edits_permission.rb b/db/migrate/097_add_view_wiki_edits_permission.rb index 06885fed..90fc2295 100644 --- a/db/migrate/097_add_view_wiki_edits_permission.rb +++ b/db/migrate/097_add_view_wiki_edits_permission.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/098_set_topic_authors_as_watchers.rb b/db/migrate/098_set_topic_authors_as_watchers.rb index 31234f74..bab927a5 100644 --- a/db/migrate/098_set_topic_authors_as_watchers.rb +++ b/db/migrate/098_set_topic_authors_as_watchers.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/099_add_delete_wiki_pages_attachments_permission.rb b/db/migrate/099_add_delete_wiki_pages_attachments_permission.rb index 48cbe91c..5e86079d 100644 --- a/db/migrate/099_add_delete_wiki_pages_attachments_permission.rb +++ b/db/migrate/099_add_delete_wiki_pages_attachments_permission.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/100_add_changesets_user_id.rb b/db/migrate/100_add_changesets_user_id.rb index c6838f60..49714738 100644 --- a/db/migrate/100_add_changesets_user_id.rb +++ b/db/migrate/100_add_changesets_user_id.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/101_populate_changesets_user_id.rb b/db/migrate/101_populate_changesets_user_id.rb index da1be551..9458a2f4 100644 --- a/db/migrate/101_populate_changesets_user_id.rb +++ b/db/migrate/101_populate_changesets_user_id.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/102_add_custom_fields_editable.rb b/db/migrate/102_add_custom_fields_editable.rb index 7add6f0e..a06e6905 100644 --- a/db/migrate/102_add_custom_fields_editable.rb +++ b/db/migrate/102_add_custom_fields_editable.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/103_set_custom_fields_editable.rb b/db/migrate/103_set_custom_fields_editable.rb index 17218564..6d6dfeeb 100644 --- a/db/migrate/103_set_custom_fields_editable.rb +++ b/db/migrate/103_set_custom_fields_editable.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/104_add_projects_lft_and_rgt.rb b/db/migrate/104_add_projects_lft_and_rgt.rb index acee9f87..480fd61d 100644 --- a/db/migrate/104_add_projects_lft_and_rgt.rb +++ b/db/migrate/104_add_projects_lft_and_rgt.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/105_build_projects_tree.rb b/db/migrate/105_build_projects_tree.rb index 32e53cb1..70c94997 100644 --- a/db/migrate/105_build_projects_tree.rb +++ b/db/migrate/105_build_projects_tree.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/106_remove_projects_projects_count.rb b/db/migrate/106_remove_projects_projects_count.rb index 8ea8af8c..0d4d7d8d 100644 --- a/db/migrate/106_remove_projects_projects_count.rb +++ b/db/migrate/106_remove_projects_projects_count.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/107_add_open_id_authentication_tables.rb b/db/migrate/107_add_open_id_authentication_tables.rb index 78af93e5..665cf697 100644 --- a/db/migrate/107_add_open_id_authentication_tables.rb +++ b/db/migrate/107_add_open_id_authentication_tables.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/108_add_identity_url_to_users.rb b/db/migrate/108_add_identity_url_to_users.rb index d309edf2..cb90318f 100644 --- a/db/migrate/108_add_identity_url_to_users.rb +++ b/db/migrate/108_add_identity_url_to_users.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20090214190337_add_watchers_user_id_type_index.rb b/db/migrate/20090214190337_add_watchers_user_id_type_index.rb index 2ecf34e8..6953b99f 100644 --- a/db/migrate/20090214190337_add_watchers_user_id_type_index.rb +++ b/db/migrate/20090214190337_add_watchers_user_id_type_index.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20090312172426_add_queries_sort_criteria.rb b/db/migrate/20090312172426_add_queries_sort_criteria.rb index 471a068d..dcd3e5f2 100644 --- a/db/migrate/20090312172426_add_queries_sort_criteria.rb +++ b/db/migrate/20090312172426_add_queries_sort_criteria.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20090312194159_add_projects_trackers_unique_index.rb b/db/migrate/20090312194159_add_projects_trackers_unique_index.rb index cf62f1ee..9ffad2e9 100644 --- a/db/migrate/20090312194159_add_projects_trackers_unique_index.rb +++ b/db/migrate/20090312194159_add_projects_trackers_unique_index.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20090318181151_extend_settings_name.rb b/db/migrate/20090318181151_extend_settings_name.rb index 209a957c..5fc78db5 100644 --- a/db/migrate/20090318181151_extend_settings_name.rb +++ b/db/migrate/20090318181151_extend_settings_name.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20090323224724_add_type_to_enumerations.rb b/db/migrate/20090323224724_add_type_to_enumerations.rb index cd5b231a..f2b0eb61 100644 --- a/db/migrate/20090323224724_add_type_to_enumerations.rb +++ b/db/migrate/20090323224724_add_type_to_enumerations.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20090401221305_update_enumerations_to_sti.rb b/db/migrate/20090401221305_update_enumerations_to_sti.rb index a6dbb114..818b9440 100644 --- a/db/migrate/20090401221305_update_enumerations_to_sti.rb +++ b/db/migrate/20090401221305_update_enumerations_to_sti.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20090401231134_add_active_field_to_enumerations.rb b/db/migrate/20090401231134_add_active_field_to_enumerations.rb index e9e5b90e..a661d507 100644 --- a/db/migrate/20090401231134_add_active_field_to_enumerations.rb +++ b/db/migrate/20090401231134_add_active_field_to_enumerations.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20090403001910_add_project_to_enumerations.rb b/db/migrate/20090403001910_add_project_to_enumerations.rb index b57290c5..0fec8b00 100644 --- a/db/migrate/20090403001910_add_project_to_enumerations.rb +++ b/db/migrate/20090403001910_add_project_to_enumerations.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20090406161854_add_parent_id_to_enumerations.rb b/db/migrate/20090406161854_add_parent_id_to_enumerations.rb index 26b38c0e..9004290e 100644 --- a/db/migrate/20090406161854_add_parent_id_to_enumerations.rb +++ b/db/migrate/20090406161854_add_parent_id_to_enumerations.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20090425161243_add_queries_group_by.rb b/db/migrate/20090425161243_add_queries_group_by.rb index ec412c9c..999b3f0b 100644 --- a/db/migrate/20090425161243_add_queries_group_by.rb +++ b/db/migrate/20090425161243_add_queries_group_by.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20090503121501_create_member_roles.rb b/db/migrate/20090503121501_create_member_roles.rb index 252a4297..40e9683c 100644 --- a/db/migrate/20090503121501_create_member_roles.rb +++ b/db/migrate/20090503121501_create_member_roles.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20090503121505_populate_member_roles.rb b/db/migrate/20090503121505_populate_member_roles.rb index 0e89031e..a5c60981 100644 --- a/db/migrate/20090503121505_populate_member_roles.rb +++ b/db/migrate/20090503121505_populate_member_roles.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20090503121510_drop_members_role_id.rb b/db/migrate/20090503121510_drop_members_role_id.rb index 637b7909..1641f0e9 100644 --- a/db/migrate/20090503121510_drop_members_role_id.rb +++ b/db/migrate/20090503121510_drop_members_role_id.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20090614091200_fix_messages_sticky_null.rb b/db/migrate/20090614091200_fix_messages_sticky_null.rb index 4ec6746f..7c8327bc 100644 --- a/db/migrate/20090614091200_fix_messages_sticky_null.rb +++ b/db/migrate/20090614091200_fix_messages_sticky_null.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20090704172350_populate_users_type.rb b/db/migrate/20090704172350_populate_users_type.rb index f1d16d03..f0e6a2b5 100644 --- a/db/migrate/20090704172350_populate_users_type.rb +++ b/db/migrate/20090704172350_populate_users_type.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20090704172355_create_groups_users.rb b/db/migrate/20090704172355_create_groups_users.rb index acd1826b..7850235b 100644 --- a/db/migrate/20090704172355_create_groups_users.rb +++ b/db/migrate/20090704172355_create_groups_users.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20090704172358_add_member_roles_inherited_from.rb b/db/migrate/20090704172358_add_member_roles_inherited_from.rb index 099d09f9..4ec5abb1 100644 --- a/db/migrate/20090704172358_add_member_roles_inherited_from.rb +++ b/db/migrate/20090704172358_add_member_roles_inherited_from.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20091010093521_fix_users_custom_values.rb b/db/migrate/20091010093521_fix_users_custom_values.rb index fa91107e..9ae72d64 100644 --- a/db/migrate/20091010093521_fix_users_custom_values.rb +++ b/db/migrate/20091010093521_fix_users_custom_values.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20091017212227_add_missing_indexes_to_workflows.rb b/db/migrate/20091017212227_add_missing_indexes_to_workflows.rb index e4012c8b..9dd1cf55 100644 --- a/db/migrate/20091017212227_add_missing_indexes_to_workflows.rb +++ b/db/migrate/20091017212227_add_missing_indexes_to_workflows.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20091017212457_add_missing_indexes_to_custom_fields_projects.rb b/db/migrate/20091017212457_add_missing_indexes_to_custom_fields_projects.rb index aabbfad4..7c4e3787 100644 --- a/db/migrate/20091017212457_add_missing_indexes_to_custom_fields_projects.rb +++ b/db/migrate/20091017212457_add_missing_indexes_to_custom_fields_projects.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20091017212644_add_missing_indexes_to_messages.rb b/db/migrate/20091017212644_add_missing_indexes_to_messages.rb index 9e6177fa..238d5a0b 100644 --- a/db/migrate/20091017212644_add_missing_indexes_to_messages.rb +++ b/db/migrate/20091017212644_add_missing_indexes_to_messages.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20091017212938_add_missing_indexes_to_repositories.rb b/db/migrate/20091017212938_add_missing_indexes_to_repositories.rb index 1c53f70b..6fb43c7c 100644 --- a/db/migrate/20091017212938_add_missing_indexes_to_repositories.rb +++ b/db/migrate/20091017212938_add_missing_indexes_to_repositories.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20091017213027_add_missing_indexes_to_comments.rb b/db/migrate/20091017213027_add_missing_indexes_to_comments.rb index 91f64083..81a17ac5 100644 --- a/db/migrate/20091017213027_add_missing_indexes_to_comments.rb +++ b/db/migrate/20091017213027_add_missing_indexes_to_comments.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20091017213113_add_missing_indexes_to_enumerations.rb b/db/migrate/20091017213113_add_missing_indexes_to_enumerations.rb index 8665f805..61be991a 100644 --- a/db/migrate/20091017213113_add_missing_indexes_to_enumerations.rb +++ b/db/migrate/20091017213113_add_missing_indexes_to_enumerations.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20091017213151_add_missing_indexes_to_wiki_pages.rb b/db/migrate/20091017213151_add_missing_indexes_to_wiki_pages.rb index 6e028078..5005cc9b 100644 --- a/db/migrate/20091017213151_add_missing_indexes_to_wiki_pages.rb +++ b/db/migrate/20091017213151_add_missing_indexes_to_wiki_pages.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20091017213228_add_missing_indexes_to_watchers.rb b/db/migrate/20091017213228_add_missing_indexes_to_watchers.rb index b1d724a0..47b2fd44 100644 --- a/db/migrate/20091017213228_add_missing_indexes_to_watchers.rb +++ b/db/migrate/20091017213228_add_missing_indexes_to_watchers.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20091017213257_add_missing_indexes_to_auth_sources.rb b/db/migrate/20091017213257_add_missing_indexes_to_auth_sources.rb index f6bce88c..64a3bc64 100644 --- a/db/migrate/20091017213257_add_missing_indexes_to_auth_sources.rb +++ b/db/migrate/20091017213257_add_missing_indexes_to_auth_sources.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20091017213332_add_missing_indexes_to_documents.rb b/db/migrate/20091017213332_add_missing_indexes_to_documents.rb index e57489aa..07daac66 100644 --- a/db/migrate/20091017213332_add_missing_indexes_to_documents.rb +++ b/db/migrate/20091017213332_add_missing_indexes_to_documents.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20091017213444_add_missing_indexes_to_tokens.rb b/db/migrate/20091017213444_add_missing_indexes_to_tokens.rb index fee951ca..80e55c26 100644 --- a/db/migrate/20091017213444_add_missing_indexes_to_tokens.rb +++ b/db/migrate/20091017213444_add_missing_indexes_to_tokens.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20091017213536_add_missing_indexes_to_changesets.rb b/db/migrate/20091017213536_add_missing_indexes_to_changesets.rb index 687d1590..ac9e04b6 100644 --- a/db/migrate/20091017213536_add_missing_indexes_to_changesets.rb +++ b/db/migrate/20091017213536_add_missing_indexes_to_changesets.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20091017213642_add_missing_indexes_to_issue_categories.rb b/db/migrate/20091017213642_add_missing_indexes_to_issue_categories.rb index f2c38f7e..9cd85711 100644 --- a/db/migrate/20091017213642_add_missing_indexes_to_issue_categories.rb +++ b/db/migrate/20091017213642_add_missing_indexes_to_issue_categories.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20091017213716_add_missing_indexes_to_member_roles.rb b/db/migrate/20091017213716_add_missing_indexes_to_member_roles.rb index 84ceb6cf..9b562c3d 100644 --- a/db/migrate/20091017213716_add_missing_indexes_to_member_roles.rb +++ b/db/migrate/20091017213716_add_missing_indexes_to_member_roles.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20091017213757_add_missing_indexes_to_boards.rb b/db/migrate/20091017213757_add_missing_indexes_to_boards.rb index 2dfe3bab..a7e4c5f2 100644 --- a/db/migrate/20091017213757_add_missing_indexes_to_boards.rb +++ b/db/migrate/20091017213757_add_missing_indexes_to_boards.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20091017213835_add_missing_indexes_to_user_preferences.rb b/db/migrate/20091017213835_add_missing_indexes_to_user_preferences.rb index 59a3a0ff..72f9709e 100644 --- a/db/migrate/20091017213835_add_missing_indexes_to_user_preferences.rb +++ b/db/migrate/20091017213835_add_missing_indexes_to_user_preferences.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20091017213910_add_missing_indexes_to_issues.rb b/db/migrate/20091017213910_add_missing_indexes_to_issues.rb index aa02973b..f461507e 100644 --- a/db/migrate/20091017213910_add_missing_indexes_to_issues.rb +++ b/db/migrate/20091017213910_add_missing_indexes_to_issues.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20091017214015_add_missing_indexes_to_members.rb b/db/migrate/20091017214015_add_missing_indexes_to_members.rb index cce1566c..aa5be253 100644 --- a/db/migrate/20091017214015_add_missing_indexes_to_members.rb +++ b/db/migrate/20091017214015_add_missing_indexes_to_members.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20091017214107_add_missing_indexes_to_custom_fields.rb b/db/migrate/20091017214107_add_missing_indexes_to_custom_fields.rb index e38b0418..1bf06d8c 100644 --- a/db/migrate/20091017214107_add_missing_indexes_to_custom_fields.rb +++ b/db/migrate/20091017214107_add_missing_indexes_to_custom_fields.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20091017214136_add_missing_indexes_to_queries.rb b/db/migrate/20091017214136_add_missing_indexes_to_queries.rb index 879865d4..c09fa279 100644 --- a/db/migrate/20091017214136_add_missing_indexes_to_queries.rb +++ b/db/migrate/20091017214136_add_missing_indexes_to_queries.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20091017214236_add_missing_indexes_to_time_entries.rb b/db/migrate/20091017214236_add_missing_indexes_to_time_entries.rb index fc6dab7f..129be5d4 100644 --- a/db/migrate/20091017214236_add_missing_indexes_to_time_entries.rb +++ b/db/migrate/20091017214236_add_missing_indexes_to_time_entries.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20091017214308_add_missing_indexes_to_news.rb b/db/migrate/20091017214308_add_missing_indexes_to_news.rb index fb4669b4..ffb0c385 100644 --- a/db/migrate/20091017214308_add_missing_indexes_to_news.rb +++ b/db/migrate/20091017214308_add_missing_indexes_to_news.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20091017214336_add_missing_indexes_to_users.rb b/db/migrate/20091017214336_add_missing_indexes_to_users.rb index d895e266..61fade71 100644 --- a/db/migrate/20091017214336_add_missing_indexes_to_users.rb +++ b/db/migrate/20091017214336_add_missing_indexes_to_users.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20091017214406_add_missing_indexes_to_attachments.rb b/db/migrate/20091017214406_add_missing_indexes_to_attachments.rb index be1578e6..0bde2763 100644 --- a/db/migrate/20091017214406_add_missing_indexes_to_attachments.rb +++ b/db/migrate/20091017214406_add_missing_indexes_to_attachments.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20091017214440_add_missing_indexes_to_wiki_contents.rb b/db/migrate/20091017214440_add_missing_indexes_to_wiki_contents.rb index 552a952d..09854a9d 100644 --- a/db/migrate/20091017214440_add_missing_indexes_to_wiki_contents.rb +++ b/db/migrate/20091017214440_add_missing_indexes_to_wiki_contents.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20091017214519_add_missing_indexes_to_custom_values.rb b/db/migrate/20091017214519_add_missing_indexes_to_custom_values.rb index 759a258e..198c65f8 100644 --- a/db/migrate/20091017214519_add_missing_indexes_to_custom_values.rb +++ b/db/migrate/20091017214519_add_missing_indexes_to_custom_values.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20091017214611_add_missing_indexes_to_journals.rb b/db/migrate/20091017214611_add_missing_indexes_to_journals.rb index 3467d016..af00e909 100644 --- a/db/migrate/20091017214611_add_missing_indexes_to_journals.rb +++ b/db/migrate/20091017214611_add_missing_indexes_to_journals.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20091017214644_add_missing_indexes_to_issue_relations.rb b/db/migrate/20091017214644_add_missing_indexes_to_issue_relations.rb index 09df05fd..9478778e 100644 --- a/db/migrate/20091017214644_add_missing_indexes_to_issue_relations.rb +++ b/db/migrate/20091017214644_add_missing_indexes_to_issue_relations.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20091017214720_add_missing_indexes_to_wiki_redirects.rb b/db/migrate/20091017214720_add_missing_indexes_to_wiki_redirects.rb index 976cac93..99adf0a8 100644 --- a/db/migrate/20091017214720_add_missing_indexes_to_wiki_redirects.rb +++ b/db/migrate/20091017214720_add_missing_indexes_to_wiki_redirects.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20091017214750_add_missing_indexes_to_custom_fields_trackers.rb b/db/migrate/20091017214750_add_missing_indexes_to_custom_fields_trackers.rb index 05cf9d90..fae4adb3 100644 --- a/db/migrate/20091017214750_add_missing_indexes_to_custom_fields_trackers.rb +++ b/db/migrate/20091017214750_add_missing_indexes_to_custom_fields_trackers.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20091025163651_add_activity_indexes.rb b/db/migrate/20091025163651_add_activity_indexes.rb index 21d2e5aa..35679584 100644 --- a/db/migrate/20091025163651_add_activity_indexes.rb +++ b/db/migrate/20091025163651_add_activity_indexes.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20091108092559_add_versions_status.rb b/db/migrate/20091108092559_add_versions_status.rb index ff61182b..dbb5506d 100644 --- a/db/migrate/20091108092559_add_versions_status.rb +++ b/db/migrate/20091108092559_add_versions_status.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20091114105931_add_view_issues_permission.rb b/db/migrate/20091114105931_add_view_issues_permission.rb index 6ae78b9c..9ae261cb 100644 --- a/db/migrate/20091114105931_add_view_issues_permission.rb +++ b/db/migrate/20091114105931_add_view_issues_permission.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20091123212029_add_default_done_ratio_to_issue_status.rb b/db/migrate/20091123212029_add_default_done_ratio_to_issue_status.rb index 7cf5795c..2e491818 100644 --- a/db/migrate/20091123212029_add_default_done_ratio_to_issue_status.rb +++ b/db/migrate/20091123212029_add_default_done_ratio_to_issue_status.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20091205124427_add_versions_sharing.rb b/db/migrate/20091205124427_add_versions_sharing.rb index 4d6bec6d..7d36bd96 100644 --- a/db/migrate/20091205124427_add_versions_sharing.rb +++ b/db/migrate/20091205124427_add_versions_sharing.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20091220183509_add_lft_and_rgt_indexes_to_projects.rb b/db/migrate/20091220183509_add_lft_and_rgt_indexes_to_projects.rb index b41e7c5c..2777d945 100644 --- a/db/migrate/20091220183509_add_lft_and_rgt_indexes_to_projects.rb +++ b/db/migrate/20091220183509_add_lft_and_rgt_indexes_to_projects.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20091220183727_add_index_to_settings_name.rb b/db/migrate/20091220183727_add_index_to_settings_name.rb index 3e20f858..74a39adf 100644 --- a/db/migrate/20091220183727_add_index_to_settings_name.rb +++ b/db/migrate/20091220183727_add_index_to_settings_name.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20091220184736_add_indexes_to_issue_status.rb b/db/migrate/20091220184736_add_indexes_to_issue_status.rb index c155fb3c..d2602df3 100644 --- a/db/migrate/20091220184736_add_indexes_to_issue_status.rb +++ b/db/migrate/20091220184736_add_indexes_to_issue_status.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20091225164732_remove_enumerations_opt.rb b/db/migrate/20091225164732_remove_enumerations_opt.rb index a5f78ddf..3076b2ff 100644 --- a/db/migrate/20091225164732_remove_enumerations_opt.rb +++ b/db/migrate/20091225164732_remove_enumerations_opt.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20091227112908_change_wiki_contents_text_limit.rb b/db/migrate/20091227112908_change_wiki_contents_text_limit.rb index ef0aa975..5ded7b30 100644 --- a/db/migrate/20091227112908_change_wiki_contents_text_limit.rb +++ b/db/migrate/20091227112908_change_wiki_contents_text_limit.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20100129193402_change_users_mail_notification_to_string.rb b/db/migrate/20100129193402_change_users_mail_notification_to_string.rb index ae5d388e..5a657d52 100644 --- a/db/migrate/20100129193402_change_users_mail_notification_to_string.rb +++ b/db/migrate/20100129193402_change_users_mail_notification_to_string.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20100129193813_update_mail_notification_values.rb b/db/migrate/20100129193813_update_mail_notification_values.rb index 9d9f58f0..7b0d098a 100644 --- a/db/migrate/20100129193813_update_mail_notification_values.rb +++ b/db/migrate/20100129193813_update_mail_notification_values.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20100217010520_add_custom_filter_to_auth_sources.rb b/db/migrate/20100217010520_add_custom_filter_to_auth_sources.rb new file mode 100644 index 00000000..55b3c040 --- /dev/null +++ b/db/migrate/20100217010520_add_custom_filter_to_auth_sources.rb @@ -0,0 +1,23 @@ +#-- encoding: UTF-8 +#-- copyright +# ChiliProject is a project management system. +# +# Copyright (C) 2010-2012 the ChiliProject Team +# +# 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. +# +# See doc/COPYRIGHT.rdoc for more details. +#++ + +class AddCustomFilterToAuthSources < ActiveRecord::Migration + def self.up + add_column :auth_sources, :custom_filter, :string + end + + def self.down + remove_column :auth_sources, :custom_filter + end +end diff --git a/db/migrate/20100221100219_add_index_on_changesets_scmid.rb b/db/migrate/20100221100219_add_index_on_changesets_scmid.rb index 297d8234..51e7eebe 100644 --- a/db/migrate/20100221100219_add_index_on_changesets_scmid.rb +++ b/db/migrate/20100221100219_add_index_on_changesets_scmid.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20100313132032_add_issues_nested_sets_columns.rb b/db/migrate/20100313132032_add_issues_nested_sets_columns.rb index 08ef1987..7b9fb591 100644 --- a/db/migrate/20100313132032_add_issues_nested_sets_columns.rb +++ b/db/migrate/20100313132032_add_issues_nested_sets_columns.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20100313171051_add_index_on_issues_nested_set.rb b/db/migrate/20100313171051_add_index_on_issues_nested_set.rb index 3619f2f5..2310b7f3 100644 --- a/db/migrate/20100313171051_add_index_on_issues_nested_set.rb +++ b/db/migrate/20100313171051_add_index_on_issues_nested_set.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20100705164950_change_changes_path_length_limit.rb b/db/migrate/20100705164950_change_changes_path_length_limit.rb index f1dafc24..fe048ad0 100644 --- a/db/migrate/20100705164950_change_changes_path_length_limit.rb +++ b/db/migrate/20100705164950_change_changes_path_length_limit.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20100714111651_prepare_journals_for_acts_as_journalized.rb b/db/migrate/20100714111651_prepare_journals_for_acts_as_journalized.rb index 804f319a..3af7a7e9 100644 --- a/db/migrate/20100714111651_prepare_journals_for_acts_as_journalized.rb +++ b/db/migrate/20100714111651_prepare_journals_for_acts_as_journalized.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20100714111652_update_journals_for_acts_as_journalized.rb b/db/migrate/20100714111652_update_journals_for_acts_as_journalized.rb index bcacddeb..e393fa48 100644 --- a/db/migrate/20100714111652_update_journals_for_acts_as_journalized.rb +++ b/db/migrate/20100714111652_update_journals_for_acts_as_journalized.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20100714111653_build_initial_journals_for_acts_as_journalized.rb b/db/migrate/20100714111653_build_initial_journals_for_acts_as_journalized.rb index fd223d11..3bc38bb9 100644 --- a/db/migrate/20100714111653_build_initial_journals_for_acts_as_journalized.rb +++ b/db/migrate/20100714111653_build_initial_journals_for_acts_as_journalized.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20100714111654_add_changes_from_journal_details_for_acts_as_journalized.rb b/db/migrate/20100714111654_add_changes_from_journal_details_for_acts_as_journalized.rb index b7911a69..e4aabc81 100644 --- a/db/migrate/20100714111654_add_changes_from_journal_details_for_acts_as_journalized.rb +++ b/db/migrate/20100714111654_add_changes_from_journal_details_for_acts_as_journalized.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20100804112053_merge_wiki_versions_with_journals.rb b/db/migrate/20100804112053_merge_wiki_versions_with_journals.rb index 0d6c80d3..fd82e71f 100644 --- a/db/migrate/20100804112053_merge_wiki_versions_with_journals.rb +++ b/db/migrate/20100804112053_merge_wiki_versions_with_journals.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20100819172912_enable_calendar_and_gantt_modules_where_appropriate.rb b/db/migrate/20100819172912_enable_calendar_and_gantt_modules_where_appropriate.rb index ee9c6b11..44017f6d 100644 --- a/db/migrate/20100819172912_enable_calendar_and_gantt_modules_where_appropriate.rb +++ b/db/migrate/20100819172912_enable_calendar_and_gantt_modules_where_appropriate.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20101104182107_add_unique_index_on_members.rb b/db/migrate/20101104182107_add_unique_index_on_members.rb index da9f2f6c..f51849fd 100644 --- a/db/migrate/20101104182107_add_unique_index_on_members.rb +++ b/db/migrate/20101104182107_add_unique_index_on_members.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20101107130441_add_custom_fields_visible.rb b/db/migrate/20101107130441_add_custom_fields_visible.rb index d5f98ad7..1f0f6237 100644 --- a/db/migrate/20101107130441_add_custom_fields_visible.rb +++ b/db/migrate/20101107130441_add_custom_fields_visible.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20101114115114_change_projects_name_limit.rb b/db/migrate/20101114115114_change_projects_name_limit.rb index 5d7667f4..ccd04ae2 100644 --- a/db/migrate/20101114115114_change_projects_name_limit.rb +++ b/db/migrate/20101114115114_change_projects_name_limit.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20101114115359_change_projects_identifier_limit.rb b/db/migrate/20101114115359_change_projects_identifier_limit.rb index 8b8e35b4..096ededf 100644 --- a/db/migrate/20101114115359_change_projects_identifier_limit.rb +++ b/db/migrate/20101114115359_change_projects_identifier_limit.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20110220160626_add_workflows_assignee_and_author.rb b/db/migrate/20110220160626_add_workflows_assignee_and_author.rb index a75c8e94..c4fec6d3 100644 --- a/db/migrate/20110220160626_add_workflows_assignee_and_author.rb +++ b/db/migrate/20110220160626_add_workflows_assignee_and_author.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20110223180944_add_users_salt.rb b/db/migrate/20110223180944_add_users_salt.rb index 1aadfd25..e8facbab 100644 --- a/db/migrate/20110223180944_add_users_salt.rb +++ b/db/migrate/20110223180944_add_users_salt.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20110223180953_salt_user_passwords.rb b/db/migrate/20110223180953_salt_user_passwords.rb index 86b11c98..4760d986 100644 --- a/db/migrate/20110223180953_salt_user_passwords.rb +++ b/db/migrate/20110223180953_salt_user_passwords.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20110224000000_add_repositories_path_encoding.rb b/db/migrate/20110224000000_add_repositories_path_encoding.rb index 39d16d87..95e68c75 100644 --- a/db/migrate/20110224000000_add_repositories_path_encoding.rb +++ b/db/migrate/20110224000000_add_repositories_path_encoding.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20110226120112_change_repositories_password_limit.rb b/db/migrate/20110226120112_change_repositories_password_limit.rb index c9f34d13..d06735df 100644 --- a/db/migrate/20110226120112_change_repositories_password_limit.rb +++ b/db/migrate/20110226120112_change_repositories_password_limit.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20110226120132_change_auth_sources_account_password_limit.rb b/db/migrate/20110226120132_change_auth_sources_account_password_limit.rb index 1ff06924..27dc804d 100644 --- a/db/migrate/20110226120132_change_auth_sources_account_password_limit.rb +++ b/db/migrate/20110226120132_change_auth_sources_account_password_limit.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20110227125750_change_journal_details_values_to_text.rb b/db/migrate/20110227125750_change_journal_details_values_to_text.rb index 91d12d03..505910af 100644 --- a/db/migrate/20110227125750_change_journal_details_values_to_text.rb +++ b/db/migrate/20110227125750_change_journal_details_values_to_text.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20110228000000_add_repositories_log_encoding.rb b/db/migrate/20110228000000_add_repositories_log_encoding.rb index 0c9f3ded..9032a73a 100644 --- a/db/migrate/20110228000000_add_repositories_log_encoding.rb +++ b/db/migrate/20110228000000_add_repositories_log_encoding.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20110228000100_copy_repositories_log_encoding.rb b/db/migrate/20110228000100_copy_repositories_log_encoding.rb index f9e7593b..2ef80017 100644 --- a/db/migrate/20110228000100_copy_repositories_log_encoding.rb +++ b/db/migrate/20110228000100_copy_repositories_log_encoding.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20110314014400_add_start_date_to_versions.rb b/db/migrate/20110314014400_add_start_date_to_versions.rb index 345f8b88..03e99376 100644 --- a/db/migrate/20110314014400_add_start_date_to_versions.rb +++ b/db/migrate/20110314014400_add_start_date_to_versions.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20110401192910_add_index_to_users_type.rb b/db/migrate/20110401192910_add_index_to_users_type.rb index 482cf5bf..41788755 100644 --- a/db/migrate/20110401192910_add_index_to_users_type.rb +++ b/db/migrate/20110401192910_add_index_to_users_type.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20110519194936_remove_comments_from_wiki_content.rb b/db/migrate/20110519194936_remove_comments_from_wiki_content.rb index 57767323..716a3f4b 100644 --- a/db/migrate/20110519194936_remove_comments_from_wiki_content.rb +++ b/db/migrate/20110519194936_remove_comments_from_wiki_content.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/migrate/20110729125454_remove_double_initial_wiki_content_journals.rb b/db/migrate/20110729125454_remove_double_initial_wiki_content_journals.rb index 86689ae6..5703b930 100644 --- a/db/migrate/20110729125454_remove_double_initial_wiki_content_journals.rb +++ b/db/migrate/20110729125454_remove_double_initial_wiki_content_journals.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/db/seeds.rb b/db/seeds.rb index e51dcf10..9871fb42 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/doc/CHANGELOG.rdoc b/doc/CHANGELOG.rdoc index d7b15b31..7c174f5c 100644 --- a/doc/CHANGELOG.rdoc +++ b/doc/CHANGELOG.rdoc @@ -1,5 +1,22 @@ = ChiliProject changelog +== 2012-01-03 v2.6.0 + +* Bug #356: Clicking on login while logged-in logs you out +* Bug #463: REST API does not accept Basic HTTP auth when running through Apache mod_proxy +* Bug #708: AAJ does not create journals, when models are created using sub classes +* Bug #740: Revision page, new files are not displayed (Git Repo) +* Bug #746: Problems with rdm-mailhandler.rb +* Bug #748: ChiliProject::VERSION.revision doesn't capture error output +* Bug #761: Fix quoting in shell-out (git adapter) +* Bug #812: Change references to Redmine +* Feature #298: Seperate core plugins and user plugins into different directories +* Feature #388: Add LDAP filter to ldap authentication +* Feature #486: Do not display edit link in annotation page when you don't have permissions +* Feature #733: Add css class for issues that are due today +* Feature #785: pt-BR translation updates +* Feature #789: Provide a rackup file for Rack-only servers like pow.cx + == 2011-11-30 v2.5.0 * Bug #258: Upgrade from ruby-net-ldap to net-ldap gem diff --git a/doc/COPYRIGHT.rdoc b/doc/COPYRIGHT.rdoc index a1971dce..9fba6a46 100644 --- a/doc/COPYRIGHT.rdoc +++ b/doc/COPYRIGHT.rdoc @@ -1,6 +1,6 @@ ChiliProject is a project management system. -Copyright (C) 2010-2011 the ChiliProject Team +Copyright (C) 2010-2012 the ChiliProject Team This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/doc/COPYRIGHT_short.rdoc b/doc/COPYRIGHT_short.rdoc index 5742770d..fe93b01a 100644 --- a/doc/COPYRIGHT_short.rdoc +++ b/doc/COPYRIGHT_short.rdoc @@ -1,6 +1,6 @@ ChiliProject is a project management system. -Copyright (C) 2010-2011 the ChiliProject Team +Copyright (C) 2010-2012 the ChiliProject Team This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/extra/mail_handler/rdm-mailhandler.rb b/extra/mail_handler/rdm-mailhandler.rb index 8858fea5..796cc4cc 100644 --- a/extra/mail_handler/rdm-mailhandler.rb +++ b/extra/mail_handler/rdm-mailhandler.rb @@ -1,8 +1,9 @@ +#!/usr/bin/env ruby #-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -12,8 +13,6 @@ # See doc/COPYRIGHT.rdoc for more details. #++ -#!/usr/bin/env ruby - # == Synopsis # # Reads an email from standard input and forward it to a Redmine server diff --git a/extra/sample_plugin/app/controllers/example_controller.rb b/extra/sample_plugin/app/controllers/example_controller.rb index 898a6918..70c4fe81 100644 --- a/extra/sample_plugin/app/controllers/example_controller.rb +++ b/extra/sample_plugin/app/controllers/example_controller.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/extra/sample_plugin/app/models/meeting.rb b/extra/sample_plugin/app/models/meeting.rb index e12c76ba..d69a7bc2 100644 --- a/extra/sample_plugin/app/models/meeting.rb +++ b/extra/sample_plugin/app/models/meeting.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/extra/sample_plugin/db/migrate/001_create_meetings.rb b/extra/sample_plugin/db/migrate/001_create_meetings.rb index 5e89cae5..58c5a262 100644 --- a/extra/sample_plugin/db/migrate/001_create_meetings.rb +++ b/extra/sample_plugin/db/migrate/001_create_meetings.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/extra/sample_plugin/init.rb b/extra/sample_plugin/init.rb index f330bc63..5cc6354d 100644 --- a/extra/sample_plugin/init.rb +++ b/extra/sample_plugin/init.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/extra/svn/reposman.rb b/extra/svn/reposman.rb index 4be52335..8d5c3b5e 100755 --- a/extra/svn/reposman.rb +++ b/extra/svn/reposman.rb @@ -3,7 +3,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/ar_condition.rb b/lib/ar_condition.rb index 2e4fb155..b8aa2f6f 100644 --- a/lib/ar_condition.rb +++ b/lib/ar_condition.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/chili_project.rb b/lib/chili_project.rb index b89373c8..f27f5ee6 100644 --- a/lib/chili_project.rb +++ b/lib/chili_project.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/chili_project/compatibility.rb b/lib/chili_project/compatibility.rb index ba119e0d..12048fca 100644 --- a/lib/chili_project/compatibility.rb +++ b/lib/chili_project/compatibility.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/chili_project/database.rb b/lib/chili_project/database.rb index 2e5bdd12..c7a0207f 100644 --- a/lib/chili_project/database.rb +++ b/lib/chili_project/database.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/chili_project/version.rb b/lib/chili_project/version.rb index 5aee2bed..420b338f 100644 --- a/lib/chili_project/version.rb +++ b/lib/chili_project/version.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -18,7 +18,7 @@ module ChiliProject module VERSION #:nodoc: MAJOR = 2 - MINOR = 5 + MINOR = 6 PATCH = 0 TINY = PATCH # Redmine compat @@ -38,11 +38,13 @@ module ChiliProject end def self.revision - revision = `git rev-parse HEAD` - if revision.present? - revision.strip[0..8] - else - nil + @revision ||= begin + git = Redmine::Scm::Adapters::GitAdapter + git_dir = Rails.root.join('.git') + + if File.directory? git_dir + git.send(:shellout, "#{git.sq_bin} --git-dir='#{git_dir}' rev-parse --short=9 HEAD") { |io| io.read }.to_s.chomp + end end end diff --git a/lib/generators/chiliproject_plugin/chiliproject_plugin_generator.rb b/lib/generators/chiliproject_plugin/chiliproject_plugin_generator.rb index 8d39b14b..bcda395a 100644 --- a/lib/generators/chiliproject_plugin/chiliproject_plugin_generator.rb +++ b/lib/generators/chiliproject_plugin/chiliproject_plugin_generator.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/generators/chiliproject_plugin_controller/chiliproject_plugin_controller_generator.rb b/lib/generators/chiliproject_plugin_controller/chiliproject_plugin_controller_generator.rb index b09f360c..ea3e9307 100644 --- a/lib/generators/chiliproject_plugin_controller/chiliproject_plugin_controller_generator.rb +++ b/lib/generators/chiliproject_plugin_controller/chiliproject_plugin_controller_generator.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/generators/chiliproject_plugin_model/chiliproject_plugin_model_generator.rb b/lib/generators/chiliproject_plugin_model/chiliproject_plugin_model_generator.rb index 4af12993..32d51140 100644 --- a/lib/generators/chiliproject_plugin_model/chiliproject_plugin_model_generator.rb +++ b/lib/generators/chiliproject_plugin_model/chiliproject_plugin_model_generator.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine.rb b/lib/redmine.rb index 716fb4a9..78a0c892 100644 --- a/lib/redmine.rb +++ b/lib/redmine.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine/about.rb b/lib/redmine/about.rb index 9d33195f..b78abfea 100644 --- a/lib/redmine/about.rb +++ b/lib/redmine/about.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine/access_control.rb b/lib/redmine/access_control.rb index 8cf68f35..d45e4350 100644 --- a/lib/redmine/access_control.rb +++ b/lib/redmine/access_control.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine/access_keys.rb b/lib/redmine/access_keys.rb index d75ff1c7..cb0518d0 100644 --- a/lib/redmine/access_keys.rb +++ b/lib/redmine/access_keys.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine/activity.rb b/lib/redmine/activity.rb index 955439c9..bb6d353a 100644 --- a/lib/redmine/activity.rb +++ b/lib/redmine/activity.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine/activity/fetcher.rb b/lib/redmine/activity/fetcher.rb index cbfbc2e4..0fb39a29 100644 --- a/lib/redmine/activity/fetcher.rb +++ b/lib/redmine/activity/fetcher.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine/ciphering.rb b/lib/redmine/ciphering.rb index fb613e6d..e123554b 100644 --- a/lib/redmine/ciphering.rb +++ b/lib/redmine/ciphering.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine/configuration.rb b/lib/redmine/configuration.rb index 277227ca..509b6790 100644 --- a/lib/redmine/configuration.rb +++ b/lib/redmine/configuration.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine/core_ext.rb b/lib/redmine/core_ext.rb index dfab6aa0..2b9f6483 100644 --- a/lib/redmine/core_ext.rb +++ b/lib/redmine/core_ext.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine/core_ext/string.rb b/lib/redmine/core_ext/string.rb index 29e78822..33af27d3 100644 --- a/lib/redmine/core_ext/string.rb +++ b/lib/redmine/core_ext/string.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine/core_ext/string/conversions.rb b/lib/redmine/core_ext/string/conversions.rb index 314a804a..0617b5a2 100644 --- a/lib/redmine/core_ext/string/conversions.rb +++ b/lib/redmine/core_ext/string/conversions.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine/core_ext/string/inflections.rb b/lib/redmine/core_ext/string/inflections.rb index 4f5a170e..b9c3f1b8 100644 --- a/lib/redmine/core_ext/string/inflections.rb +++ b/lib/redmine/core_ext/string/inflections.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine/custom_field_format.rb b/lib/redmine/custom_field_format.rb index ab09462a..5d08197f 100644 --- a/lib/redmine/custom_field_format.rb +++ b/lib/redmine/custom_field_format.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine/default_data/loader.rb b/lib/redmine/default_data/loader.rb index 000cafb8..f99027e8 100644 --- a/lib/redmine/default_data/loader.rb +++ b/lib/redmine/default_data/loader.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine/export/pdf.rb b/lib/redmine/export/pdf.rb index 4fc04acf..f5376234 100644 --- a/lib/redmine/export/pdf.rb +++ b/lib/redmine/export/pdf.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine/helpers/calendar.rb b/lib/redmine/helpers/calendar.rb index f15a915b..a8a7b8b8 100644 --- a/lib/redmine/helpers/calendar.rb +++ b/lib/redmine/helpers/calendar.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine/helpers/diff.rb b/lib/redmine/helpers/diff.rb index fe79ec45..d94ff508 100644 --- a/lib/redmine/helpers/diff.rb +++ b/lib/redmine/helpers/diff.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine/helpers/gantt.rb b/lib/redmine/helpers/gantt.rb index f43cb454..2402db8c 100644 --- a/lib/redmine/helpers/gantt.rb +++ b/lib/redmine/helpers/gantt.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine/hook.rb b/lib/redmine/hook.rb index e5827422..352f7421 100644 --- a/lib/redmine/hook.rb +++ b/lib/redmine/hook.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine/i18n.rb b/lib/redmine/i18n.rb index 7251f782..4419bc5a 100644 --- a/lib/redmine/i18n.rb +++ b/lib/redmine/i18n.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine/imap.rb b/lib/redmine/imap.rb index a0742d87..2d285ffd 100644 --- a/lib/redmine/imap.rb +++ b/lib/redmine/imap.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine/info.rb b/lib/redmine/info.rb index bc7bf70f..8d1b4c09 100644 --- a/lib/redmine/info.rb +++ b/lib/redmine/info.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine/menu_manager.rb b/lib/redmine/menu_manager.rb index 5948ba65..ec3de72a 100644 --- a/lib/redmine/menu_manager.rb +++ b/lib/redmine/menu_manager.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine/menu_manager/mapper.rb b/lib/redmine/menu_manager/mapper.rb index 6a9451f1..88858264 100644 --- a/lib/redmine/menu_manager/mapper.rb +++ b/lib/redmine/menu_manager/mapper.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine/menu_manager/menu_controller.rb b/lib/redmine/menu_manager/menu_controller.rb index 8542a8f0..6aa2d9eb 100644 --- a/lib/redmine/menu_manager/menu_controller.rb +++ b/lib/redmine/menu_manager/menu_controller.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine/menu_manager/menu_error.rb b/lib/redmine/menu_manager/menu_error.rb index f14ba6e0..119be485 100644 --- a/lib/redmine/menu_manager/menu_error.rb +++ b/lib/redmine/menu_manager/menu_error.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine/menu_manager/menu_helper.rb b/lib/redmine/menu_manager/menu_helper.rb index b0e5c504..4de916bd 100644 --- a/lib/redmine/menu_manager/menu_helper.rb +++ b/lib/redmine/menu_manager/menu_helper.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine/menu_manager/menu_item.rb b/lib/redmine/menu_manager/menu_item.rb index c4e6fcb9..228f4507 100644 --- a/lib/redmine/menu_manager/menu_item.rb +++ b/lib/redmine/menu_manager/menu_item.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine/menu_manager/tree_node.rb b/lib/redmine/menu_manager/tree_node.rb index 20a97a52..c2bb1225 100644 --- a/lib/redmine/menu_manager/tree_node.rb +++ b/lib/redmine/menu_manager/tree_node.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine/mime_type.rb b/lib/redmine/mime_type.rb index 6286933c..29b9fcf9 100644 --- a/lib/redmine/mime_type.rb +++ b/lib/redmine/mime_type.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine/notifiable.rb b/lib/redmine/notifiable.rb index 5f2b1fda..9fbe360c 100644 --- a/lib/redmine/notifiable.rb +++ b/lib/redmine/notifiable.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine/platform.rb b/lib/redmine/platform.rb index 168a9a83..5200c8f0 100644 --- a/lib/redmine/platform.rb +++ b/lib/redmine/platform.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine/plugin.rb b/lib/redmine/plugin.rb index 3053d5d7..2b0dcfb8 100644 --- a/lib/redmine/plugin.rb +++ b/lib/redmine/plugin.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine/pop3.rb b/lib/redmine/pop3.rb index ade84f5a..ac33b427 100644 --- a/lib/redmine/pop3.rb +++ b/lib/redmine/pop3.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine/safe_attributes.rb b/lib/redmine/safe_attributes.rb index 3c3ecf9f..d9214d37 100644 --- a/lib/redmine/safe_attributes.rb +++ b/lib/redmine/safe_attributes.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine/scm/adapters/abstract_adapter.rb b/lib/redmine/scm/adapters/abstract_adapter.rb index 6360cc5c..828d46c3 100644 --- a/lib/redmine/scm/adapters/abstract_adapter.rb +++ b/lib/redmine/scm/adapters/abstract_adapter.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -251,6 +251,14 @@ module Redmine def revisions revisions ||= Revisions.new(collect{|entry| entry.lastrev}.compact) end + + # Required since Ruby 1.9.3 as the core compact always returns an + # instance of Array. This method follows the spec for Array#compact + def compact + ary = self.dup + ary.compact! + ary + end end class Info diff --git a/lib/redmine/scm/adapters/bazaar_adapter.rb b/lib/redmine/scm/adapters/bazaar_adapter.rb index 6400e97b..bbc44b4d 100644 --- a/lib/redmine/scm/adapters/bazaar_adapter.rb +++ b/lib/redmine/scm/adapters/bazaar_adapter.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine/scm/adapters/cvs_adapter.rb b/lib/redmine/scm/adapters/cvs_adapter.rb index 867fc5db..4a74df6a 100644 --- a/lib/redmine/scm/adapters/cvs_adapter.rb +++ b/lib/redmine/scm/adapters/cvs_adapter.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine/scm/adapters/darcs_adapter.rb b/lib/redmine/scm/adapters/darcs_adapter.rb index f8fa30d9..a31ee593 100644 --- a/lib/redmine/scm/adapters/darcs_adapter.rb +++ b/lib/redmine/scm/adapters/darcs_adapter.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine/scm/adapters/filesystem_adapter.rb b/lib/redmine/scm/adapters/filesystem_adapter.rb index ba7709a4..9051093b 100644 --- a/lib/redmine/scm/adapters/filesystem_adapter.rb +++ b/lib/redmine/scm/adapters/filesystem_adapter.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine/scm/adapters/git_adapter.rb b/lib/redmine/scm/adapters/git_adapter.rb index 3165beab..0674c22d 100644 --- a/lib/redmine/scm/adapters/git_adapter.rb +++ b/lib/redmine/scm/adapters/git_adapter.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -19,10 +19,10 @@ module Redmine module Adapters class GitAdapter < AbstractAdapter - SCM_GIT_REPORT_LAST_COMMIT = true + SCM_GIT_REPORT_LAST_COMMIT = true unless defined?(SCM_GIT_REPORT_LAST_COMMIT) # Git executable name - GIT_BIN = Redmine::Configuration['scm_git_command'] || "git" + GIT_BIN = Redmine::Configuration['scm_git_command'] || "git" unless defined?(GIT_BIN) # raised if scm command exited with error, e.g. unknown revision. class ScmCommandAborted < CommandFailed; end @@ -176,7 +176,7 @@ module Redmine from_to << "#{identifier_from}.." if identifier_from from_to << "#{identifier_to}" if identifier_to cmd_args << from_to if !from_to.empty? - cmd_args << "--since=#{options[:since].strftime("%Y-%m-%d %H:%M:%S")}" if options[:since] + cmd_args << "--since='#{options[:since].strftime("%Y-%m-%d %H:%M:%S")}'" if options[:since] cmd_args << "--" << scm_iconv(@path_encoding, 'UTF-8', path) if path && !path.empty? scm_cmd *cmd_args do |io| diff --git a/lib/redmine/scm/adapters/mercurial_adapter.rb b/lib/redmine/scm/adapters/mercurial_adapter.rb index c6c7efa1..06d80c1f 100644 --- a/lib/redmine/scm/adapters/mercurial_adapter.rb +++ b/lib/redmine/scm/adapters/mercurial_adapter.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine/scm/adapters/subversion_adapter.rb b/lib/redmine/scm/adapters/subversion_adapter.rb index d37d97d8..1171a1ec 100644 --- a/lib/redmine/scm/adapters/subversion_adapter.rb +++ b/lib/redmine/scm/adapters/subversion_adapter.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine/scm/base.rb b/lib/redmine/scm/base.rb index 5f81ed67..847eb9db 100644 --- a/lib/redmine/scm/base.rb +++ b/lib/redmine/scm/base.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine/search.rb b/lib/redmine/search.rb index cb529459..1a6e0085 100644 --- a/lib/redmine/search.rb +++ b/lib/redmine/search.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine/syntax_highlighting.rb b/lib/redmine/syntax_highlighting.rb index fabec71b..36bb9f8b 100644 --- a/lib/redmine/syntax_highlighting.rb +++ b/lib/redmine/syntax_highlighting.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine/themes.rb b/lib/redmine/themes.rb index 3e80962a..e4dffa3e 100644 --- a/lib/redmine/themes.rb +++ b/lib/redmine/themes.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine/unified_diff.rb b/lib/redmine/unified_diff.rb index 88ed832b..990dfa8e 100644 --- a/lib/redmine/unified_diff.rb +++ b/lib/redmine/unified_diff.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine/utils.rb b/lib/redmine/utils.rb index 6edea843..767c5691 100644 --- a/lib/redmine/utils.rb +++ b/lib/redmine/utils.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine/version.rb b/lib/redmine/version.rb index 316f81ee..a5c472c5 100644 --- a/lib/redmine/version.rb +++ b/lib/redmine/version.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine/views/api_template_handler.rb b/lib/redmine/views/api_template_handler.rb index 7ece1ac2..ffc0ee20 100644 --- a/lib/redmine/views/api_template_handler.rb +++ b/lib/redmine/views/api_template_handler.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine/views/builders.rb b/lib/redmine/views/builders.rb index c951911f..a1c1b49e 100644 --- a/lib/redmine/views/builders.rb +++ b/lib/redmine/views/builders.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine/views/builders/json.rb b/lib/redmine/views/builders/json.rb index 5db1c605..ebc8826c 100644 --- a/lib/redmine/views/builders/json.rb +++ b/lib/redmine/views/builders/json.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine/views/builders/structure.rb b/lib/redmine/views/builders/structure.rb index 844fdab3..24028f74 100644 --- a/lib/redmine/views/builders/structure.rb +++ b/lib/redmine/views/builders/structure.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine/views/builders/xml.rb b/lib/redmine/views/builders/xml.rb index 8119b535..356d330a 100644 --- a/lib/redmine/views/builders/xml.rb +++ b/lib/redmine/views/builders/xml.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine/views/my_page/block.rb b/lib/redmine/views/my_page/block.rb index ef9834e2..744fdf34 100644 --- a/lib/redmine/views/my_page/block.rb +++ b/lib/redmine/views/my_page/block.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine/views/other_formats_builder.rb b/lib/redmine/views/other_formats_builder.rb index d8bf1ea7..0a0ca5c1 100644 --- a/lib/redmine/views/other_formats_builder.rb +++ b/lib/redmine/views/other_formats_builder.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine/wiki_formatting.rb b/lib/redmine/wiki_formatting.rb index cf5f4516..1ffd7290 100644 --- a/lib/redmine/wiki_formatting.rb +++ b/lib/redmine/wiki_formatting.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine/wiki_formatting/macros.rb b/lib/redmine/wiki_formatting/macros.rb index 8c01eac0..8830c39f 100644 --- a/lib/redmine/wiki_formatting/macros.rb +++ b/lib/redmine/wiki_formatting/macros.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine/wiki_formatting/null_formatter/formatter.rb b/lib/redmine/wiki_formatting/null_formatter/formatter.rb index f2b63584..f27ec3bf 100644 --- a/lib/redmine/wiki_formatting/null_formatter/formatter.rb +++ b/lib/redmine/wiki_formatting/null_formatter/formatter.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine/wiki_formatting/null_formatter/helper.rb b/lib/redmine/wiki_formatting/null_formatter/helper.rb index c0a97a33..a26034ba 100644 --- a/lib/redmine/wiki_formatting/null_formatter/helper.rb +++ b/lib/redmine/wiki_formatting/null_formatter/helper.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine/wiki_formatting/textile/formatter.rb b/lib/redmine/wiki_formatting/textile/formatter.rb index 6dab3ea2..4930b7c7 100644 --- a/lib/redmine/wiki_formatting/textile/formatter.rb +++ b/lib/redmine/wiki_formatting/textile/formatter.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine/wiki_formatting/textile/helper.rb b/lib/redmine/wiki_formatting/textile/helper.rb index 59380b51..0e4d41fb 100644 --- a/lib/redmine/wiki_formatting/textile/helper.rb +++ b/lib/redmine/wiki_formatting/textile/helper.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/redmine_plugin_locator.rb b/lib/redmine_plugin_locator.rb index dd11e228..a6e017cb 100644 --- a/lib/redmine_plugin_locator.rb +++ b/lib/redmine_plugin_locator.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/tabular_form_builder.rb b/lib/tabular_form_builder.rb index 630f6717..a5fdc7ea 100644 --- a/lib/tabular_form_builder.rb +++ b/lib/tabular_form_builder.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/tasks/ci.rake b/lib/tasks/ci.rake index 0d4db7fb..320d831f 100644 --- a/lib/tasks/ci.rake +++ b/lib/tasks/ci.rake @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/tasks/ciphering.rake b/lib/tasks/ciphering.rake index bfa6ac44..7d070670 100644 --- a/lib/tasks/ciphering.rake +++ b/lib/tasks/ciphering.rake @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/tasks/code.rake b/lib/tasks/code.rake index 5be74c94..7990f0b1 100644 --- a/lib/tasks/code.rake +++ b/lib/tasks/code.rake @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/tasks/copyright.rake b/lib/tasks/copyright.rake index 70738880..e359d1f6 100644 --- a/lib/tasks/copyright.rake +++ b/lib/tasks/copyright.rake @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/tasks/deprecated.rake b/lib/tasks/deprecated.rake index 8f22ac79..7a69dafd 100644 --- a/lib/tasks/deprecated.rake +++ b/lib/tasks/deprecated.rake @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/tasks/documentation.rake b/lib/tasks/documentation.rake index 38fa603a..8ded5978 100644 --- a/lib/tasks/documentation.rake +++ b/lib/tasks/documentation.rake @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/tasks/email.rake b/lib/tasks/email.rake index 134814d4..9c264e03 100644 --- a/lib/tasks/email.rake +++ b/lib/tasks/email.rake @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/tasks/extract_fixtures.rake b/lib/tasks/extract_fixtures.rake index 3c21fbb2..9b9853b4 100644 --- a/lib/tasks/extract_fixtures.rake +++ b/lib/tasks/extract_fixtures.rake @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/tasks/fetch_changesets.rake b/lib/tasks/fetch_changesets.rake index fa4701f2..69d0c943 100644 --- a/lib/tasks/fetch_changesets.rake +++ b/lib/tasks/fetch_changesets.rake @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/tasks/initializers.rake b/lib/tasks/initializers.rake index ecd10424..7210f251 100644 --- a/lib/tasks/initializers.rake +++ b/lib/tasks/initializers.rake @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/tasks/jdbc.rake b/lib/tasks/jdbc.rake index 95e5609e..206373a0 100644 --- a/lib/tasks/jdbc.rake +++ b/lib/tasks/jdbc.rake @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/tasks/load_default_data.rake b/lib/tasks/load_default_data.rake index 16b10e2e..0fafa511 100644 --- a/lib/tasks/load_default_data.rake +++ b/lib/tasks/load_default_data.rake @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/tasks/locales.rake b/lib/tasks/locales.rake index 522820aa..67218a4c 100644 --- a/lib/tasks/locales.rake +++ b/lib/tasks/locales.rake @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/tasks/metrics.rake b/lib/tasks/metrics.rake index 5a15b327..e813a6b4 100644 --- a/lib/tasks/metrics.rake +++ b/lib/tasks/metrics.rake @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/tasks/migrate_from_mantis.rake b/lib/tasks/migrate_from_mantis.rake index 9454e911..48fcda8a 100644 --- a/lib/tasks/migrate_from_mantis.rake +++ b/lib/tasks/migrate_from_mantis.rake @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/tasks/migrate_from_trac.rake b/lib/tasks/migrate_from_trac.rake index 9e9f8d79..df5f1575 100644 --- a/lib/tasks/migrate_from_trac.rake +++ b/lib/tasks/migrate_from_trac.rake @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/tasks/permissions.rake b/lib/tasks/permissions.rake index f625b124..2b0f023d 100644 --- a/lib/tasks/permissions.rake +++ b/lib/tasks/permissions.rake @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/tasks/plugins.rake b/lib/tasks/plugins.rake index b13c4adf..19ab1acb 100644 --- a/lib/tasks/plugins.rake +++ b/lib/tasks/plugins.rake @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/tasks/release.rake b/lib/tasks/release.rake index 5572e43b..fab6133d 100644 --- a/lib/tasks/release.rake +++ b/lib/tasks/release.rake @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/tasks/reminder.rake b/lib/tasks/reminder.rake index 87a17e49..4d326176 100644 --- a/lib/tasks/reminder.rake +++ b/lib/tasks/reminder.rake @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/tasks/testing.rake b/lib/tasks/testing.rake index ef4fb49e..05de9567 100644 --- a/lib/tasks/testing.rake +++ b/lib/tasks/testing.rake @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/tasks/watchers.rake b/lib/tasks/watchers.rake index 9f2b8b20..9ba05e87 100644 --- a/lib/tasks/watchers.rake +++ b/lib/tasks/watchers.rake @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/lib/tasks/yardoc.rake b/lib/tasks/yardoc.rake index 6f54c07c..d10789c0 100644 --- a/lib/tasks/yardoc.rake +++ b/lib/tasks/yardoc.rake @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/public/htaccess.fcgi.example b/public/htaccess.fcgi.example index 3d3fb88b..6d34071d 100644 --- a/public/htaccess.fcgi.example +++ b/public/htaccess.fcgi.example @@ -1,55 +1,55 @@ -# General Apache options - - AddHandler fastcgi-script .fcgi - - - AddHandler fcgid-script .fcgi - - - AddHandler cgi-script .cgi - -Options +FollowSymLinks +ExecCGI - -# If you don't want Rails to look in certain directories, -# use the following rewrite rules so that Apache won't rewrite certain requests -# -# Example: -# RewriteCond %{REQUEST_URI} ^/notrails.* -# RewriteRule .* - [L] - -# Redirect all requests not available on the filesystem to Rails -# By default the cgi dispatcher is used which is very slow -# -# For better performance replace the dispatcher with the fastcgi one -# -# Example: -# RewriteRule ^(.*)$ dispatch.fcgi [QSA,L] -RewriteEngine On - -# If your Rails application is accessed via an Alias directive, -# then you MUST also set the RewriteBase in this htaccess file. -# -# Example: -# Alias /myrailsapp /path/to/myrailsapp/public -# RewriteBase /myrailsapp - -RewriteRule ^$ index.html [QSA] -RewriteRule ^([^.]+)$ $1.html [QSA] -RewriteCond %{REQUEST_FILENAME} !-f - - RewriteRule ^(.*)$ dispatch.fcgi [QSA,L] - - - RewriteRule ^(.*)$ dispatch.fcgi [QSA,L] - - - RewriteRule ^(.*)$ dispatch.cgi [QSA,L] - - -# In case Rails experiences terminal errors -# Instead of displaying this message you can supply a file here which will be rendered instead -# -# Example: -# ErrorDocument 500 /500.html - -ErrorDocument 500 "

Application error

Rails application failed to start properly" \ No newline at end of file +# General Apache options + + AddHandler fastcgi-script .fcgi + + + AddHandler fcgid-script .fcgi + + + AddHandler cgi-script .cgi + +Options +FollowSymLinks +ExecCGI + +# If you don't want Rails to look in certain directories, +# use the following rewrite rules so that Apache won't rewrite certain requests +# +# Example: +# RewriteCond %{REQUEST_URI} ^/notrails.* +# RewriteRule .* - [L] + +# Redirect all requests not available on the filesystem to Rails +# By default the cgi dispatcher is used which is very slow +# +# For better performance replace the dispatcher with the fastcgi one +# +# Example: +# RewriteRule ^(.*)$ dispatch.fcgi [QSA,L] +RewriteEngine On + +# If your Rails application is accessed via an Alias directive, +# then you MUST also set the RewriteBase in this htaccess file. +# +# Example: +# Alias /myrailsapp /path/to/myrailsapp/public +# RewriteBase /myrailsapp + +RewriteRule ^$ index.html [QSA] +RewriteRule ^([^.]+)$ $1.html [QSA] +RewriteCond %{REQUEST_FILENAME} !-f + + RewriteRule ^(.*)$ dispatch.fcgi [E=X-HTTP_AUTHORIZATION:{HTTP:Authorization},QSA,L] + + + RewriteRule ^(.*)$ dispatch.fcgi [E=X-HTTP_AUTHORIZATION:{HTTP:Authorization},QSA,L] + + + RewriteRule ^(.*)$ dispatch.cgi [E=X-HTTP_AUTHORIZATION:{HTTP:Authorization},QSA,L] + + +# In case Rails experiences terminal errors +# Instead of displaying this message you can supply a file here which will be rendered instead +# +# Example: +# ErrorDocument 500 /500.html + +ErrorDocument 500 "

Application error

Rails application failed to start properly" diff --git a/test/exemplars/attachment_exemplar.rb b/test/exemplars/attachment_exemplar.rb index c295a19f..d0408651 100644 --- a/test/exemplars/attachment_exemplar.rb +++ b/test/exemplars/attachment_exemplar.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/exemplars/auth_source_exemplar.rb b/test/exemplars/auth_source_exemplar.rb index f09235d8..1a8c8214 100644 --- a/test/exemplars/auth_source_exemplar.rb +++ b/test/exemplars/auth_source_exemplar.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/exemplars/board_exemplar.rb b/test/exemplars/board_exemplar.rb index 2cbb8d47..fc14de2c 100644 --- a/test/exemplars/board_exemplar.rb +++ b/test/exemplars/board_exemplar.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/exemplars/change_exemplar.rb b/test/exemplars/change_exemplar.rb index b822d2c5..9427dc1e 100644 --- a/test/exemplars/change_exemplar.rb +++ b/test/exemplars/change_exemplar.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/exemplars/changeset_exemplar.rb b/test/exemplars/changeset_exemplar.rb index dbf18671..fd6b9dd3 100644 --- a/test/exemplars/changeset_exemplar.rb +++ b/test/exemplars/changeset_exemplar.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/exemplars/comment_exemplar.rb b/test/exemplars/comment_exemplar.rb index 21d319f5..79a23589 100644 --- a/test/exemplars/comment_exemplar.rb +++ b/test/exemplars/comment_exemplar.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/exemplars/custom_field_exemplar.rb b/test/exemplars/custom_field_exemplar.rb index d2ddf568..d1ce8e56 100644 --- a/test/exemplars/custom_field_exemplar.rb +++ b/test/exemplars/custom_field_exemplar.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/exemplars/custom_value_exemplar.rb b/test/exemplars/custom_value_exemplar.rb index 1c9c9e02..47253b96 100644 --- a/test/exemplars/custom_value_exemplar.rb +++ b/test/exemplars/custom_value_exemplar.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/exemplars/document_category_exemplar.rb b/test/exemplars/document_category_exemplar.rb index b2ceab7f..ba4b993d 100644 --- a/test/exemplars/document_category_exemplar.rb +++ b/test/exemplars/document_category_exemplar.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/exemplars/document_exemplar.rb b/test/exemplars/document_exemplar.rb index 8b38a547..8d3289a8 100644 --- a/test/exemplars/document_exemplar.rb +++ b/test/exemplars/document_exemplar.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/exemplars/enabled_module_exemplar.rb b/test/exemplars/enabled_module_exemplar.rb index 86e62edf..592a72ec 100644 --- a/test/exemplars/enabled_module_exemplar.rb +++ b/test/exemplars/enabled_module_exemplar.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/exemplars/enumeration_exemplar.rb b/test/exemplars/enumeration_exemplar.rb index b21cdd92..0b64d4d7 100644 --- a/test/exemplars/enumeration_exemplar.rb +++ b/test/exemplars/enumeration_exemplar.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/exemplars/group_exemplar.rb b/test/exemplars/group_exemplar.rb index 7a3ccd69..8ef236e6 100644 --- a/test/exemplars/group_exemplar.rb +++ b/test/exemplars/group_exemplar.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/exemplars/issue_category_exemplar.rb b/test/exemplars/issue_category_exemplar.rb index 1be1468a..a067103d 100644 --- a/test/exemplars/issue_category_exemplar.rb +++ b/test/exemplars/issue_category_exemplar.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/exemplars/issue_exemplar.rb b/test/exemplars/issue_exemplar.rb index f646da54..b09f00e1 100644 --- a/test/exemplars/issue_exemplar.rb +++ b/test/exemplars/issue_exemplar.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/exemplars/issue_priority_exemplar.rb b/test/exemplars/issue_priority_exemplar.rb index d32c630d..36691f80 100644 --- a/test/exemplars/issue_priority_exemplar.rb +++ b/test/exemplars/issue_priority_exemplar.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/exemplars/issue_status_exemplar.rb b/test/exemplars/issue_status_exemplar.rb index cac6cd4c..32336b09 100644 --- a/test/exemplars/issue_status_exemplar.rb +++ b/test/exemplars/issue_status_exemplar.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/exemplars/journal_exemplar.rb b/test/exemplars/journal_exemplar.rb index fb3fcd30..87364018 100644 --- a/test/exemplars/journal_exemplar.rb +++ b/test/exemplars/journal_exemplar.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/exemplars/member_exemplar.rb b/test/exemplars/member_exemplar.rb index 885e9926..61f10f8f 100644 --- a/test/exemplars/member_exemplar.rb +++ b/test/exemplars/member_exemplar.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/exemplars/member_role_exemplar.rb b/test/exemplars/member_role_exemplar.rb index 7ff6536b..056fb178 100644 --- a/test/exemplars/member_role_exemplar.rb +++ b/test/exemplars/member_role_exemplar.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/exemplars/message_exemplar.rb b/test/exemplars/message_exemplar.rb index d97ff53e..74f3632b 100644 --- a/test/exemplars/message_exemplar.rb +++ b/test/exemplars/message_exemplar.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/exemplars/news_exemplar.rb b/test/exemplars/news_exemplar.rb index 4a62d77d..ce21c95c 100644 --- a/test/exemplars/news_exemplar.rb +++ b/test/exemplars/news_exemplar.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/exemplars/project_exemplar.rb b/test/exemplars/project_exemplar.rb index 33f07382..27a4ab18 100644 --- a/test/exemplars/project_exemplar.rb +++ b/test/exemplars/project_exemplar.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/exemplars/query_exemplar.rb b/test/exemplars/query_exemplar.rb index 2f8f49e6..64d56a45 100644 --- a/test/exemplars/query_exemplar.rb +++ b/test/exemplars/query_exemplar.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/exemplars/repository_exemplar.rb b/test/exemplars/repository_exemplar.rb index 104a06e5..7857b824 100644 --- a/test/exemplars/repository_exemplar.rb +++ b/test/exemplars/repository_exemplar.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/exemplars/role_exemplar.rb b/test/exemplars/role_exemplar.rb index 15e0ca7e..72ab5999 100644 --- a/test/exemplars/role_exemplar.rb +++ b/test/exemplars/role_exemplar.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/exemplars/subversion_repository_exemplar.rb b/test/exemplars/subversion_repository_exemplar.rb index e2b146d8..64961100 100644 --- a/test/exemplars/subversion_repository_exemplar.rb +++ b/test/exemplars/subversion_repository_exemplar.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/exemplars/time_entry_activity.rb b/test/exemplars/time_entry_activity.rb index 8a95b7d3..e7c96ef9 100644 --- a/test/exemplars/time_entry_activity.rb +++ b/test/exemplars/time_entry_activity.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/exemplars/time_entry_exemplar.rb b/test/exemplars/time_entry_exemplar.rb index 5325601b..66a56df9 100644 --- a/test/exemplars/time_entry_exemplar.rb +++ b/test/exemplars/time_entry_exemplar.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/exemplars/tracker_exemplar.rb b/test/exemplars/tracker_exemplar.rb index a07be9d3..5a1862ed 100644 --- a/test/exemplars/tracker_exemplar.rb +++ b/test/exemplars/tracker_exemplar.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/exemplars/user_exemplar.rb b/test/exemplars/user_exemplar.rb index c28f3e3c..0cb1aa68 100644 --- a/test/exemplars/user_exemplar.rb +++ b/test/exemplars/user_exemplar.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/exemplars/version_exemplar.rb b/test/exemplars/version_exemplar.rb index 2af2b4c7..9a8fa51f 100644 --- a/test/exemplars/version_exemplar.rb +++ b/test/exemplars/version_exemplar.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/exemplars/watcher_exemplar.rb b/test/exemplars/watcher_exemplar.rb index 8ae9e7f6..b6084df4 100644 --- a/test/exemplars/watcher_exemplar.rb +++ b/test/exemplars/watcher_exemplar.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/exemplars/wiki_content_exemplar.rb b/test/exemplars/wiki_content_exemplar.rb index 5c6c253c..bf4d0791 100644 --- a/test/exemplars/wiki_content_exemplar.rb +++ b/test/exemplars/wiki_content_exemplar.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/exemplars/wiki_exemplar.rb b/test/exemplars/wiki_exemplar.rb index d9e19b21..1716eb25 100644 --- a/test/exemplars/wiki_exemplar.rb +++ b/test/exemplars/wiki_exemplar.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/exemplars/wiki_page_exemplar.rb b/test/exemplars/wiki_page_exemplar.rb index a7aa4e46..04bc796f 100644 --- a/test/exemplars/wiki_page_exemplar.rb +++ b/test/exemplars/wiki_page_exemplar.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/exemplars/wiki_redirect_exemplar.rb b/test/exemplars/wiki_redirect_exemplar.rb index 91e40f13..52e18b32 100644 --- a/test/exemplars/wiki_redirect_exemplar.rb +++ b/test/exemplars/wiki_redirect_exemplar.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/fixtures/files/060719210727_source.rb b/test/fixtures/files/060719210727_source.rb index c9f4d316..4ea582ea 100644 --- a/test/fixtures/files/060719210727_source.rb +++ b/test/fixtures/files/060719210727_source.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/fixtures/ldap/slapd_config.ldif b/test/fixtures/ldap/slapd_config.ldif new file mode 100644 index 00000000..b08dddbc --- /dev/null +++ b/test/fixtures/ldap/slapd_config.ldif @@ -0,0 +1,27 @@ +# This is a configuration for a new database to test the ldap plugin. +# It is assumed that you have a ldap server up and running. Do not +# use this file on a new openldap installation. + +# Database settings +dn: olcDatabase=hdb,cn=config +objectClass: olcDatabaseConfig +objectClass: olcHdbConfig +olcDatabase: hdb +olcSuffix: dc=redmine,dc=org +# WARNING: Do not use a directory that already contains a ldap database. +# Each database has to be stored in a seperate directory. The directory +# /var/lib/ldap is the default directory on Debian. +olcDbDirectory: /var/lib/ldap/redmine +olcRootDN: cn=Manager,dc=redmine,dc=org +olcRootPW: secret +olcDbConfig: set_cachesize 0 2097152 0 +olcDbConfig: set_lk_max_objects 1500 +olcDbConfig: set_lk_max_locks 1500 +olcDbConfig: set_lk_max_lockers 1500 +olcDbIndex: objectClass eq +olcLastMod: TRUE +olcDbCheckpoint: 512 30 +olcAccess: to attrs=userPassword by dn="cn=Manager,dc=redmine,dc=org" write by anonymous auth by self write by * none +olcAccess: to attrs=shadowLastChange by self write by * read +olcAccess: to dn.base="" by * read +olcAccess: to * by dn="cn=Manager,dc=redmine,dc=org" write by * read diff --git a/test/fixtures/ldap/test-ldap.ldif b/test/fixtures/ldap/test-ldap.ldif index 7d9e109c..8a4ce5aa 100644 --- a/test/fixtures/ldap/test-ldap.ldif +++ b/test/fixtures/ldap/test-ldap.ldif @@ -4,39 +4,11 @@ objectClass: dcObject objectClass: organization o: redmine.org dc: redmine -structuralObjectClass: organization -entryUUID: 886f5fca-0a87-102e-8d06-67c361d9bd2d -creatorsName: -createTimestamp: 20090721211642Z -entryCSN: 20090721211642.955188Z#000000#000#000000 -modifiersName: -modifyTimestamp: 20090721211642Z - -dn: cn=admin,dc=redmine,dc=org -objectClass: simpleSecurityObject -objectClass: organizationalRole -cn: admin -description: LDAP administrator -userPassword:: e2NyeXB0fWlWTU9DcUt6WWxXRDI= -structuralObjectClass: organizationalRole -entryUUID: 88704e44-0a87-102e-8d07-67c361d9bd2d -creatorsName: -createTimestamp: 20090721211642Z -entryCSN: 20090721211642.961418Z#000000#000#000000 -modifiersName: -modifyTimestamp: 20090721211642Z dn: ou=Person,dc=redmine,dc=org ou: Person objectClass: top objectClass: organizationalUnit -structuralObjectClass: organizationalUnit -entryUUID: d39dd388-0c84-102e-82fa-dff86c63a7d6 -creatorsName: cn=admin,dc=redmine,dc=org -createTimestamp: 20090724100222Z -entryCSN: 20090724100222.924226Z#000000#000#000000 -modifiersName: cn=admin,dc=redmine,dc=org -modifyTimestamp: 20090724100222Z dn: uid=example1,ou=Person,dc=redmine,dc=org objectClass: posixAccount @@ -48,16 +20,9 @@ sn: One uid: example1 homeDirectory: /home/example1 cn: Example One -structuralObjectClass: inetOrgPerson -entryUUID: 285d304e-0c8a-102e-82fc-dff86c63a7d6 -creatorsName: cn=admin,dc=redmine,dc=org -createTimestamp: 20090724104032Z uidNumber: 0 mail: example1@redmine.org userPassword:: e1NIQX1mRXFOQ2NvM1lxOWg1WlVnbEQzQ1pKVDRsQnM9 -entryCSN: 20090724105945.375801Z#000000#000#000000 -modifiersName: cn=admin,dc=redmine,dc=org -modifyTimestamp: 20090724105945Z dn: uid=edavis,ou=Person,dc=redmine,dc=org objectClass: posixAccount @@ -68,15 +33,8 @@ givenName: Eric sn: Davis uid: edavis mail: edavis@littlestreamsoftware.com -structuralObjectClass: inetOrgPerson -entryUUID: 9c5f0502-0c8b-102e-82fe-dff86c63a7d6 -creatorsName: cn=admin,dc=redmine,dc=org -createTimestamp: 20090724105056Z homeDirectory: /home/edavis cn: Eric Davis uidNumber: 0 userPassword:: e1NIQX1mRXFOQ2NvM1lxOWg1WlVnbEQzQ1pKVDRsQnM9 -entryCSN: 20090724105937.734480Z#000000#000#000000 -modifiersName: cn=admin,dc=redmine,dc=org -modifyTimestamp: 20090724105937Z diff --git a/test/functional/account_controller_test.rb b/test/functional/account_controller_test.rb index 6c3ab70d..4c87e1eb 100644 --- a/test/functional/account_controller_test.rb +++ b/test/functional/account_controller_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -47,6 +47,17 @@ class AccountControllerTest < ActionController::TestCase :content => /Invalid user or password/ end + def test_login + get :login + assert_template 'login' + end + + def test_login_with_logged_account + @request.session[:user_id] = 2 + get :login + assert_redirected_to home_url + end + if Object.const_defined?(:OpenID) def test_login_with_openid_for_existing_user diff --git a/test/functional/activities_controller_test.rb b/test/functional/activities_controller_test.rb index 7de324d4..7fc6f708 100644 --- a/test/functional/activities_controller_test.rb +++ b/test/functional/activities_controller_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/functional/admin_controller_test.rb b/test/functional/admin_controller_test.rb index 8569565a..800d12f2 100644 --- a/test/functional/admin_controller_test.rb +++ b/test/functional/admin_controller_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/functional/application_controller_test.rb b/test/functional/application_controller_test.rb index 39c8a196..cea07095 100644 --- a/test/functional/application_controller_test.rb +++ b/test/functional/application_controller_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/functional/attachments_controller_test.rb b/test/functional/attachments_controller_test.rb index 71e464ce..074348ba 100644 --- a/test/functional/attachments_controller_test.rb +++ b/test/functional/attachments_controller_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/functional/auth_sources_controller_test.rb b/test/functional/auth_sources_controller_test.rb index e462f669..b1e39107 100644 --- a/test/functional/auth_sources_controller_test.rb +++ b/test/functional/auth_sources_controller_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/functional/auto_completes_controller_test.rb b/test/functional/auto_completes_controller_test.rb index 88ed0f1e..84e62cf4 100644 --- a/test/functional/auto_completes_controller_test.rb +++ b/test/functional/auto_completes_controller_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/functional/boards_controller_test.rb b/test/functional/boards_controller_test.rb index ac527084..344b64c5 100644 --- a/test/functional/boards_controller_test.rb +++ b/test/functional/boards_controller_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/functional/calendars_controller_test.rb b/test/functional/calendars_controller_test.rb index 2e3b7723..4d031fc9 100644 --- a/test/functional/calendars_controller_test.rb +++ b/test/functional/calendars_controller_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/functional/comments_controller_test.rb b/test/functional/comments_controller_test.rb index f41c1100..367a43e6 100644 --- a/test/functional/comments_controller_test.rb +++ b/test/functional/comments_controller_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/functional/context_menus_controller_test.rb b/test/functional/context_menus_controller_test.rb index ec3234be..00048973 100644 --- a/test/functional/context_menus_controller_test.rb +++ b/test/functional/context_menus_controller_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/functional/custom_fields_controller_test.rb b/test/functional/custom_fields_controller_test.rb index ee93cde8..3d9f59cd 100644 --- a/test/functional/custom_fields_controller_test.rb +++ b/test/functional/custom_fields_controller_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/functional/documents_controller_test.rb b/test/functional/documents_controller_test.rb index d3c5d457..2375594a 100644 --- a/test/functional/documents_controller_test.rb +++ b/test/functional/documents_controller_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/functional/enumerations_controller_test.rb b/test/functional/enumerations_controller_test.rb index 84e02e2f..0ca74b4e 100644 --- a/test/functional/enumerations_controller_test.rb +++ b/test/functional/enumerations_controller_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/functional/files_controller_test.rb b/test/functional/files_controller_test.rb index 8bb293ad..60031289 100644 --- a/test/functional/files_controller_test.rb +++ b/test/functional/files_controller_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/functional/gantts_controller_test.rb b/test/functional/gantts_controller_test.rb index 7efc9d0a..c6a83919 100644 --- a/test/functional/gantts_controller_test.rb +++ b/test/functional/gantts_controller_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/functional/groups_controller_test.rb b/test/functional/groups_controller_test.rb index da656e06..7568d29f 100644 --- a/test/functional/groups_controller_test.rb +++ b/test/functional/groups_controller_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/functional/help_controller_test.rb b/test/functional/help_controller_test.rb index caf2c551..e41fbae1 100644 --- a/test/functional/help_controller_test.rb +++ b/test/functional/help_controller_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/functional/issue_categories_controller_test.rb b/test/functional/issue_categories_controller_test.rb index d1e6ab2e..1bbc34c7 100644 --- a/test/functional/issue_categories_controller_test.rb +++ b/test/functional/issue_categories_controller_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/functional/issue_moves_controller_test.rb b/test/functional/issue_moves_controller_test.rb index e2dece9e..c800cc40 100644 --- a/test/functional/issue_moves_controller_test.rb +++ b/test/functional/issue_moves_controller_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/functional/issue_relations_controller_test.rb b/test/functional/issue_relations_controller_test.rb index 52d10962..023b08e9 100644 --- a/test/functional/issue_relations_controller_test.rb +++ b/test/functional/issue_relations_controller_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/functional/issue_statuses_controller_test.rb b/test/functional/issue_statuses_controller_test.rb index 4c77fe6f..cb630394 100644 --- a/test/functional/issue_statuses_controller_test.rb +++ b/test/functional/issue_statuses_controller_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb index 27930f6a..9f186ce4 100644 --- a/test/functional/issues_controller_test.rb +++ b/test/functional/issues_controller_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/functional/issues_controller_transaction_test.rb b/test/functional/issues_controller_transaction_test.rb index 8e0acb99..8029cf2f 100644 --- a/test/functional/issues_controller_transaction_test.rb +++ b/test/functional/issues_controller_transaction_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/functional/journals_controller_test.rb b/test/functional/journals_controller_test.rb index 2646b347..7654682a 100644 --- a/test/functional/journals_controller_test.rb +++ b/test/functional/journals_controller_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/functional/ldap_auth_sources_controller.rb b/test/functional/ldap_auth_sources_controller.rb index 3f88d01a..ed7af8a3 100644 --- a/test/functional/ldap_auth_sources_controller.rb +++ b/test/functional/ldap_auth_sources_controller.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/functional/mail_handler_controller_test.rb b/test/functional/mail_handler_controller_test.rb index 46e0940b..62e42256 100644 --- a/test/functional/mail_handler_controller_test.rb +++ b/test/functional/mail_handler_controller_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/functional/members_controller_test.rb b/test/functional/members_controller_test.rb index 42b6343c..956a27b2 100644 --- a/test/functional/members_controller_test.rb +++ b/test/functional/members_controller_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/functional/messages_controller_test.rb b/test/functional/messages_controller_test.rb index 9b34159a..d9800e56 100644 --- a/test/functional/messages_controller_test.rb +++ b/test/functional/messages_controller_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/functional/my_controller_test.rb b/test/functional/my_controller_test.rb index d48e4a32..9ca184ac 100644 --- a/test/functional/my_controller_test.rb +++ b/test/functional/my_controller_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/functional/news_controller_test.rb b/test/functional/news_controller_test.rb index bd2dbde0..b2ae7ab4 100644 --- a/test/functional/news_controller_test.rb +++ b/test/functional/news_controller_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/functional/previews_controller_test.rb b/test/functional/previews_controller_test.rb index 76d0029b..37c63e88 100644 --- a/test/functional/previews_controller_test.rb +++ b/test/functional/previews_controller_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/functional/project_enumerations_controller_test.rb b/test/functional/project_enumerations_controller_test.rb index f869d275..5da7ed24 100644 --- a/test/functional/project_enumerations_controller_test.rb +++ b/test/functional/project_enumerations_controller_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb index 568cf841..bc62708f 100644 --- a/test/functional/projects_controller_test.rb +++ b/test/functional/projects_controller_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/functional/queries_controller_test.rb b/test/functional/queries_controller_test.rb index 9a116add..2f633fd4 100644 --- a/test/functional/queries_controller_test.rb +++ b/test/functional/queries_controller_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/functional/reports_controller_test.rb b/test/functional/reports_controller_test.rb index 60da8fb9..af24e613 100644 --- a/test/functional/reports_controller_test.rb +++ b/test/functional/reports_controller_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/functional/repositories_bazaar_controller_test.rb b/test/functional/repositories_bazaar_controller_test.rb index eceb0572..b493c45c 100644 --- a/test/functional/repositories_bazaar_controller_test.rb +++ b/test/functional/repositories_bazaar_controller_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/functional/repositories_controller_test.rb b/test/functional/repositories_controller_test.rb index 27d11fbe..258f36d6 100644 --- a/test/functional/repositories_controller_test.rb +++ b/test/functional/repositories_controller_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/functional/repositories_cvs_controller_test.rb b/test/functional/repositories_cvs_controller_test.rb index 708de0dc..ef22f344 100644 --- a/test/functional/repositories_cvs_controller_test.rb +++ b/test/functional/repositories_cvs_controller_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/functional/repositories_darcs_controller_test.rb b/test/functional/repositories_darcs_controller_test.rb index 2c95cd48..0a3944e9 100644 --- a/test/functional/repositories_darcs_controller_test.rb +++ b/test/functional/repositories_darcs_controller_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/functional/repositories_filesystem_controller_test.rb b/test/functional/repositories_filesystem_controller_test.rb index 4595a5f1..8ea577f6 100644 --- a/test/functional/repositories_filesystem_controller_test.rb +++ b/test/functional/repositories_filesystem_controller_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/functional/repositories_git_controller_test.rb b/test/functional/repositories_git_controller_test.rb index d52f7d1a..02d014d3 100644 --- a/test/functional/repositories_git_controller_test.rb +++ b/test/functional/repositories_git_controller_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/functional/repositories_mercurial_controller_test.rb b/test/functional/repositories_mercurial_controller_test.rb index 0815ce54..aa53ca85 100644 --- a/test/functional/repositories_mercurial_controller_test.rb +++ b/test/functional/repositories_mercurial_controller_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/functional/repositories_subversion_controller_test.rb b/test/functional/repositories_subversion_controller_test.rb index f209e3cd..90b49224 100644 --- a/test/functional/repositories_subversion_controller_test.rb +++ b/test/functional/repositories_subversion_controller_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/functional/roles_controller_test.rb b/test/functional/roles_controller_test.rb index d525269e..653fd071 100644 --- a/test/functional/roles_controller_test.rb +++ b/test/functional/roles_controller_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/functional/search_controller_test.rb b/test/functional/search_controller_test.rb index 3423188c..e443c3b8 100644 --- a/test/functional/search_controller_test.rb +++ b/test/functional/search_controller_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/functional/settings_controller_test.rb b/test/functional/settings_controller_test.rb index c9d05a1e..5f0bb63a 100644 --- a/test/functional/settings_controller_test.rb +++ b/test/functional/settings_controller_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/functional/sys_controller_test.rb b/test/functional/sys_controller_test.rb index 0465b5e6..0226229a 100644 --- a/test/functional/sys_controller_test.rb +++ b/test/functional/sys_controller_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/functional/time_entry_reports_controller_test.rb b/test/functional/time_entry_reports_controller_test.rb index ed8f04b8..5ad5c971 100644 --- a/test/functional/time_entry_reports_controller_test.rb +++ b/test/functional/time_entry_reports_controller_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/functional/timelog_controller_test.rb b/test/functional/timelog_controller_test.rb index 103c1ca4..24c3a562 100644 --- a/test/functional/timelog_controller_test.rb +++ b/test/functional/timelog_controller_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/functional/trackers_controller_test.rb b/test/functional/trackers_controller_test.rb index 6c39df75..0dfb3dd7 100644 --- a/test/functional/trackers_controller_test.rb +++ b/test/functional/trackers_controller_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/functional/users_controller_test.rb b/test/functional/users_controller_test.rb index d97291fa..c09b2a4f 100644 --- a/test/functional/users_controller_test.rb +++ b/test/functional/users_controller_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/functional/versions_controller_test.rb b/test/functional/versions_controller_test.rb index 29ab460c..3c71520d 100644 --- a/test/functional/versions_controller_test.rb +++ b/test/functional/versions_controller_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/functional/watchers_controller_test.rb b/test/functional/watchers_controller_test.rb index 7023908f..17bc7397 100644 --- a/test/functional/watchers_controller_test.rb +++ b/test/functional/watchers_controller_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/functional/welcome_controller_test.rb b/test/functional/welcome_controller_test.rb index d97d5c51..feff90cf 100644 --- a/test/functional/welcome_controller_test.rb +++ b/test/functional/welcome_controller_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/functional/wiki_controller_test.rb b/test/functional/wiki_controller_test.rb index d8b442df..355ddc50 100644 --- a/test/functional/wiki_controller_test.rb +++ b/test/functional/wiki_controller_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/functional/wikis_controller_test.rb b/test/functional/wikis_controller_test.rb index 763129c7..826da5fd 100644 --- a/test/functional/wikis_controller_test.rb +++ b/test/functional/wikis_controller_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/functional/workflows_controller_test.rb b/test/functional/workflows_controller_test.rb index daf061af..f626f5d3 100644 --- a/test/functional/workflows_controller_test.rb +++ b/test/functional/workflows_controller_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/helper_testcase.rb b/test/helper_testcase.rb index 9f7e2c42..232f19f1 100644 --- a/test/helper_testcase.rb +++ b/test/helper_testcase.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/integration/account_test.rb b/test/integration/account_test.rb index 4d788d1c..9365ba52 100644 --- a/test/integration/account_test.rb +++ b/test/integration/account_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/integration/admin_test.rb b/test/integration/admin_test.rb index b25fb11f..94593b95 100644 --- a/test/integration/admin_test.rb +++ b/test/integration/admin_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/integration/api_test/disabled_rest_api_test.rb b/test/integration/api_test/disabled_rest_api_test.rb index fef35a86..d583441f 100644 --- a/test/integration/api_test/disabled_rest_api_test.rb +++ b/test/integration/api_test/disabled_rest_api_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/integration/api_test/http_basic_login_test.rb b/test/integration/api_test/http_basic_login_test.rb index 2e59e53d..2a309d33 100644 --- a/test/integration/api_test/http_basic_login_test.rb +++ b/test/integration/api_test/http_basic_login_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/integration/api_test/http_basic_login_with_api_token_test.rb b/test/integration/api_test/http_basic_login_with_api_token_test.rb index 0e3c6e91..0dad8fce 100644 --- a/test/integration/api_test/http_basic_login_with_api_token_test.rb +++ b/test/integration/api_test/http_basic_login_with_api_token_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/integration/api_test/issues_test.rb b/test/integration/api_test/issues_test.rb index 702b3132..e595a573 100644 --- a/test/integration/api_test/issues_test.rb +++ b/test/integration/api_test/issues_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/integration/api_test/news_test.rb b/test/integration/api_test/news_test.rb index 3c81aaa6..9c4de78b 100644 --- a/test/integration/api_test/news_test.rb +++ b/test/integration/api_test/news_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/integration/api_test/projects_test.rb b/test/integration/api_test/projects_test.rb index 1af87b7d..3ae3f901 100644 --- a/test/integration/api_test/projects_test.rb +++ b/test/integration/api_test/projects_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/integration/api_test/time_entries_test.rb b/test/integration/api_test/time_entries_test.rb index fc411858..f985821c 100644 --- a/test/integration/api_test/time_entries_test.rb +++ b/test/integration/api_test/time_entries_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/integration/api_test/token_authentication_test.rb b/test/integration/api_test/token_authentication_test.rb index 82047289..f2b2add5 100644 --- a/test/integration/api_test/token_authentication_test.rb +++ b/test/integration/api_test/token_authentication_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/integration/api_test/users_test.rb b/test/integration/api_test/users_test.rb index bdb373ed..1e47ae61 100644 --- a/test/integration/api_test/users_test.rb +++ b/test/integration/api_test/users_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/integration/application_test.rb b/test/integration/application_test.rb index 6dc662a3..d99bf190 100644 --- a/test/integration/application_test.rb +++ b/test/integration/application_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/integration/issues_test.rb b/test/integration/issues_test.rb index 19c2070b..9cc666a6 100644 --- a/test/integration/issues_test.rb +++ b/test/integration/issues_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/integration/layout_test.rb b/test/integration/layout_test.rb index a19e07bf..ab2ea581 100644 --- a/test/integration/layout_test.rb +++ b/test/integration/layout_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/integration/lib/redmine/menu_manager_test.rb b/test/integration/lib/redmine/menu_manager_test.rb index a60ef3cc..8078eb58 100644 --- a/test/integration/lib/redmine/menu_manager_test.rb +++ b/test/integration/lib/redmine/menu_manager_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/integration/lib/redmine/themes_test.rb b/test/integration/lib/redmine/themes_test.rb index e56a1348..9c23f573 100644 --- a/test/integration/lib/redmine/themes_test.rb +++ b/test/integration/lib/redmine/themes_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/integration/projects_test.rb b/test/integration/projects_test.rb index 0ffdf0a5..dd985d85 100644 --- a/test/integration/projects_test.rb +++ b/test/integration/projects_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/integration/routing_test.rb b/test/integration/routing_test.rb index 6ae25c47..1822ad20 100644 --- a/test/integration/routing_test.rb +++ b/test/integration/routing_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/mocks/open_id_authentication_mock.rb b/test/mocks/open_id_authentication_mock.rb index f7b5d57e..babbce88 100644 --- a/test/mocks/open_id_authentication_mock.rb +++ b/test/mocks/open_id_authentication_mock.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/object_daddy_helpers.rb b/test/object_daddy_helpers.rb index 497176a6..70c1eeb4 100644 --- a/test/object_daddy_helpers.rb +++ b/test/object_daddy_helpers.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/test_helper.rb b/test/test_helper.rb index 9ba570b2..49debf3b 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/activity_test.rb b/test/unit/activity_test.rb index 02216893..9dbe4d12 100644 --- a/test/unit/activity_test.rb +++ b/test/unit/activity_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/attachment_test.rb b/test/unit/attachment_test.rb index 7351addc..8d960ccc 100644 --- a/test/unit/attachment_test.rb +++ b/test/unit/attachment_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/auth_source_ldap_test.rb b/test/unit/auth_source_ldap_test.rb index b383b906..66f8a3e7 100644 --- a/test/unit/auth_source_ldap_test.rb +++ b/test/unit/auth_source_ldap_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -31,6 +31,20 @@ class AuthSourceLdapTest < ActiveSupport::TestCase assert_equal 'givenName', a.reload.attr_firstname end + context "validations" do + should "validate that custom_filter is a valid LDAP filter" do + @auth = AuthSourceLdap.new(:name => 'Validation', :host => 'localhost', :port => 389, :attr_login => 'login') + @auth.custom_filter = "(& (homeDirectory=*) (sn=O*" # Missing (( + assert @auth.invalid? + assert_equal "is invalid", @auth.errors.on(:custom_filter) + + @auth.custom_filter = "(& (homeDirectory=*) (sn=O*))" + assert @auth.valid? + assert_equal nil, @auth.errors.on(:custom_filter) + + end + end + if ldap_configured? context '#authenticate' do setup do @@ -69,6 +83,32 @@ class AuthSourceLdapTest < ActiveSupport::TestCase end end + context "using a valid custom filter" do + setup do + @auth.update_attributes(:custom_filter => "(& (homeDirectory=*) (sn=O*))") + end + + should "find a user who authenticates and matches the custom filter" do + assert_not_nil @auth.authenticate('example1', '123456') + end + + should "be nil for users who don't match the custom filter" do + assert_nil @auth.authenticate('edavis', '123456') + end + end + + context "using an invalid custom filter" do + setup do + # missing )) at the end + @auth.update_attributes(:custom_filter => "(& (homeDirectory=*) (sn=O*") + end + + should "skip the custom filter" do + assert_not_nil @auth.authenticate('example1', '123456') + assert_not_nil @auth.authenticate('edavis', '123456') + end + end + end else puts '(Test LDAP server not configured)' diff --git a/test/unit/board_test.rb b/test/unit/board_test.rb index 4a31e11b..1ff2bea6 100644 --- a/test/unit/board_test.rb +++ b/test/unit/board_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/changeset_test.rb b/test/unit/changeset_test.rb index 43951267..1a5d7330 100644 --- a/test/unit/changeset_test.rb +++ b/test/unit/changeset_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/comment_test.rb b/test/unit/comment_test.rb index aeefbddf..4ec38c96 100644 --- a/test/unit/comment_test.rb +++ b/test/unit/comment_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/custom_field_test.rb b/test/unit/custom_field_test.rb index e20b7193..9074f9d7 100644 --- a/test/unit/custom_field_test.rb +++ b/test/unit/custom_field_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/custom_field_user_format_test.rb b/test/unit/custom_field_user_format_test.rb index 9bdf85e4..e84a08c7 100644 --- a/test/unit/custom_field_user_format_test.rb +++ b/test/unit/custom_field_user_format_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/custom_value_test.rb b/test/unit/custom_value_test.rb index fb0eb067..c1cef5e8 100644 --- a/test/unit/custom_value_test.rb +++ b/test/unit/custom_value_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/default_data_test.rb b/test/unit/default_data_test.rb index 9cfd9a4c..db2f8b55 100644 --- a/test/unit/default_data_test.rb +++ b/test/unit/default_data_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/document_category_test.rb b/test/unit/document_category_test.rb index b58d497c..17a83dd8 100644 --- a/test/unit/document_category_test.rb +++ b/test/unit/document_category_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/document_test.rb b/test/unit/document_test.rb index a82a6233..888b45a6 100644 --- a/test/unit/document_test.rb +++ b/test/unit/document_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/enabled_module_test.rb b/test/unit/enabled_module_test.rb index c0adee88..1c717220 100644 --- a/test/unit/enabled_module_test.rb +++ b/test/unit/enabled_module_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/enumeration_test.rb b/test/unit/enumeration_test.rb index f4e708eb..ca38eed3 100644 --- a/test/unit/enumeration_test.rb +++ b/test/unit/enumeration_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/group_test.rb b/test/unit/group_test.rb index 774991db..ce672e33 100644 --- a/test/unit/group_test.rb +++ b/test/unit/group_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/helpers/application_helper_test.rb b/test/unit/helpers/application_helper_test.rb index d1a6e255..7a2b03c0 100644 --- a/test/unit/helpers/application_helper_test.rb +++ b/test/unit/helpers/application_helper_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/helpers/custom_fields_helper_test.rb b/test/unit/helpers/custom_fields_helper_test.rb index c87021f4..e4e7bad2 100644 --- a/test/unit/helpers/custom_fields_helper_test.rb +++ b/test/unit/helpers/custom_fields_helper_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/helpers/issue_moves_helper_test.rb b/test/unit/helpers/issue_moves_helper_test.rb index 4ab9dd27..d4fc239b 100644 --- a/test/unit/helpers/issue_moves_helper_test.rb +++ b/test/unit/helpers/issue_moves_helper_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/helpers/issues_helper_test.rb b/test/unit/helpers/issues_helper_test.rb index f21f7ff0..1be89480 100644 --- a/test/unit/helpers/issues_helper_test.rb +++ b/test/unit/helpers/issues_helper_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/helpers/projects_helper_test.rb b/test/unit/helpers/projects_helper_test.rb index cae9d1da..137b6ede 100644 --- a/test/unit/helpers/projects_helper_test.rb +++ b/test/unit/helpers/projects_helper_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/helpers/repository_helper_test.rb b/test/unit/helpers/repository_helper_test.rb index 0364c27a..8550e36c 100644 --- a/test/unit/helpers/repository_helper_test.rb +++ b/test/unit/helpers/repository_helper_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/helpers/search_helper_test.rb b/test/unit/helpers/search_helper_test.rb index 9309e5c0..c6153ca1 100644 --- a/test/unit/helpers/search_helper_test.rb +++ b/test/unit/helpers/search_helper_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/helpers/sort_helper_test.rb b/test/unit/helpers/sort_helper_test.rb index 1921f711..43321fb2 100644 --- a/test/unit/helpers/sort_helper_test.rb +++ b/test/unit/helpers/sort_helper_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/helpers/timelog_helper_test.rb b/test/unit/helpers/timelog_helper_test.rb index f8db3940..7057b5a0 100644 --- a/test/unit/helpers/timelog_helper_test.rb +++ b/test/unit/helpers/timelog_helper_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/helpers/watchers_helpers_test.rb b/test/unit/helpers/watchers_helpers_test.rb index 6d97b5dd..a8b16014 100644 --- a/test/unit/helpers/watchers_helpers_test.rb +++ b/test/unit/helpers/watchers_helpers_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/issue_category_test.rb b/test/unit/issue_category_test.rb index e53755c9..a433e14f 100644 --- a/test/unit/issue_category_test.rb +++ b/test/unit/issue_category_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/issue_nested_set_test.rb b/test/unit/issue_nested_set_test.rb index aa376b1f..91d75da6 100644 --- a/test/unit/issue_nested_set_test.rb +++ b/test/unit/issue_nested_set_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/issue_priority_test.rb b/test/unit/issue_priority_test.rb index 5898e207..d236bc13 100644 --- a/test/unit/issue_priority_test.rb +++ b/test/unit/issue_priority_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/issue_relation_test.rb b/test/unit/issue_relation_test.rb index d4d213a9..a8f23a67 100644 --- a/test/unit/issue_relation_test.rb +++ b/test/unit/issue_relation_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/issue_status_test.rb b/test/unit/issue_status_test.rb index fc06ce18..4ed77c12 100644 --- a/test/unit/issue_status_test.rb +++ b/test/unit/issue_status_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/issue_test.rb b/test/unit/issue_test.rb index 448cadbb..b41591df 100644 --- a/test/unit/issue_test.rb +++ b/test/unit/issue_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/journal_observer_test.rb b/test/unit/journal_observer_test.rb index 01ccaf31..eae8fc6b 100644 --- a/test/unit/journal_observer_test.rb +++ b/test/unit/journal_observer_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/journal_test.rb b/test/unit/journal_test.rb index 6333058b..4e79f4d6 100644 --- a/test/unit/journal_test.rb +++ b/test/unit/journal_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -115,4 +115,29 @@ class JournalTest < ActiveSupport::TestCase assert_equal "Test setting fields on Journal from Issue", @issue.last_journal.notes assert_equal @issue.author, @issue.last_journal.user end + + test "subclasses of journaled models should have journal of parent type" do + Ticket = Class.new(Issue) + + project = Project.generate! + ticket = Ticket.new do |t| + t.project = project + t.subject = "Test initial journal" + t.tracker = project.trackers.first + t.author = User.generate! + t.description = "Some content" + end + + begin + oldstdout = $stdout + $stdout = StringIO.new + ticket.save! + assert $stdout.string.empty?, "No errors should be logged to stdout." + ensure + $stdout = oldstdout + end + + journal = ticket.journals.first + assert_equal IssueJournal, journal.class + end end diff --git a/test/unit/lib/chili_project/database_test.rb b/test/unit/lib/chili_project/database_test.rb index c0596738..6c613e17 100644 --- a/test/unit/lib/chili_project/database_test.rb +++ b/test/unit/lib/chili_project/database_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/lib/redmine/access_control_test.rb b/test/unit/lib/redmine/access_control_test.rb index a1f3b727..33344e20 100644 --- a/test/unit/lib/redmine/access_control_test.rb +++ b/test/unit/lib/redmine/access_control_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/lib/redmine/ciphering_test.rb b/test/unit/lib/redmine/ciphering_test.rb index a194c0b3..e3ff357a 100644 --- a/test/unit/lib/redmine/ciphering_test.rb +++ b/test/unit/lib/redmine/ciphering_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/lib/redmine/configuration_test.rb b/test/unit/lib/redmine/configuration_test.rb index bc5a157d..d0488e97 100644 --- a/test/unit/lib/redmine/configuration_test.rb +++ b/test/unit/lib/redmine/configuration_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/lib/redmine/helpers/calendar_test.rb b/test/unit/lib/redmine/helpers/calendar_test.rb index 99b271c8..1c38b8d7 100644 --- a/test/unit/lib/redmine/helpers/calendar_test.rb +++ b/test/unit/lib/redmine/helpers/calendar_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/lib/redmine/helpers/gantt_test.rb b/test/unit/lib/redmine/helpers/gantt_test.rb index 3f31d4ba..ac7661bf 100644 --- a/test/unit/lib/redmine/helpers/gantt_test.rb +++ b/test/unit/lib/redmine/helpers/gantt_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/lib/redmine/hook_test.rb b/test/unit/lib/redmine/hook_test.rb index ef385c1f..1a99675d 100644 --- a/test/unit/lib/redmine/hook_test.rb +++ b/test/unit/lib/redmine/hook_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/lib/redmine/i18n_test.rb b/test/unit/lib/redmine/i18n_test.rb index 5a80ee4c..cfbee822 100644 --- a/test/unit/lib/redmine/i18n_test.rb +++ b/test/unit/lib/redmine/i18n_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/lib/redmine/menu_manager/mapper_test.rb b/test/unit/lib/redmine/menu_manager/mapper_test.rb index 7f7ffdd0..3fc97c60 100644 --- a/test/unit/lib/redmine/menu_manager/mapper_test.rb +++ b/test/unit/lib/redmine/menu_manager/mapper_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/lib/redmine/menu_manager/menu_helper_test.rb b/test/unit/lib/redmine/menu_manager/menu_helper_test.rb index 55e74128..8468069e 100644 --- a/test/unit/lib/redmine/menu_manager/menu_helper_test.rb +++ b/test/unit/lib/redmine/menu_manager/menu_helper_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/lib/redmine/menu_manager/menu_item_test.rb b/test/unit/lib/redmine/menu_manager/menu_item_test.rb index 8fd0e0fb..32e054d5 100644 --- a/test/unit/lib/redmine/menu_manager/menu_item_test.rb +++ b/test/unit/lib/redmine/menu_manager/menu_item_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/lib/redmine/menu_manager_test.rb b/test/unit/lib/redmine/menu_manager_test.rb index 9297b53f..d47028d6 100644 --- a/test/unit/lib/redmine/menu_manager_test.rb +++ b/test/unit/lib/redmine/menu_manager_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/lib/redmine/mime_type_test.rb b/test/unit/lib/redmine/mime_type_test.rb index b806cda6..0a014a83 100644 --- a/test/unit/lib/redmine/mime_type_test.rb +++ b/test/unit/lib/redmine/mime_type_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/lib/redmine/notifiable_test.rb b/test/unit/lib/redmine/notifiable_test.rb index 38c1785b..663791f5 100644 --- a/test/unit/lib/redmine/notifiable_test.rb +++ b/test/unit/lib/redmine/notifiable_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/lib/redmine/plugin_test.rb b/test/unit/lib/redmine/plugin_test.rb index 0d837795..aef30e29 100644 --- a/test/unit/lib/redmine/plugin_test.rb +++ b/test/unit/lib/redmine/plugin_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/lib/redmine/safe_attributes_test.rb b/test/unit/lib/redmine/safe_attributes_test.rb index c2d723f9..7b8ddd62 100644 --- a/test/unit/lib/redmine/safe_attributes_test.rb +++ b/test/unit/lib/redmine/safe_attributes_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/lib/redmine/scm/adapters/bazaar_adapter_test.rb b/test/unit/lib/redmine/scm/adapters/bazaar_adapter_test.rb index 06d6a52f..6b045de1 100644 --- a/test/unit/lib/redmine/scm/adapters/bazaar_adapter_test.rb +++ b/test/unit/lib/redmine/scm/adapters/bazaar_adapter_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/lib/redmine/scm/adapters/cvs_adapter_test.rb b/test/unit/lib/redmine/scm/adapters/cvs_adapter_test.rb index 8e7c60bc..9e0b796a 100644 --- a/test/unit/lib/redmine/scm/adapters/cvs_adapter_test.rb +++ b/test/unit/lib/redmine/scm/adapters/cvs_adapter_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/lib/redmine/scm/adapters/darcs_adapter_test.rb b/test/unit/lib/redmine/scm/adapters/darcs_adapter_test.rb index 87e0c09c..0e0e2af8 100644 --- a/test/unit/lib/redmine/scm/adapters/darcs_adapter_test.rb +++ b/test/unit/lib/redmine/scm/adapters/darcs_adapter_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/lib/redmine/scm/adapters/filesystem_adapter_test.rb b/test/unit/lib/redmine/scm/adapters/filesystem_adapter_test.rb index 4ebfccd4..395c0850 100644 --- a/test/unit/lib/redmine/scm/adapters/filesystem_adapter_test.rb +++ b/test/unit/lib/redmine/scm/adapters/filesystem_adapter_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/lib/redmine/scm/adapters/git_adapter_test.rb b/test/unit/lib/redmine/scm/adapters/git_adapter_test.rb index 88655074..be3c0714 100644 --- a/test/unit/lib/redmine/scm/adapters/git_adapter_test.rb +++ b/test/unit/lib/redmine/scm/adapters/git_adapter_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb b/test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb index c893bb67..105a8ff8 100644 --- a/test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb +++ b/test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/lib/redmine/scm/adapters/subversion_adapter_test.rb b/test/unit/lib/redmine/scm/adapters/subversion_adapter_test.rb index 7a36244f..bb2f2fa5 100644 --- a/test/unit/lib/redmine/scm/adapters/subversion_adapter_test.rb +++ b/test/unit/lib/redmine/scm/adapters/subversion_adapter_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/lib/redmine/themes_test.rb b/test/unit/lib/redmine/themes_test.rb index 05b7ab80..a22bc0c6 100644 --- a/test/unit/lib/redmine/themes_test.rb +++ b/test/unit/lib/redmine/themes_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/lib/redmine/unified_diff_test.rb b/test/unit/lib/redmine/unified_diff_test.rb index 7cd8d399..3c9ff88b 100644 --- a/test/unit/lib/redmine/unified_diff_test.rb +++ b/test/unit/lib/redmine/unified_diff_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/lib/redmine/views/builders/json_test.rb b/test/unit/lib/redmine/views/builders/json_test.rb index f9dbfcc4..3dbfe6f8 100644 --- a/test/unit/lib/redmine/views/builders/json_test.rb +++ b/test/unit/lib/redmine/views/builders/json_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/lib/redmine/views/builders/xml_test.rb b/test/unit/lib/redmine/views/builders/xml_test.rb index 904ee260..55a26e69 100644 --- a/test/unit/lib/redmine/views/builders/xml_test.rb +++ b/test/unit/lib/redmine/views/builders/xml_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/lib/redmine/wiki_formatting.rb b/test/unit/lib/redmine/wiki_formatting.rb index 818cfaf0..7ba59bc0 100644 --- a/test/unit/lib/redmine/wiki_formatting.rb +++ b/test/unit/lib/redmine/wiki_formatting.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/lib/redmine/wiki_formatting/macros_test.rb b/test/unit/lib/redmine/wiki_formatting/macros_test.rb index 40a6968d..207f2391 100644 --- a/test/unit/lib/redmine/wiki_formatting/macros_test.rb +++ b/test/unit/lib/redmine/wiki_formatting/macros_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/lib/redmine/wiki_formatting/null_formatter_test.rb b/test/unit/lib/redmine/wiki_formatting/null_formatter_test.rb index 41593d25..da878ec4 100644 --- a/test/unit/lib/redmine/wiki_formatting/null_formatter_test.rb +++ b/test/unit/lib/redmine/wiki_formatting/null_formatter_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/lib/redmine/wiki_formatting/textile_formatter_test.rb b/test/unit/lib/redmine/wiki_formatting/textile_formatter_test.rb index 9ba76474..63ee4b12 100644 --- a/test/unit/lib/redmine/wiki_formatting/textile_formatter_test.rb +++ b/test/unit/lib/redmine/wiki_formatting/textile_formatter_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/lib/redmine_test.rb b/test/unit/lib/redmine_test.rb index 70deaef1..d5d73464 100644 --- a/test/unit/lib/redmine_test.rb +++ b/test/unit/lib/redmine_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/mail_handler_test.rb b/test/unit/mail_handler_test.rb index 2dfed204..2b9f8854 100644 --- a/test/unit/mail_handler_test.rb +++ b/test/unit/mail_handler_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/mailer_test.rb b/test/unit/mailer_test.rb index 48a3e970..793c5e2b 100644 --- a/test/unit/mailer_test.rb +++ b/test/unit/mailer_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/member_test.rb b/test/unit/member_test.rb index 43dd1a92..5c3dfa73 100644 --- a/test/unit/member_test.rb +++ b/test/unit/member_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/message_test.rb b/test/unit/message_test.rb index 95dd0193..f14ed34d 100644 --- a/test/unit/message_test.rb +++ b/test/unit/message_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/news_test.rb b/test/unit/news_test.rb index c94058ef..056b1cc3 100644 --- a/test/unit/news_test.rb +++ b/test/unit/news_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/principal_test.rb b/test/unit/principal_test.rb index 6e428c9a..d7d00747 100644 --- a/test/unit/principal_test.rb +++ b/test/unit/principal_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/project_nested_set_test.rb b/test/unit/project_nested_set_test.rb index 6b9d1197..c0d65e6f 100644 --- a/test/unit/project_nested_set_test.rb +++ b/test/unit/project_nested_set_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/project_test.rb b/test/unit/project_test.rb index 1dbe3a2e..a85ad19b 100644 --- a/test/unit/project_test.rb +++ b/test/unit/project_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/query_test.rb b/test/unit/query_test.rb index 9ef009bb..944608bc 100644 --- a/test/unit/query_test.rb +++ b/test/unit/query_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/repository_bazaar_test.rb b/test/unit/repository_bazaar_test.rb index ba815d09..39db6a8f 100644 --- a/test/unit/repository_bazaar_test.rb +++ b/test/unit/repository_bazaar_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/repository_cvs_test.rb b/test/unit/repository_cvs_test.rb index 36d23278..910cb80e 100644 --- a/test/unit/repository_cvs_test.rb +++ b/test/unit/repository_cvs_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/repository_darcs_test.rb b/test/unit/repository_darcs_test.rb index 870f3918..8f9d065e 100644 --- a/test/unit/repository_darcs_test.rb +++ b/test/unit/repository_darcs_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/repository_filesystem_test.rb b/test/unit/repository_filesystem_test.rb index af87ebf5..15465af6 100644 --- a/test/unit/repository_filesystem_test.rb +++ b/test/unit/repository_filesystem_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/repository_git_test.rb b/test/unit/repository_git_test.rb index 9fed55c8..b0469d10 100644 --- a/test/unit/repository_git_test.rb +++ b/test/unit/repository_git_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/repository_mercurial_test.rb b/test/unit/repository_mercurial_test.rb index b716e5b2..98d37c1f 100644 --- a/test/unit/repository_mercurial_test.rb +++ b/test/unit/repository_mercurial_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/repository_subversion_test.rb b/test/unit/repository_subversion_test.rb index 5a077ad9..af6b1ef1 100644 --- a/test/unit/repository_subversion_test.rb +++ b/test/unit/repository_subversion_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/repository_test.rb b/test/unit/repository_test.rb index 0a5f1eca..7b2d34a3 100644 --- a/test/unit/repository_test.rb +++ b/test/unit/repository_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/role_test.rb b/test/unit/role_test.rb index 4f2c1f26..37b40bfa 100644 --- a/test/unit/role_test.rb +++ b/test/unit/role_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/search_test.rb b/test/unit/search_test.rb index b861d22f..dc6076a1 100644 --- a/test/unit/search_test.rb +++ b/test/unit/search_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/setting_test.rb b/test/unit/setting_test.rb index c5942c13..9dee8687 100644 --- a/test/unit/setting_test.rb +++ b/test/unit/setting_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/testing_test.rb b/test/unit/testing_test.rb index 260046cb..c9137432 100644 --- a/test/unit/testing_test.rb +++ b/test/unit/testing_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/time_entry_activity_test.rb b/test/unit/time_entry_activity_test.rb index de263c06..22f3f0ab 100644 --- a/test/unit/time_entry_activity_test.rb +++ b/test/unit/time_entry_activity_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/time_entry_test.rb b/test/unit/time_entry_test.rb index 3567b2f4..577d3b97 100644 --- a/test/unit/time_entry_test.rb +++ b/test/unit/time_entry_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/token_test.rb b/test/unit/token_test.rb index 5bdf0a14..3dd3e459 100644 --- a/test/unit/token_test.rb +++ b/test/unit/token_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/tracker_test.rb b/test/unit/tracker_test.rb index 9df17202..5992ffdc 100644 --- a/test/unit/tracker_test.rb +++ b/test/unit/tracker_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/user_preference_test.rb b/test/unit/user_preference_test.rb index fb7563c4..3ab4cdb3 100644 --- a/test/unit/user_preference_test.rb +++ b/test/unit/user_preference_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb index 0edd7fd9..8101ce57 100644 --- a/test/unit/user_test.rb +++ b/test/unit/user_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/version_test.rb b/test/unit/version_test.rb index 5ac0bf76..7e3392da 100644 --- a/test/unit/version_test.rb +++ b/test/unit/version_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/watcher_test.rb b/test/unit/watcher_test.rb index c850849e..e061fd2c 100644 --- a/test/unit/watcher_test.rb +++ b/test/unit/watcher_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/wiki_content_test.rb b/test/unit/wiki_content_test.rb index 33cbedba..5c6444d2 100644 --- a/test/unit/wiki_content_test.rb +++ b/test/unit/wiki_content_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/wiki_page_test.rb b/test/unit/wiki_page_test.rb index 101c1445..274688d3 100644 --- a/test/unit/wiki_page_test.rb +++ b/test/unit/wiki_page_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/wiki_redirect_test.rb b/test/unit/wiki_redirect_test.rb index 250d7659..97dabf22 100644 --- a/test/unit/wiki_redirect_test.rb +++ b/test/unit/wiki_redirect_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/test/unit/wiki_test.rb b/test/unit/wiki_test.rb index e6945b3f..5f6d577f 100644 --- a/test/unit/wiki_test.rb +++ b/test/unit/wiki_test.rb @@ -2,7 +2,7 @@ #-- copyright # ChiliProject is a project management system. # -# Copyright (C) 2010-2011 the ChiliProject Team +# Copyright (C) 2010-2012 the ChiliProject Team # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/vendor/chiliproject_plugins/README b/vendor/chiliproject_plugins/README new file mode 100644 index 00000000..504ebc76 --- /dev/null +++ b/vendor/chiliproject_plugins/README @@ -0,0 +1 @@ +Install ChiliProject plugins here and they will be automatically loaded. diff --git a/vendor/plugins/acts_as_journalized/lib/acts_as_journalized.rb b/vendor/plugins/acts_as_journalized/lib/acts_as_journalized.rb index 337c3abd..7646d49c 100644 --- a/vendor/plugins/acts_as_journalized/lib/acts_as_journalized.rb +++ b/vendor/plugins/acts_as_journalized/lib/acts_as_journalized.rb @@ -32,6 +32,10 @@ module Redmine end module ClassMethods + attr_writer :journal_class_name + def journal_class_name + defined?(@journal_class_name) ? @journal_class_name : superclass.journal_class_name + end def plural_name self.name.underscore.pluralize @@ -55,6 +59,8 @@ module Redmine def acts_as_journalized(options = {}, &block) activity_hash, event_hash, journal_hash = split_option_hashes(options) + self.journal_class_name = journal_hash.delete(:class_name) || "#{name.gsub("::", "_")}Journal" + acts_as_activity(activity_hash) return if journaled? @@ -77,13 +83,13 @@ module Redmine (journal_hash[:except] ||= []) << self.primary_key << inheritance_column << :updated_on << :updated_at << :lock_version << :lft << :rgt + prepare_journaled_options(journal_hash) - has_many :journals, journal_hash.merge({:class_name => journal_class.name, - :foreign_key => "journaled_id"}), &block + + has_many :journals, journal_hash, &block end def journal_class - journal_class_name = "#{name.gsub("::", "_")}Journal" if Object.const_defined?(journal_class_name) Object.const_get(journal_class_name) else diff --git a/vendor/plugins/acts_as_journalized/lib/redmine/acts/journalized/options.rb b/vendor/plugins/acts_as_journalized/lib/redmine/acts/journalized/options.rb index 015ebfc5..9c0a2b97 100644 --- a/vendor/plugins/acts_as_journalized/lib/redmine/acts/journalized/options.rb +++ b/vendor/plugins/acts_as_journalized/lib/redmine/acts/journalized/options.rb @@ -63,11 +63,12 @@ module Redmine::Acts::Journalized options.symbolize_keys! options.reverse_merge!(Configuration.options) options.reverse_merge!( - :class_name => 'Journal', - :dependent => :delete_all + :class_name => journal_class_name, + :dependent => :delete_all, + :foreign_key => "journaled_id" ) options.reverse_merge!( - :order => "#{options[:class_name].constantize.table_name}.version ASC" + :order => "#{journal_class.table_name}.version ASC" ) class_inheritable_accessor :vestal_journals_options