[DRE-commits] [redmine] 01/05: Imported Upstream version 3.2.1
Antonio Terceiro
terceiro at moszumanska.debian.org
Sat Mar 19 22:39:31 UTC 2016
This is an automated email from the git hooks/post-receive script.
terceiro pushed a commit to branch master
in repository redmine.
commit 11bcbf4632b07ce3a7575185e99fd935557f4b46
Author: Antonio Terceiro <terceiro at debian.org>
Date: Sat Mar 19 18:59:30 2016 -0300
Imported Upstream version 3.2.1
---
.travis.yml | 161 ---------------
Gemfile | 8 +-
app/controllers/account_controller.rb | 2 +-
app/controllers/activities_controller.rb | 2 +-
app/controllers/admin_controller.rb | 2 +-
app/controllers/application_controller.rb | 4 +-
app/controllers/attachments_controller.rb | 2 +-
app/controllers/auth_sources_controller.rb | 2 +-
app/controllers/auto_completes_controller.rb | 2 +-
app/controllers/boards_controller.rb | 2 +-
app/controllers/calendars_controller.rb | 2 +-
app/controllers/comments_controller.rb | 2 +-
app/controllers/context_menus_controller.rb | 2 +-
.../custom_field_enumerations_controller.rb | 2 +-
app/controllers/custom_fields_controller.rb | 4 +-
app/controllers/documents_controller.rb | 2 +-
app/controllers/email_addresses_controller.rb | 2 +-
app/controllers/enumerations_controller.rb | 2 +-
app/controllers/files_controller.rb | 2 +-
app/controllers/gantts_controller.rb | 2 +-
app/controllers/groups_controller.rb | 2 +-
app/controllers/imports_controller.rb | 2 +-
app/controllers/issue_categories_controller.rb | 2 +-
app/controllers/issue_relations_controller.rb | 2 +-
app/controllers/issue_statuses_controller.rb | 2 +-
app/controllers/issues_controller.rb | 4 +-
app/controllers/journals_controller.rb | 2 +-
app/controllers/mail_handler_controller.rb | 2 +-
app/controllers/members_controller.rb | 2 +-
app/controllers/messages_controller.rb | 2 +-
app/controllers/my_controller.rb | 2 +-
app/controllers/news_controller.rb | 2 +-
app/controllers/previews_controller.rb | 2 +-
.../principal_memberships_controller.rb | 2 +-
app/controllers/project_enumerations_controller.rb | 2 +-
app/controllers/projects_controller.rb | 2 +-
app/controllers/queries_controller.rb | 2 +-
app/controllers/reports_controller.rb | 2 +-
app/controllers/repositories_controller.rb | 2 +-
app/controllers/roles_controller.rb | 2 +-
app/controllers/search_controller.rb | 2 +-
app/controllers/settings_controller.rb | 2 +-
app/controllers/sys_controller.rb | 2 +-
app/controllers/timelog_controller.rb | 2 +-
app/controllers/trackers_controller.rb | 2 +-
app/controllers/users_controller.rb | 4 +-
app/controllers/versions_controller.rb | 2 +-
app/controllers/watchers_controller.rb | 2 +-
app/controllers/welcome_controller.rb | 2 +-
app/controllers/wiki_controller.rb | 2 +-
app/controllers/wikis_controller.rb | 2 +-
app/controllers/workflows_controller.rb | 2 +-
app/helpers/account_helper.rb | 2 +-
app/helpers/activities_helper.rb | 2 +-
app/helpers/admin_helper.rb | 2 +-
app/helpers/application_helper.rb | 6 +-
app/helpers/attachments_helper.rb | 2 +-
app/helpers/auth_sources_helper.rb | 2 +-
app/helpers/boards_helper.rb | 2 +-
app/helpers/calendars_helper.rb | 2 +-
app/helpers/context_menus_helper.rb | 2 +-
app/helpers/custom_fields_helper.rb | 2 +-
app/helpers/documents_helper.rb | 2 +-
app/helpers/email_addresses_helper.rb | 2 +-
app/helpers/enumerations_helper.rb | 2 +-
app/helpers/gantt_helper.rb | 2 +-
app/helpers/groups_helper.rb | 2 +-
app/helpers/imports_helper.rb | 2 +-
app/helpers/issue_categories_helper.rb | 2 +-
app/helpers/issue_relations_helper.rb | 2 +-
app/helpers/issue_statuses_helper.rb | 2 +-
app/helpers/issues_helper.rb | 4 +-
app/helpers/journals_helper.rb | 2 +-
app/helpers/mail_handler_helper.rb | 2 +-
app/helpers/members_helper.rb | 2 +-
app/helpers/messages_helper.rb | 2 +-
app/helpers/my_helper.rb | 2 +-
app/helpers/news_helper.rb | 2 +-
app/helpers/principal_memberships_helper.rb | 2 +-
app/helpers/projects_helper.rb | 2 +-
app/helpers/queries_helper.rb | 32 ++-
app/helpers/reports_helper.rb | 2 +-
app/helpers/repositories_helper.rb | 2 +-
app/helpers/roles_helper.rb | 2 +-
app/helpers/routes_helper.rb | 2 +-
app/helpers/search_helper.rb | 2 +-
app/helpers/settings_helper.rb | 2 +-
app/helpers/timelog_helper.rb | 2 +-
app/helpers/trackers_helper.rb | 2 +-
app/helpers/users_helper.rb | 2 +-
app/helpers/versions_helper.rb | 2 +-
app/helpers/watchers_helper.rb | 2 +-
app/helpers/welcome_helper.rb | 2 +-
app/helpers/wiki_helper.rb | 2 +-
app/helpers/workflows_helper.rb | 2 +-
app/models/attachment.rb | 2 +-
app/models/auth_source.rb | 2 +-
app/models/auth_source_ldap.rb | 5 +-
app/models/board.rb | 2 +-
app/models/change.rb | 2 +-
app/models/changeset.rb | 2 +-
app/models/comment.rb | 2 +-
app/models/custom_field.rb | 2 +-
app/models/custom_field_enumeration.rb | 8 +-
app/models/custom_field_value.rb | 2 +-
app/models/custom_value.rb | 2 +-
app/models/document.rb | 2 +-
app/models/document_category.rb | 2 +-
app/models/document_category_custom_field.rb | 2 +-
app/models/document_custom_field.rb | 2 +-
app/models/email_address.rb | 2 +-
app/models/enabled_module.rb | 2 +-
app/models/enumeration.rb | 2 +-
app/models/group.rb | 2 +-
app/models/group_anonymous.rb | 2 +-
app/models/group_builtin.rb | 2 +-
app/models/group_custom_field.rb | 2 +-
app/models/group_non_member.rb | 2 +-
app/models/import.rb | 2 +-
app/models/import_item.rb | 2 +-
app/models/issue.rb | 16 +-
app/models/issue_category.rb | 2 +-
app/models/issue_custom_field.rb | 2 +-
app/models/issue_import.rb | 5 +-
app/models/issue_priority.rb | 4 +-
app/models/issue_priority_custom_field.rb | 2 +-
app/models/issue_query.rb | 2 +-
app/models/issue_relation.rb | 2 +-
app/models/issue_status.rb | 2 +-
app/models/journal.rb | 2 +-
app/models/journal_detail.rb | 2 +-
app/models/mail_handler.rb | 2 +-
app/models/mailer.rb | 2 +-
app/models/member.rb | 2 +-
app/models/member_role.rb | 2 +-
app/models/message.rb | 2 +-
app/models/news.rb | 2 +-
app/models/principal.rb | 2 +-
app/models/project.rb | 2 +-
app/models/project_custom_field.rb | 2 +-
app/models/query.rb | 2 +-
app/models/repository.rb | 2 +-
app/models/repository/bazaar.rb | 2 +-
app/models/repository/cvs.rb | 2 +-
app/models/repository/darcs.rb | 2 +-
app/models/repository/filesystem.rb | 2 +-
app/models/repository/git.rb | 2 +-
app/models/repository/mercurial.rb | 2 +-
app/models/repository/subversion.rb | 2 +-
app/models/role.rb | 2 +-
app/models/setting.rb | 2 +-
app/models/time_entry.rb | 2 +-
app/models/time_entry_activity.rb | 2 +-
app/models/time_entry_activity_custom_field.rb | 2 +-
app/models/time_entry_custom_field.rb | 2 +-
app/models/time_entry_query.rb | 2 +-
app/models/token.rb | 2 +-
app/models/tracker.rb | 2 +-
app/models/user.rb | 2 +-
app/models/user_custom_field.rb | 2 +-
app/models/user_preference.rb | 5 +-
app/models/version.rb | 2 +-
app/models/version_custom_field.rb | 2 +-
app/models/watcher.rb | 2 +-
app/models/wiki.rb | 2 +-
app/models/wiki_content.rb | 2 +-
app/models/wiki_page.rb | 4 +-
app/models/wiki_redirect.rb | 2 +-
app/models/workflow_permission.rb | 2 +-
app/models/workflow_rule.rb | 2 +-
app/models/workflow_transition.rb | 2 +-
app/views/custom_fields/_index.html.erb | 3 +-
app/views/imports/_fields_mapping.html.erb | 4 +
app/views/issues/_attributes.html.erb | 4 +-
app/views/issues/index.html.erb | 6 +-
app/views/layouts/base.html.erb | 2 +-
app/views/layouts/mailer.html.erb | 10 +-
app/views/settings/_authentication.html.erb | 8 +
app/views/users/_general.html.erb | 2 +-
app/views/wiki/_sidebar.html.erb | 4 +-
config/configuration.yml.example | 6 +-
config/initializers/backtrace_silencers.rb | 4 +
config/locales/ar.yml | 1 +
config/locales/az.yml | 1 +
config/locales/bg.yml | 1 +
config/locales/bs.yml | 1 +
config/locales/ca.yml | 1 +
config/locales/cs.yml | 1 +
config/locales/da.yml | 1 +
config/locales/de.yml | 83 ++++----
config/locales/el.yml | 1 +
config/locales/en-GB.yml | 1 +
config/locales/en.yml | 1 +
config/locales/es-PA.yml | 21 +-
config/locales/es.yml | 25 +--
config/locales/et.yml | 1 +
config/locales/eu.yml | 1 +
config/locales/fa.yml | 1 +
config/locales/fi.yml | 1 +
config/locales/fr.yml | 1 +
config/locales/gl.yml | 1 +
config/locales/he.yml | 1 +
config/locales/hr.yml | 1 +
config/locales/hu.yml | 1 +
config/locales/id.yml | 1 +
config/locales/it.yml | 1 +
config/locales/ja.yml | 1 +
config/locales/ko.yml | 1 +
config/locales/lt.yml | 1 +
config/locales/lv.yml | 1 +
config/locales/mk.yml | 1 +
config/locales/mn.yml | 1 +
config/locales/nl.yml | 1 +
config/locales/no.yml | 1 +
config/locales/pl.yml | 1 +
config/locales/pt-BR.yml | 1 +
config/locales/pt.yml | 1 +
config/locales/ro.yml | 1 +
config/locales/ru.yml | 63 +++---
config/locales/sk.yml | 1 +
config/locales/sl.yml | 1 +
config/locales/sq.yml | 1 +
config/locales/sr-YU.yml | 1 +
config/locales/sr.yml | 1 +
config/locales/sv.yml | 1 +
config/locales/th.yml | 1 +
config/locales/tr.yml | 63 +++---
config/locales/uk.yml | 1 +
config/locales/vi.yml | 1 +
config/locales/zh-TW.yml | 1 +
config/locales/zh.yml | 63 +++---
config/routes.rb | 2 +-
config/settings.yml | 4 +-
doc/CHANGELOG | 56 ++++-
doc/INSTALL | 2 +-
doc/README_FOR_APP | 2 +-
doc/UPGRADING | 2 +-
extra/mail_handler/rdm-mailhandler.rb | 4 +-
.../lib/acts_as_activity_provider.rb | 2 +-
.../acts_as_attachable/lib/acts_as_attachable.rb | 2 +-
.../lib/acts_as_customizable.rb | 2 +-
lib/plugins/acts_as_event/lib/acts_as_event.rb | 2 +-
.../acts_as_searchable/lib/acts_as_searchable.rb | 2 +-
lib/redmine.rb | 2 +-
lib/redmine/access_control.rb | 2 +-
lib/redmine/access_keys.rb | 2 +-
lib/redmine/activity.rb | 2 +-
lib/redmine/activity/fetcher.rb | 2 +-
lib/redmine/ciphering.rb | 2 +-
lib/redmine/configuration.rb | 2 +-
lib/redmine/core_ext/active_record.rb | 2 +-
lib/redmine/core_ext/date/calculations.rb | 2 +-
lib/redmine/core_ext/string/conversions.rb | 2 +-
lib/redmine/core_ext/string/inflections.rb | 2 +-
lib/redmine/database.rb | 2 +-
lib/redmine/default_data/loader.rb | 2 +-
lib/redmine/export/csv.rb | 2 +-
lib/redmine/export/pdf.rb | 2 +-
lib/redmine/export/pdf/issues_pdf_helper.rb | 2 +-
lib/redmine/export/pdf/wiki_pdf_helper.rb | 2 +-
lib/redmine/field_format.rb | 2 +-
lib/redmine/helpers/calendar.rb | 2 +-
lib/redmine/helpers/diff.rb | 2 +-
lib/redmine/helpers/gantt.rb | 2 +-
lib/redmine/helpers/time_report.rb | 2 +-
lib/redmine/hook.rb | 2 +-
lib/redmine/hook/listener.rb | 2 +-
lib/redmine/hook/view_listener.rb | 2 +-
lib/redmine/i18n.rb | 2 +-
lib/redmine/imap.rb | 2 +-
lib/redmine/menu_manager.rb | 2 +-
lib/redmine/mime_type.rb | 2 +-
lib/redmine/nested_set/issue_nested_set.rb | 2 +-
lib/redmine/nested_set/project_nested_set.rb | 2 +-
lib/redmine/nested_set/traversing.rb | 2 +-
lib/redmine/pagination.rb | 2 +-
lib/redmine/platform.rb | 2 +-
lib/redmine/plugin.rb | 2 +-
lib/redmine/pop3.rb | 2 +-
lib/redmine/safe_attributes.rb | 2 +-
lib/redmine/scm/adapters.rb | 2 +-
lib/redmine/scm/adapters/abstract_adapter.rb | 2 +-
lib/redmine/scm/adapters/bazaar_adapter.rb | 2 +-
lib/redmine/scm/adapters/darcs_adapter.rb | 2 +-
lib/redmine/scm/adapters/filesystem_adapter.rb | 2 +-
lib/redmine/scm/adapters/git_adapter.rb | 2 +-
lib/redmine/scm/adapters/mercurial_adapter.rb | 2 +-
lib/redmine/scm/adapters/subversion_adapter.rb | 2 +-
lib/redmine/search.rb | 2 +-
lib/redmine/subclass_factory.rb | 2 +-
lib/redmine/syntax_highlighting.rb | 2 +-
lib/redmine/themes.rb | 2 +-
lib/redmine/thumbnail.rb | 2 +-
lib/redmine/unified_diff.rb | 2 +-
lib/redmine/utils.rb | 2 +-
lib/redmine/version.rb | 2 +-
lib/redmine/views/api_template_handler.rb | 2 +-
lib/redmine/views/builders.rb | 2 +-
lib/redmine/views/builders/json.rb | 2 +-
lib/redmine/views/builders/structure.rb | 2 +-
lib/redmine/views/builders/xml.rb | 2 +-
lib/redmine/views/labelled_form_builder.rb | 2 +-
lib/redmine/views/my_page/block.rb | 2 +-
lib/redmine/views/other_formats_builder.rb | 2 +-
lib/redmine/wiki_formatting.rb | 2 +-
lib/redmine/wiki_formatting/html_parser.rb | 2 +-
lib/redmine/wiki_formatting/macros.rb | 2 +-
lib/redmine/wiki_formatting/markdown/formatter.rb | 2 +-
lib/redmine/wiki_formatting/markdown/helper.rb | 2 +-
.../wiki_formatting/markdown/html_parser.rb | 2 +-
lib/redmine/wiki_formatting/textile/formatter.rb | 2 +-
lib/redmine/wiki_formatting/textile/helper.rb | 2 +-
lib/redmine/wiki_formatting/textile/html_parser.rb | 2 +-
lib/tasks/ciphering.rake | 2 +-
lib/tasks/email.rake | 2 +-
lib/tasks/migrate_from_mantis.rake | 2 +-
lib/tasks/migrate_from_trac.rake | 2 +-
lib/tasks/redmine.rake | 2 +-
lib/tasks/reminder.rake | 2 +-
public/help/ca/wiki_syntax_markdown.html | 48 ++---
public/help/ca/wiki_syntax_textile.html | 56 ++---
public/help/ja/wiki_syntax_detailed_markdown.html | 212 +++++++++----------
public/help/ja/wiki_syntax_markdown.html | 48 ++---
public/help/ru/wiki_syntax_detailed_textile.html | 68 +++---
public/help/ru/wiki_syntax_textile.html | 4 +-
public/help/zh/wiki_syntax_detailed_textile.html | 230 ++++++++++-----------
public/help/zh/wiki_syntax_textile.html | 60 +++---
public/javascripts/application.js | 10 +-
public/javascripts/attachments.js | 2 +-
public/javascripts/context_menu.js | 2 +-
public/javascripts/gantt.js | 2 +-
public/javascripts/project_identifier.js | 2 +-
public/javascripts/repository_navigation.js | 2 +-
public/javascripts/revision_graph.js | 2 +-
public/stylesheets/application.css | 3 +
public/stylesheets/responsive.css | 87 +++++++-
test/coverage/html_formatter.rb | 2 +-
test/extra/redmine_pm/repository_git_test_pm.rb | 2 +-
.../redmine_pm/repository_subversion_test_pm.rb | 2 +-
test/extra/redmine_pm/test_case.rb | 2 +-
test/fixtures/files/import_issues.csv | 8 +-
test/functional/account_controller_openid_test.rb | 2 +-
test/functional/account_controller_test.rb | 2 +-
test/functional/activities_controller_test.rb | 2 +-
test/functional/admin_controller_test.rb | 2 +-
test/functional/attachments_controller_test.rb | 2 +-
test/functional/auth_sources_controller_test.rb | 2 +-
test/functional/auto_completes_controller_test.rb | 2 +-
test/functional/boards_controller_test.rb | 2 +-
test/functional/calendars_controller_test.rb | 2 +-
test/functional/comments_controller_test.rb | 2 +-
test/functional/context_menus_controller_test.rb | 2 +-
.../custom_field_enumerations_controller_test.rb | 2 +-
test/functional/custom_fields_controller_test.rb | 2 +-
test/functional/documents_controller_test.rb | 2 +-
test/functional/email_addresses_controller_test.rb | 2 +-
test/functional/enumerations_controller_test.rb | 2 +-
test/functional/files_controller_test.rb | 2 +-
test/functional/gantts_controller_test.rb | 2 +-
test/functional/groups_controller_test.rb | 2 +-
test/functional/imports_controller_test.rb | 2 +-
.../functional/issue_categories_controller_test.rb | 2 +-
test/functional/issue_relations_controller_test.rb | 2 +-
test/functional/issue_statuses_controller_test.rb | 2 +-
test/functional/issues_controller_test.rb | 68 +++++-
.../issues_controller_transaction_test.rb | 23 ++-
.../issues_custom_fields_visibility_test.rb | 2 +-
test/functional/journals_controller_test.rb | 2 +-
test/functional/mail_handler_controller_test.rb | 2 +-
test/functional/members_controller_test.rb | 2 +-
test/functional/messages_controller_test.rb | 2 +-
test/functional/my_controller_test.rb | 2 +-
test/functional/news_controller_test.rb | 2 +-
test/functional/previews_controller_test.rb | 2 +-
.../principal_memberships_controller_test.rb | 2 +-
.../project_enumerations_controller_test.rb | 2 +-
test/functional/projects_controller_test.rb | 2 +-
test/functional/queries_controller_test.rb | 2 +-
test/functional/reports_controller_test.rb | 2 +-
.../repositories_bazaar_controller_test.rb | 2 +-
test/functional/repositories_controller_test.rb | 2 +-
.../functional/repositories_cvs_controller_test.rb | 2 +-
.../repositories_darcs_controller_test.rb | 2 +-
.../repositories_filesystem_controller_test.rb | 2 +-
.../functional/repositories_git_controller_test.rb | 2 +-
.../repositories_mercurial_controller_test.rb | 2 +-
.../repositories_subversion_controller_test.rb | 2 +-
test/functional/roles_controller_test.rb | 2 +-
test/functional/search_controller_test.rb | 2 +-
.../search_custom_fields_visibility_test.rb | 2 +-
test/functional/sessions_controller_test.rb | 2 +-
test/functional/settings_controller_test.rb | 2 +-
test/functional/sys_controller_test.rb | 2 +-
.../time_entry_reports_controller_test.rb | 2 +-
test/functional/timelog_controller_test.rb | 2 +-
.../timelog_custom_fields_visibility_test.rb | 2 +-
test/functional/trackers_controller_test.rb | 2 +-
test/functional/users_controller_test.rb | 2 +-
test/functional/versions_controller_test.rb | 2 +-
test/functional/watchers_controller_test.rb | 2 +-
test/functional/welcome_controller_test.rb | 2 +-
test/functional/wiki_controller_test.rb | 2 +-
test/functional/wikis_controller_test.rb | 2 +-
test/functional/workflows_controller_test.rb | 2 +-
test/integration/account_test.rb | 2 +-
test/integration/admin_test.rb | 2 +-
test/integration/api_test/api_routing_test.rb | 2 +-
test/integration/api_test/api_test.rb | 2 +-
test/integration/api_test/attachments_test.rb | 2 +-
test/integration/api_test/authentication_test.rb | 2 +-
.../api_test/custom_fields_attribute_test.rb | 2 +-
test/integration/api_test/custom_fields_test.rb | 2 +-
.../integration/api_test/disabled_rest_api_test.rb | 2 +-
test/integration/api_test/enumerations_test.rb | 2 +-
test/integration/api_test/groups_test.rb | 2 +-
test/integration/api_test/issue_categories_test.rb | 2 +-
test/integration/api_test/issue_relations_test.rb | 2 +-
test/integration/api_test/issue_statuses_test.rb | 2 +-
test/integration/api_test/issues_test.rb | 2 +-
test/integration/api_test/jsonp_test.rb | 2 +-
test/integration/api_test/memberships_test.rb | 2 +-
test/integration/api_test/news_test.rb | 2 +-
test/integration/api_test/projects_test.rb | 2 +-
test/integration/api_test/queries_test.rb | 2 +-
test/integration/api_test/roles_test.rb | 2 +-
test/integration/api_test/time_entries_test.rb | 2 +-
test/integration/api_test/trackers_test.rb | 2 +-
test/integration/api_test/users_test.rb | 2 +-
test/integration/api_test/versions_test.rb | 2 +-
test/integration/api_test/wiki_pages_test.rb | 2 +-
test/integration/application_test.rb | 2 +-
test/integration/attachments_test.rb | 2 +-
test/integration/feeds_test.rb | 2 +-
test/integration/issues_test.rb | 2 +-
test/integration/layout_test.rb | 2 +-
test/integration/lib/redmine/hook_test.rb | 2 +-
test/integration/lib/redmine/menu_manager_test.rb | 2 +-
test/integration/lib/redmine/themes_test.rb | 2 +-
test/integration/projects_test.rb | 2 +-
test/integration/repositories_git_test.rb | 2 +-
test/integration/routing/account_test.rb | 2 +-
test/integration/routing/activities_test.rb | 2 +-
test/integration/routing/admin_test.rb | 2 +-
test/integration/routing/attachments_test.rb | 2 +-
test/integration/routing/auth_sources_test.rb | 2 +-
test/integration/routing/auto_completes_test.rb | 2 +-
test/integration/routing/boards_test.rb | 2 +-
test/integration/routing/calendars_test.rb | 2 +-
test/integration/routing/comments_test.rb | 2 +-
test/integration/routing/context_menus_test.rb | 2 +-
test/integration/routing/custom_fields_test.rb | 2 +-
test/integration/routing/documents_test.rb | 2 +-
test/integration/routing/enumerations_test.rb | 2 +-
test/integration/routing/files_test.rb | 2 +-
test/integration/routing/gantts_test.rb | 2 +-
test/integration/routing/groups_test.rb | 2 +-
test/integration/routing/imports_test.rb | 2 +-
test/integration/routing/issue_categories_test.rb | 2 +-
test/integration/routing/issue_relations_test.rb | 2 +-
test/integration/routing/issue_statuses_test.rb | 2 +-
test/integration/routing/issues_test.rb | 2 +-
test/integration/routing/journals_test.rb | 2 +-
test/integration/routing/mail_handler_test.rb | 2 +-
test/integration/routing/members_test.rb | 2 +-
test/integration/routing/messages_test.rb | 2 +-
test/integration/routing/my_test.rb | 2 +-
test/integration/routing/news_test.rb | 2 +-
test/integration/routing/previews_test.rb | 2 +-
.../routing/principal_memberships_test.rb | 2 +-
.../routing/project_enumerations_test.rb | 2 +-
test/integration/routing/projects_test.rb | 2 +-
test/integration/routing/queries_test.rb | 2 +-
test/integration/routing/reports_test.rb | 2 +-
test/integration/routing/repositories_test.rb | 2 +-
test/integration/routing/roles_test.rb | 2 +-
test/integration/routing/search_test.rb | 2 +-
test/integration/routing/settings_test.rb | 2 +-
test/integration/routing/sys_test.rb | 2 +-
test/integration/routing/timelog_test.rb | 2 +-
test/integration/routing/trackers_test.rb | 2 +-
test/integration/routing/users_test.rb | 2 +-
test/integration/routing/versions_test.rb | 2 +-
test/integration/routing/watchers_test.rb | 2 +-
test/integration/routing/welcome_test.rb | 2 +-
test/integration/routing/wiki_test.rb | 2 +-
test/integration/routing/wikis_test.rb | 2 +-
test/integration/routing/workflows_test.rb | 2 +-
test/integration/sessions_test.rb | 2 +-
test/integration/users_test.rb | 2 +-
test/test_helper.rb | 2 +-
test/travis/install-openldap.sh | 20 --
test/travis/mariadb.pref | 6 -
test/ui/base.rb | 7 +-
test/ui/custom_fields_test_ui.rb | 38 ++++
test/ui/issues_test_ui.rb | 23 ++-
test/ui/sudo_mode_test_ui.rb | 2 +-
test/ui/timelog_test_ui.rb | 2 +-
test/unit/activity_test.rb | 2 +-
test/unit/attachment_test.rb | 2 +-
test/unit/auth_source_ldap_test.rb | 2 +-
test/unit/board_test.rb | 2 +-
test/unit/changeset_test.rb | 2 +-
test/unit/comment_test.rb | 2 +-
test/unit/custom_field_test.rb | 2 +-
test/unit/custom_field_user_format_test.rb | 2 +-
test/unit/custom_field_version_format_test.rb | 2 +-
test/unit/custom_value_test.rb | 2 +-
test/unit/default_data_test.rb | 2 +-
test/unit/document_category_test.rb | 2 +-
test/unit/document_test.rb | 2 +-
test/unit/enabled_module_test.rb | 2 +-
test/unit/enumeration_test.rb | 2 +-
test/unit/group_test.rb | 2 +-
test/unit/helpers/activities_helper_test.rb | 2 +-
test/unit/helpers/application_helper_test.rb | 6 +-
test/unit/helpers/custom_fields_helper_test.rb | 2 +-
test/unit/helpers/groups_helper_test.rb | 2 +-
test/unit/helpers/issues_helper_test.rb | 2 +-
test/unit/helpers/journals_helper_test.rb | 2 +-
test/unit/helpers/members_helper_test.rb | 2 +-
test/unit/helpers/my_helper_test.rb | 2 +-
test/unit/helpers/projects_helper_test.rb | 2 +-
test/unit/helpers/queries_helper_test.rb | 2 +-
test/unit/helpers/routes_helper_test.rb | 2 +-
test/unit/helpers/search_helper_test.rb | 2 +-
test/unit/helpers/settings_helper_test.rb | 2 +-
test/unit/helpers/sort_helper_test.rb | 2 +-
test/unit/helpers/timelog_helper_test.rb | 2 +-
test/unit/helpers/version_helper_test.rb | 2 +-
test/unit/helpers/watchers_helper_test.rb | 2 +-
test/unit/helpers/wiki_helper_test.rb | 2 +-
test/unit/initializers/patches_test.rb | 2 +-
test/unit/issue_category_test.rb | 2 +-
test/unit/issue_custom_field_test.rb | 2 +-
test/unit/issue_import_test.rb | 2 +-
test/unit/issue_nested_set_concurrency_test.rb | 2 +-
test/unit/issue_nested_set_test.rb | 2 +-
test/unit/issue_priority_test.rb | 16 +-
test/unit/issue_relation_test.rb | 2 +-
test/unit/issue_scopes_test.rb | 2 +-
test/unit/issue_status_test.rb | 2 +-
test/unit/issue_subtasking_test.rb | 2 +-
test/unit/issue_test.rb | 68 +++++-
test/unit/issue_transaction_test.rb | 2 +-
test/unit/journal_observer_test.rb | 2 +-
test/unit/journal_test.rb | 2 +-
test/unit/lib/redmine/access_control_test.rb | 2 +-
test/unit/lib/redmine/ciphering_test.rb | 2 +-
test/unit/lib/redmine/codeset_util_test.rb | 2 +-
test/unit/lib/redmine/configuration_test.rb | 2 +-
test/unit/lib/redmine/export/csv_test.rb | 2 +-
test/unit/lib/redmine/export/pdf_test.rb | 2 +-
.../lib/redmine/field_format/bool_format_test.rb | 2 +-
.../field_format/enumeration_format_test.rb | 2 +-
.../lib/redmine/field_format/field_format_test.rb | 2 +-
.../lib/redmine/field_format/link_format_test.rb | 2 +-
.../lib/redmine/field_format/list_format_test.rb | 2 +-
.../redmine/field_format/numeric_format_test.rb | 2 +-
.../redmine/field_format/user_field_format_test.rb | 2 +-
.../field_format/version_field_format_test.rb | 2 +-
test/unit/lib/redmine/helpers/calendar_test.rb | 2 +-
test/unit/lib/redmine/helpers/diff_test.rb | 2 +-
test/unit/lib/redmine/helpers/gantt_test.rb | 2 +-
test/unit/lib/redmine/hook_test.rb | 2 +-
test/unit/lib/redmine/i18n_test.rb | 2 +-
test/unit/lib/redmine/info_test.rb | 2 +-
test/unit/lib/redmine/menu_manager/mapper_test.rb | 2 +-
.../lib/redmine/menu_manager/menu_helper_test.rb | 2 +-
.../lib/redmine/menu_manager/menu_item_test.rb | 2 +-
test/unit/lib/redmine/menu_manager_test.rb | 2 +-
test/unit/lib/redmine/mime_type_test.rb | 2 +-
test/unit/lib/redmine/notifiable_test.rb | 2 +-
test/unit/lib/redmine/pagination_helper_test.rb | 2 +-
test/unit/lib/redmine/pagination_test.rb | 2 +-
test/unit/lib/redmine/plugin_test.rb | 2 +-
test/unit/lib/redmine/safe_attributes_test.rb | 2 +-
.../redmine/scm/adapters/bazaar_adapter_test.rb | 2 +-
.../lib/redmine/scm/adapters/cvs_adapter_test.rb | 2 +-
.../lib/redmine/scm/adapters/darcs_adapter_test.rb | 2 +-
.../scm/adapters/filesystem_adapter_test.rb | 2 +-
.../lib/redmine/scm/adapters/git_adapter_test.rb | 2 +-
.../redmine/scm/adapters/mercurial_adapter_test.rb | 2 +-
.../scm/adapters/subversion_adapter_test.rb | 2 +-
test/unit/lib/redmine/themes_test.rb | 2 +-
test/unit/lib/redmine/unified_diff_test.rb | 2 +-
test/unit/lib/redmine/utils/date_calculation.rb | 2 +-
test/unit/lib/redmine/views/builders/json_test.rb | 2 +-
test/unit/lib/redmine/views/builders/xml_test.rb | 2 +-
.../redmine/views/labelled_form_builder_test.rb | 2 +-
.../redmine/wiki_formatting/html_parser_test.rb | 2 +-
.../lib/redmine/wiki_formatting/macros_test.rb | 2 +-
.../wiki_formatting/markdown_formatter_test.rb | 2 +-
.../wiki_formatting/markdown_html_parser_test.rb | 2 +-
.../wiki_formatting/textile_formatter_test.rb | 2 +-
.../wiki_formatting/textile_html_parser_test.rb | 2 +-
test/unit/lib/redmine/wiki_formatting_test.rb | 2 +-
test/unit/lib/redmine_test.rb | 2 +-
test/unit/mail_handler_test.rb | 2 +-
test/unit/mailer_test.rb | 2 +-
test/unit/member_test.rb | 2 +-
test/unit/message_test.rb | 2 +-
test/unit/news_test.rb | 2 +-
test/unit/principal_test.rb | 2 +-
test/unit/project_copy_test.rb | 2 +-
test/unit/project_members_inheritance_test.rb | 2 +-
test/unit/project_nested_set_concurrency_test.rb | 2 +-
test/unit/project_nested_set_test.rb | 2 +-
test/unit/project_test.rb | 2 +-
test/unit/query_test.rb | 2 +-
test/unit/repository_bazaar_test.rb | 2 +-
test/unit/repository_cvs_test.rb | 2 +-
test/unit/repository_darcs_test.rb | 2 +-
test/unit/repository_filesystem_test.rb | 2 +-
test/unit/repository_git_test.rb | 2 +-
test/unit/repository_mercurial_test.rb | 2 +-
test/unit/repository_subversion_test.rb | 2 +-
test/unit/repository_test.rb | 2 +-
test/unit/role_test.rb | 2 +-
test/unit/search_test.rb | 2 +-
test/unit/setting_test.rb | 2 +-
test/unit/time_entry_activity_test.rb | 2 +-
test/unit/time_entry_query_test.rb | 2 +-
test/unit/time_entry_test.rb | 2 +-
test/unit/token_test.rb | 2 +-
test/unit/tracker_test.rb | 2 +-
test/unit/user_preference_test.rb | 9 +-
test/unit/user_test.rb | 2 +-
test/unit/version_test.rb | 2 +-
test/unit/watcher_test.rb | 2 +-
test/unit/wiki_content_test.rb | 2 +-
test/unit/wiki_content_version_test.rb | 2 +-
test/unit/wiki_page_test.rb | 20 +-
test/unit/wiki_redirect_test.rb | 2 +-
test/unit/wiki_test.rb | 2 +-
test/unit/workflow_test.rb | 2 +-
test/unit/workflow_transition_test.rb | 2 +-
636 files changed, 1637 insertions(+), 1319 deletions(-)
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 5576fa2..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,161 +0,0 @@
-# Redmine runs tests on own continuous integration server.
-# http://www.redmine.org/projects/redmine/wiki/Continuous_integration
-# You can also run tests on your environment.
-language: ruby
-rvm:
- - 1.9.3
- - 2.0
- - 2.1
- - 2.2
- - jruby-9.0.1.0
- - jruby
-env:
- - "SUITE=units DB=postgresql"
- - "SUITE=functionals DB=postgresql"
- - "SUITE=integration DB=postgresql"
- - "SUITE=ui DB=postgresql"
- - "SUITE=units DB=postgresql-8.4"
- - "SUITE=functionals DB=postgresql-8.4"
- - "SUITE=integration DB=postgresql-8.4"
- - "SUITE=ui DB=postgresql-8.4"
- - "SUITE=units DB=postgresql-9.1"
- - "SUITE=functionals DB=postgresql-9.1"
- - "SUITE=integration DB=postgresql-9.1"
- - "SUITE=ui DB=postgresql-9.1"
- - "SUITE=units DB=postgresql-9.2"
- - "SUITE=functionals DB=postgresql-9.2"
- - "SUITE=integration DB=postgresql-9.2"
- - "SUITE=ui DB=postgresql-9.2"
- - "SUITE=units DB=postgresql-9.3"
- - "SUITE=functionals DB=postgresql-9.3"
- - "SUITE=integration DB=postgresql-9.3"
- - "SUITE=ui DB=postgresql-9.3"
- - "SUITE=units DB=postgresql-9.4"
- - "SUITE=functionals DB=postgresql-9.4"
- - "SUITE=integration DB=postgresql-9.4"
- - "SUITE=ui DB=postgresql-9.4"
- - "SUITE=units DB=postgresql-9.5"
- - "SUITE=functionals DB=postgresql-9.5"
- - "SUITE=integration DB=postgresql-9.5"
- - "SUITE=ui DB=postgresql-9.5"
- - "SUITE=units DB=mysql-5.5"
- - "SUITE=functionals DB=mysql-5.5"
- - "SUITE=integration DB=mysql-5.5"
- - "SUITE=ui DB=mysql-5.5"
- - "SUITE=units DB=mysql-5.6"
- - "SUITE=functionals DB=mysql-5.6"
- - "SUITE=integration DB=mysql-5.6"
- - "SUITE=ui DB=mysql-5.6"
- - "SUITE=units DB=mysql-5.7-dmr"
- - "SUITE=functionals DB=mysql-5.7-dmr"
- - "SUITE=integration DB=mysql-5.7-dmr"
- - "SUITE=ui DB=mysql-5.7-dmr"
- - "SUITE=units DB=mariadb-5.5"
- - "SUITE=functionals DB=mariadb-5.5"
- - "SUITE=integration DB=mariadb-5.5"
- - "SUITE=ui DB=mariadb-5.5"
- - "SUITE=units DB=mariadb-10.0"
- - "SUITE=functionals DB=mariadb-10.0"
- - "SUITE=integration DB=mariadb-10.0"
- - "SUITE=ui DB=mariadb-10.0"
- - "SUITE=units DB=sqlite3"
- - "SUITE=functionals DB=sqlite3"
- - "SUITE=integration DB=sqlite3"
- - "SUITE=ui DB=sqlite3"
-matrix:
- allow_failures:
- # http://www.redmine.org/issues/20251
- - env: "SUITE=ui DB=postgresql"
- - env: "SUITE=ui DB=mysql-5.5"
- - env: "SUITE=ui DB=mysql-5.6"
- - env: "SUITE=ui DB=mysql-5.7-dmr"
- - env: "SUITE=ui DB=mariadb-5.5"
- - env: "SUITE=ui DB=mariadb-10.0"
- - env: "SUITE=ui DB=sqlite3"
- - env: "SUITE=units DB=mysql-5.7-dmr"
- - env: "SUITE=functionals DB=mysql-5.7-dmr"
- - env: "SUITE=integration DB=mysql-5.7-dmr"
- - env: "SUITE=ui DB=postgresql-8.4"
- - env: "SUITE=ui DB=postgresql-9.1"
- - env: "SUITE=ui DB=postgresql-9.2"
- - env: "SUITE=ui DB=postgresql-9.3"
- - env: "SUITE=ui DB=postgresql-9.4"
- - env: "SUITE=ui DB=postgresql-9.5"
- - rvm: jruby-9.0.1.0
- # SCM tests fail randomly due to IO.popen().
- # http://www.redmine.org/issues/19091
- # https://github.com/jruby/jruby/issues/779
- - rvm: jruby
- # http://www.redmine.org/issues/17460
- # http://www.redmine.org/issues/19344
- - env: "SUITE=units DB=mysql-5.6"
- - env: "SUITE=units DB=mysql-5.7-dmr"
- - env: "SUITE=units DB=mariadb-5.5"
- - env: "SUITE=units DB=mariadb-10.0"
-before_install:
- # https://github.com/travis-ci/travis-ci/issues/4720
- - if [[ ${TRAVIS_RUBY_VERSION} =~ jruby-9\.0 ]] ;
- then
- rvm get master ;
- rvm use ${TRAVIS_RUBY_VERSION} --install ;
- ruby --version ;
- fi
- - "sudo apt-get update -qq"
- - "sudo apt-get --no-install-recommends install bzr cvs git mercurial subversion"
- - dpkg -l '*mysql*'
- - if [[ $DB =~ (mariadb|mysql-5\.[67]) ]] ;
- then
- sudo service mysql stop ;
- sudo apt-get install python-software-properties ;
- if [[ $DB =~ mariadb ]] ;
- then
- sudo apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xcbcb082a1bb943db ;
- MARIADB_VER=`echo $DB | sed -e 's/mariadb-//'` ;
- sudo add-apt-repository ''"deb http://ftp.osuosl.org/pub/mariadb/repo/${MARIADB_VER}/ubuntu precise main"'' ;
- sudo cp test/travis/mariadb.pref /etc/apt/preferences.d/mariadb.pref ;
- sudo apt-get update ;
- sudo DEBIAN_FRONTEND=noninteractive apt-get -q --yes --force-yes -f --option DPkg::Options::=--force-confnew install mariadb-server ;
- sudo apt-get install libmariadbd-dev ;
- else
- echo mysql-apt-config mysql-apt-config/enable-repo select $DB | sudo debconf-set-selections ;
- wget http://dev.mysql.com/get/mysql-apt-config_0.2.1-1ubuntu12.04_all.deb ;
- sudo dpkg --install mysql-apt-config_0.2.1-1ubuntu12.04_all.deb ;
- sudo apt-get update -q ;
- sudo apt-get install -q -y -o Dpkg::Options::=--force-confnew mysql-server ;
- fi
- elif [[ $DB =~ postgresql ]] ;
- then
- if [[ $DB =~ postgresql- ]] ;
- then
- PG_VER=`echo $DB | sed -e 's/postgresql-//'` ;
- sudo service postgresql stop ;
- sudo apt-get -y -qq --purge remove postgresql libpq-dev libpq5 postgresql-client-common postgresql-common ;
- sudo rm -rf /var/lib/postgresql ;
- sudo sh -c "echo deb http://apt.postgresql.org/pub/repos/apt/ precise-pgdg main ${PG_VER} >> /etc/apt/sources.list.d/pgdg.list" ;
- wget --quiet -O - http://apt.postgresql.org/pub/repos/apt/ACCC4CF8.asc | sudo apt-key add - ;
- sudo apt-get update -qq ;
- sudo apt-get -y -o Dpkg::Options::=--force-confdef -o Dpkg::Options::="--force-confnew" install postgresql-${PG_VER} postgresql-contrib-${PG_VER} postgresql-server-dev-${PG_VER} ;
- echo "local all all trust" | sudo tee /etc/postgresql/${PG_VER}/main/pg_hba.conf ;
- echo "host all all 127.0.0.1/32 trust" | sudo tee -a /etc/postgresql/${PG_VER}/main/pg_hba.conf ;
- echo "host all all ::1/128 trust" | sudo tee -a /etc/postgresql/${PG_VER}/main/pg_hba.conf ;
- sudo service postgresql restart ;
- fi ;
- psql --version ;
- psql -c "SHOW SERVER_VERSION" -U postgres ;
- psql -c "SHOW SERVER_ENCODING" -U postgres ;
- psql -c "SHOW DateStyle" -U postgres ;
- fi
- - sudo sh -x test/travis/install-openldap.sh
-script:
- - export DATABASE_ADAPTER=${DB}
- - "SCMS=bazaar,cvs,subversion,git,mercurial,filesystem"
- - "export SCMS"
- - "git --version"
- - "bundle install"
- - "RUN_ON_NOT_OFFICIAL='' RUBY_VER=1.9 BRANCH=trunk bundle exec rake config/database.yml"
- - "bundle install"
- - "bundle exec rake ci:setup"
- - phantomjs --webdriver 4444 &
- - JRUBY_OPTS='-J-Xmx1024m -J-XX:MaxPermSize=1024m' bundle exec rake test:${SUITE}
-notifications:
- email: false
diff --git a/Gemfile b/Gemfile
index 3ad9b1e..7092e2c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,7 +4,7 @@ if Gem::Version.new(Bundler::VERSION) < Gem::Version.new('1.5.0')
abort "Redmine requires Bundler 1.5.0 or higher (you're using #{Bundler::VERSION}).\nPlease update with 'gem update bundler'."
end
-gem "rails", "4.2.5"
+gem "rails", "4.2.5.2"
gem "jquery-rails", "~> 3.1.4"
gem "coderay", "~> 1.1.0"
gem "builder", ">= 3.0.4"
@@ -15,6 +15,12 @@ gem "actionpack-action_caching"
gem "actionpack-xml_parser"
gem "roadie-rails"
+# Request at least nokogiri 1.6.7.2 because of security advisories
+gem "nokogiri", ">= 1.6.7.2"
+
+# Request at least rails-html-sanitizer 1.0.3 because of security advisories
+gem "rails-html-sanitizer", ">= 1.0.3"
+
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: [:mingw, :x64_mingw, :mswin, :jruby]
gem "rbpdf", "~> 1.19.0"
diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
index 3c31895..504ca60 100644
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/controllers/activities_controller.rb b/app/controllers/activities_controller.rb
index 00d0348..ce3f600 100644
--- a/app/controllers/activities_controller.rb
+++ b/app/controllers/activities_controller.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index d7a40f9..944e60c 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 98a2246..092c83a 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -595,7 +595,7 @@ class ApplicationController < ActionController::Base
# Returns a string that can be used as filename value in Content-Disposition header
def filename_for_content_disposition(name)
- request.env['HTTP_USER_AGENT'] =~ %r{(MSIE|Trident)} ? ERB::Util.url_encode(name) : name
+ request.env['HTTP_USER_AGENT'] =~ %r{(MSIE|Trident|Edge)} ? ERB::Util.url_encode(name) : name
end
def api_request?
diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb
index 9d3f7d7..6113957 100644
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/controllers/auth_sources_controller.rb b/app/controllers/auth_sources_controller.rb
index c8af474..38bebc4 100644
--- a/app/controllers/auth_sources_controller.rb
+++ b/app/controllers/auth_sources_controller.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/controllers/auto_completes_controller.rb b/app/controllers/auto_completes_controller.rb
index caa5d3b..92c0641 100644
--- a/app/controllers/auto_completes_controller.rb
+++ b/app/controllers/auto_completes_controller.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/controllers/boards_controller.rb b/app/controllers/boards_controller.rb
index 3c941fa..d568471 100644
--- a/app/controllers/boards_controller.rb
+++ b/app/controllers/boards_controller.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/controllers/calendars_controller.rb b/app/controllers/calendars_controller.rb
index 9fe89ab..756d62b 100644
--- a/app/controllers/calendars_controller.rb
+++ b/app/controllers/calendars_controller.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index 006f583..5074ef6 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/controllers/context_menus_controller.rb b/app/controllers/context_menus_controller.rb
index 7c5e76d..19661f9 100644
--- a/app/controllers/context_menus_controller.rb
+++ b/app/controllers/context_menus_controller.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/controllers/custom_field_enumerations_controller.rb b/app/controllers/custom_field_enumerations_controller.rb
index 212e575..f99f770 100644
--- a/app/controllers/custom_field_enumerations_controller.rb
+++ b/app/controllers/custom_field_enumerations_controller.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/controllers/custom_fields_controller.rb b/app/controllers/custom_fields_controller.rb
index 169e93c..3c2cf7c 100644
--- a/app/controllers/custom_fields_controller.rb
+++ b/app/controllers/custom_fields_controller.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -56,7 +56,7 @@ class CustomFieldsController < ApplicationController
if @custom_field.update_attributes(params[:custom_field])
flash[:notice] = l(:notice_successful_update)
call_hook(:controller_custom_fields_edit_after_save, :params => params, :custom_field => @custom_field)
- redirect_to edit_custom_field_path(@custom_field)
+ redirect_back_or_default edit_custom_field_path(@custom_field)
else
render :action => 'edit'
end
diff --git a/app/controllers/documents_controller.rb b/app/controllers/documents_controller.rb
index fef3a7d..40db8af 100644
--- a/app/controllers/documents_controller.rb
+++ b/app/controllers/documents_controller.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/controllers/email_addresses_controller.rb b/app/controllers/email_addresses_controller.rb
index 1c1b39d..dfc80ad 100644
--- a/app/controllers/email_addresses_controller.rb
+++ b/app/controllers/email_addresses_controller.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/controllers/enumerations_controller.rb b/app/controllers/enumerations_controller.rb
index 5eba1fa..05ca515 100644
--- a/app/controllers/enumerations_controller.rb
+++ b/app/controllers/enumerations_controller.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb
index 73409c7..db061b8 100644
--- a/app/controllers/files_controller.rb
+++ b/app/controllers/files_controller.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/controllers/gantts_controller.rb b/app/controllers/gantts_controller.rb
index d9773ab..e37d780 100644
--- a/app/controllers/gantts_controller.rb
+++ b/app/controllers/gantts_controller.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index 825e8b8..b99e374 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/controllers/imports_controller.rb b/app/controllers/imports_controller.rb
index 2499a20..79a5ced 100644
--- a/app/controllers/imports_controller.rb
+++ b/app/controllers/imports_controller.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/controllers/issue_categories_controller.rb b/app/controllers/issue_categories_controller.rb
index ca167d4..c53f239 100644
--- a/app/controllers/issue_categories_controller.rb
+++ b/app/controllers/issue_categories_controller.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/controllers/issue_relations_controller.rb b/app/controllers/issue_relations_controller.rb
index 698a64c..c555842 100644
--- a/app/controllers/issue_relations_controller.rb
+++ b/app/controllers/issue_relations_controller.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/controllers/issue_statuses_controller.rb b/app/controllers/issue_statuses_controller.rb
index 7b8103e..ba463e2 100644
--- a/app/controllers/issue_statuses_controller.rb
+++ b/app/controllers/issue_statuses_controller.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index f2dd1ac..c23c1b5 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -388,7 +388,7 @@ class IssuesController < ApplicationController
issue_attributes = issue_attributes.dup
issue_attributes.delete(:lock_version)
when 'add_notes'
- issue_attributes = issue_attributes.slice(:notes)
+ issue_attributes = issue_attributes.slice(:notes, :private_notes)
when 'cancel'
redirect_to issue_path(@issue)
return false
diff --git a/app/controllers/journals_controller.rb b/app/controllers/journals_controller.rb
index bae6ca2..e9097f5 100644
--- a/app/controllers/journals_controller.rb
+++ b/app/controllers/journals_controller.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/controllers/mail_handler_controller.rb b/app/controllers/mail_handler_controller.rb
index 7ae2f64..ca08a24 100644
--- a/app/controllers/mail_handler_controller.rb
+++ b/app/controllers/mail_handler_controller.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb
index dbf7a5b..140d504 100644
--- a/app/controllers/members_controller.rb
+++ b/app/controllers/members_controller.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index ffaa91b..487dcbe 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/controllers/my_controller.rb b/app/controllers/my_controller.rb
index 9fdc143..0eca76d 100644
--- a/app/controllers/my_controller.rb
+++ b/app/controllers/my_controller.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/controllers/news_controller.rb b/app/controllers/news_controller.rb
index c32131d..6e429e8 100644
--- a/app/controllers/news_controller.rb
+++ b/app/controllers/news_controller.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/controllers/previews_controller.rb b/app/controllers/previews_controller.rb
index 365e12b..48828b1 100644
--- a/app/controllers/previews_controller.rb
+++ b/app/controllers/previews_controller.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/controllers/principal_memberships_controller.rb b/app/controllers/principal_memberships_controller.rb
index 3726ea2..5cf8ff1 100644
--- a/app/controllers/principal_memberships_controller.rb
+++ b/app/controllers/principal_memberships_controller.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/controllers/project_enumerations_controller.rb b/app/controllers/project_enumerations_controller.rb
index 2326eb2..df3d8c2 100644
--- a/app/controllers/project_enumerations_controller.rb
+++ b/app/controllers/project_enumerations_controller.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 60af371..7e1798a 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/controllers/queries_controller.rb b/app/controllers/queries_controller.rb
index 72c09de..9b14d44 100644
--- a/app/controllers/queries_controller.rb
+++ b/app/controllers/queries_controller.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/controllers/reports_controller.rb b/app/controllers/reports_controller.rb
index 085dbcd..b7bf920 100644
--- a/app/controllers/reports_controller.rb
+++ b/app/controllers/reports_controller.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index 364b834..ded172a 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/controllers/roles_controller.rb b/app/controllers/roles_controller.rb
index 33229cb..f3fa8f1 100644
--- a/app/controllers/roles_controller.rb
+++ b/app/controllers/roles_controller.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index 9bc9926..5570e64 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/controllers/settings_controller.rb b/app/controllers/settings_controller.rb
index 5ca5d1d..fadbf94 100644
--- a/app/controllers/settings_controller.rb
+++ b/app/controllers/settings_controller.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/controllers/sys_controller.rb b/app/controllers/sys_controller.rb
index 0402c11..9231153 100644
--- a/app/controllers/sys_controller.rb
+++ b/app/controllers/sys_controller.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/controllers/timelog_controller.rb b/app/controllers/timelog_controller.rb
index a8d48a7..5971601 100644
--- a/app/controllers/timelog_controller.rb
+++ b/app/controllers/timelog_controller.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/controllers/trackers_controller.rb b/app/controllers/trackers_controller.rb
index 4a291b5..b89a431 100644
--- a/app/controllers/trackers_controller.rb
+++ b/app/controllers/trackers_controller.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 9ce8011..cac19ea 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -143,7 +143,7 @@ class UsersController < ApplicationController
if was_activated
Mailer.account_activated(@user).deliver
- elsif @user.active? && params[:send_information] && @user.password.present? && @user.auth_source_id.nil?
+ elsif @user.active? && params[:send_information] && @user.password.present? && @user.auth_source_id.nil? && @user != User.current
Mailer.account_information(@user, @user.password).deliver
end
diff --git a/app/controllers/versions_controller.rb b/app/controllers/versions_controller.rb
index e6b1fec..047e3a0 100644
--- a/app/controllers/versions_controller.rb
+++ b/app/controllers/versions_controller.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/controllers/watchers_controller.rb b/app/controllers/watchers_controller.rb
index 917eb5e..36c8c5c 100644
--- a/app/controllers/watchers_controller.rb
+++ b/app/controllers/watchers_controller.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb
index 5afbe41..717c729 100644
--- a/app/controllers/welcome_controller.rb
+++ b/app/controllers/welcome_controller.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/controllers/wiki_controller.rb b/app/controllers/wiki_controller.rb
index eabfe1c..46dec48 100644
--- a/app/controllers/wiki_controller.rb
+++ b/app/controllers/wiki_controller.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/controllers/wikis_controller.rb b/app/controllers/wikis_controller.rb
index 2bb9454..61abfaf 100644
--- a/app/controllers/wikis_controller.rb
+++ b/app/controllers/wikis_controller.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/controllers/workflows_controller.rb b/app/controllers/workflows_controller.rb
index 6f8a65f..7f92f25 100644
--- a/app/controllers/workflows_controller.rb
+++ b/app/controllers/workflows_controller.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/helpers/account_helper.rb b/app/helpers/account_helper.rb
index e8d5fca..0fedbe2 100644
--- a/app/helpers/account_helper.rb
+++ b/app/helpers/account_helper.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
#
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/helpers/activities_helper.rb b/app/helpers/activities_helper.rb
index 6a73b51..8721227 100644
--- a/app/helpers/activities_helper.rb
+++ b/app/helpers/activities_helper.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
#
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/helpers/admin_helper.rb b/app/helpers/admin_helper.rb
index ff57c37..b8ac260 100644
--- a/app/helpers/admin_helper.rb
+++ b/app/helpers/admin_helper.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
#
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index f152e21..6893174 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
#
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -883,12 +883,12 @@ module ApplicationHelper
def parse_sections(text, project, obj, attr, only_path, options)
return unless options[:edit_section_links]
text.gsub!(HEADING_RE) do
- heading = $1
+ heading, level = $1, $2
@current_section += 1
if @current_section > 1
content_tag('div',
link_to(image_tag('edit.png'), options[:edit_section_links].merge(:section => @current_section)),
- :class => 'contextual',
+ :class => "contextual heading-#{level}",
:title => l(:button_edit_section),
:id => "section-#{@current_section}") + heading.html_safe
else
diff --git a/app/helpers/attachments_helper.rb b/app/helpers/attachments_helper.rb
index f7f9007..f3969f4 100644
--- a/app/helpers/attachments_helper.rb
+++ b/app/helpers/attachments_helper.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
#
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/helpers/auth_sources_helper.rb b/app/helpers/auth_sources_helper.rb
index 8364d64..8c8295a 100644
--- a/app/helpers/auth_sources_helper.rb
+++ b/app/helpers/auth_sources_helper.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
#
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/helpers/boards_helper.rb b/app/helpers/boards_helper.rb
index 5f586e0..78a17fe 100644
--- a/app/helpers/boards_helper.rb
+++ b/app/helpers/boards_helper.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
#
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/helpers/calendars_helper.rb b/app/helpers/calendars_helper.rb
index 0c3c4fe..cf624d2 100644
--- a/app/helpers/calendars_helper.rb
+++ b/app/helpers/calendars_helper.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
#
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/helpers/context_menus_helper.rb b/app/helpers/context_menus_helper.rb
index 0430091..e3cf728 100644
--- a/app/helpers/context_menus_helper.rb
+++ b/app/helpers/context_menus_helper.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
#
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/helpers/custom_fields_helper.rb b/app/helpers/custom_fields_helper.rb
index 3ed68c1..3f357ab 100644
--- a/app/helpers/custom_fields_helper.rb
+++ b/app/helpers/custom_fields_helper.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
#
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/helpers/documents_helper.rb b/app/helpers/documents_helper.rb
index b9a976a..34ab8ae 100644
--- a/app/helpers/documents_helper.rb
+++ b/app/helpers/documents_helper.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
#
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/helpers/email_addresses_helper.rb b/app/helpers/email_addresses_helper.rb
index f397e99..945962c 100644
--- a/app/helpers/email_addresses_helper.rb
+++ b/app/helpers/email_addresses_helper.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
#
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/helpers/enumerations_helper.rb b/app/helpers/enumerations_helper.rb
index 086db73..737d5a5 100644
--- a/app/helpers/enumerations_helper.rb
+++ b/app/helpers/enumerations_helper.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
#
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/helpers/gantt_helper.rb b/app/helpers/gantt_helper.rb
index b36eb3d..77d3b83 100644
--- a/app/helpers/gantt_helper.rb
+++ b/app/helpers/gantt_helper.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
#
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/helpers/groups_helper.rb b/app/helpers/groups_helper.rb
index 0706dcb..d321a29 100644
--- a/app/helpers/groups_helper.rb
+++ b/app/helpers/groups_helper.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
#
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/helpers/imports_helper.rb b/app/helpers/imports_helper.rb
index 3af7520..2fecfca 100644
--- a/app/helpers/imports_helper.rb
+++ b/app/helpers/imports_helper.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
#
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/helpers/issue_categories_helper.rb b/app/helpers/issue_categories_helper.rb
index 55416c2..d214d5e 100644
--- a/app/helpers/issue_categories_helper.rb
+++ b/app/helpers/issue_categories_helper.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
#
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/helpers/issue_relations_helper.rb b/app/helpers/issue_relations_helper.rb
index 7811192..d6bc7e4 100644
--- a/app/helpers/issue_relations_helper.rb
+++ b/app/helpers/issue_relations_helper.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
#
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/helpers/issue_statuses_helper.rb b/app/helpers/issue_statuses_helper.rb
index 03d73ce..cb466ae 100644
--- a/app/helpers/issue_statuses_helper.rb
+++ b/app/helpers/issue_statuses_helper.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
#
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index 497bea3..e04888e 100644
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
#
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -114,7 +114,7 @@ module IssuesHelper
content_tag('td', link_to_issue(child, :project => (issue.project_id != child.project_id)), :class => 'subject', :style => 'width: 50%') +
content_tag('td', h(child.status)) +
content_tag('td', link_to_user(child.assigned_to)) +
- content_tag('td', progress_bar(child.done_ratio)),
+ content_tag('td', child.disabled_core_fields.include?('done_ratio') ? '' : progress_bar(child.done_ratio)),
:class => css)
end
s << '</table></form>'
diff --git a/app/helpers/journals_helper.rb b/app/helpers/journals_helper.rb
index d6d6ec4..87f76eb 100644
--- a/app/helpers/journals_helper.rb
+++ b/app/helpers/journals_helper.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
#
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/helpers/mail_handler_helper.rb b/app/helpers/mail_handler_helper.rb
index 84b3eec..64311b5 100644
--- a/app/helpers/mail_handler_helper.rb
+++ b/app/helpers/mail_handler_helper.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
#
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/helpers/members_helper.rb b/app/helpers/members_helper.rb
index 57ff4d4..f282223 100644
--- a/app/helpers/members_helper.rb
+++ b/app/helpers/members_helper.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
#
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/helpers/messages_helper.rb b/app/helpers/messages_helper.rb
index 6234f65..a3d1fa3 100644
--- a/app/helpers/messages_helper.rb
+++ b/app/helpers/messages_helper.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
#
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/helpers/my_helper.rb b/app/helpers/my_helper.rb
index a559b98..504bd0b 100644
--- a/app/helpers/my_helper.rb
+++ b/app/helpers/my_helper.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
#
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/helpers/news_helper.rb b/app/helpers/news_helper.rb
index da147c8..74d63e4 100644
--- a/app/helpers/news_helper.rb
+++ b/app/helpers/news_helper.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
#
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/helpers/principal_memberships_helper.rb b/app/helpers/principal_memberships_helper.rb
index 7098f7e..e3ef377 100644
--- a/app/helpers/principal_memberships_helper.rb
+++ b/app/helpers/principal_memberships_helper.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
#
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index 3e839e6..6e409f2 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
#
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/helpers/queries_helper.rb b/app/helpers/queries_helper.rb
index 9ad2540..4b71d08 100644
--- a/app/helpers/queries_helper.rb
+++ b/app/helpers/queries_helper.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
#
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -243,4 +243,34 @@ module QueriesHelper
@query
end
end
+
+ # Returns the query definition as hidden field tags
+ def query_as_hidden_field_tags(query)
+ tags = hidden_field_tag("set_filter", "1", :id => nil)
+
+ if query.filters.present?
+ query.filters.each do |field, filter|
+ tags << hidden_field_tag("f[]", field, :id => nil)
+ tags << hidden_field_tag("op[#{field}]", filter[:operator], :id => nil)
+ filter[:values].each do |value|
+ tags << hidden_field_tag("v[#{field}][]", value, :id => nil)
+ end
+ end
+ end
+ if query.column_names.present?
+ query.column_names.each do |name|
+ tags << hidden_field_tag("c[]", name, :id => nil)
+ end
+ end
+ if query.totalable_names.present?
+ query.totalable_names.each do |name|
+ tags << hidden_field_tag("t[]", name, :id => nil)
+ end
+ end
+ if query.group_by.present?
+ tags << hidden_field_tag("group_by", query.group_by, :id => nil)
+ end
+
+ tags
+ end
end
diff --git a/app/helpers/reports_helper.rb b/app/helpers/reports_helper.rb
index 0450186..7638012 100644
--- a/app/helpers/reports_helper.rb
+++ b/app/helpers/reports_helper.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
#
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/helpers/repositories_helper.rb b/app/helpers/repositories_helper.rb
index abed22e..7ac9075 100644
--- a/app/helpers/repositories_helper.rb
+++ b/app/helpers/repositories_helper.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
#
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/helpers/roles_helper.rb b/app/helpers/roles_helper.rb
index a86eb27..737c11d 100644
--- a/app/helpers/roles_helper.rb
+++ b/app/helpers/roles_helper.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
#
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/helpers/routes_helper.rb b/app/helpers/routes_helper.rb
index ea9f5e4..7ba0ec0 100644
--- a/app/helpers/routes_helper.rb
+++ b/app/helpers/routes_helper.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
#
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb
index 2697b22..2554cf9 100644
--- a/app/helpers/search_helper.rb
+++ b/app/helpers/search_helper.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
#
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/helpers/settings_helper.rb b/app/helpers/settings_helper.rb
index c2c2e2f..43b2c70 100644
--- a/app/helpers/settings_helper.rb
+++ b/app/helpers/settings_helper.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
#
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/helpers/timelog_helper.rb b/app/helpers/timelog_helper.rb
index aef93bf..25bc750 100644
--- a/app/helpers/timelog_helper.rb
+++ b/app/helpers/timelog_helper.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
#
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/helpers/trackers_helper.rb b/app/helpers/trackers_helper.rb
index 1ed3d57..96dbfe2 100644
--- a/app/helpers/trackers_helper.rb
+++ b/app/helpers/trackers_helper.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
#
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
index 2ba41fa..8b85e9f 100644
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
#
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/helpers/versions_helper.rb b/app/helpers/versions_helper.rb
index 043ba27..345784d 100644
--- a/app/helpers/versions_helper.rb
+++ b/app/helpers/versions_helper.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
#
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/helpers/watchers_helper.rb b/app/helpers/watchers_helper.rb
index 4bf6424..490fd1e 100644
--- a/app/helpers/watchers_helper.rb
+++ b/app/helpers/watchers_helper.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
#
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/helpers/welcome_helper.rb b/app/helpers/welcome_helper.rb
index f0ae33c..d1e731d 100644
--- a/app/helpers/welcome_helper.rb
+++ b/app/helpers/welcome_helper.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
#
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/helpers/wiki_helper.rb b/app/helpers/wiki_helper.rb
index 5944892..89da548 100644
--- a/app/helpers/wiki_helper.rb
+++ b/app/helpers/wiki_helper.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
#
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/helpers/workflows_helper.rb b/app/helpers/workflows_helper.rb
index cfd7a36..eda4043 100644
--- a/app/helpers/workflows_helper.rb
+++ b/app/helpers/workflows_helper.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
#
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/models/attachment.rb b/app/models/attachment.rb
index 0064555..3d16f57 100644
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/models/auth_source.rb b/app/models/auth_source.rb
index 5621770..69448d3 100644
--- a/app/models/auth_source.rb
+++ b/app/models/auth_source.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/models/auth_source_ldap.rb b/app/models/auth_source_ldap.rb
index d5a8550..085bc2c 100644
--- a/app/models/auth_source_ldap.rb
+++ b/app/models/auth_source_ldap.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -197,7 +197,8 @@ class AuthSourceLdap < AuthSource
def self.get_attr(entry, attr_name)
if !attr_name.blank?
- entry[attr_name].is_a?(Array) ? entry[attr_name].first : entry[attr_name]
+ value = entry[attr_name].is_a?(Array) ? entry[attr_name].first : entry[attr_name]
+ value.to_s.force_encoding('UTF-8')
end
end
end
diff --git a/app/models/board.rb b/app/models/board.rb
index 149b74d..d62f863 100644
--- a/app/models/board.rb
+++ b/app/models/board.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/models/change.rb b/app/models/change.rb
index 412958b..9e32bce 100644
--- a/app/models/change.rb
+++ b/app/models/change.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/models/changeset.rb b/app/models/changeset.rb
index ae42d41..edfe857 100644
--- a/app/models/changeset.rb
+++ b/app/models/changeset.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/models/comment.rb b/app/models/comment.rb
index 78cdad5..4912b57 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/models/custom_field.rb b/app/models/custom_field.rb
index 8da7503..f5f15a4 100644
--- a/app/models/custom_field.rb
+++ b/app/models/custom_field.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/models/custom_field_enumeration.rb b/app/models/custom_field_enumeration.rb
index 26a580d..b7b3cd6 100644
--- a/app/models/custom_field_enumeration.rb
+++ b/app/models/custom_field_enumeration.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -65,6 +65,12 @@ class CustomFieldEnumeration < ActiveRecord::Base
end
end
+ def self.fields_for_order_statement(table=nil)
+ table ||= table_name
+ columns = ['position']
+ columns.uniq.map {|field| "#{table}.#{field}"}
+ end
+
private
def set_position
diff --git a/app/models/custom_field_value.rb b/app/models/custom_field_value.rb
index 01535b0..a816f0d 100644
--- a/app/models/custom_field_value.rb
+++ b/app/models/custom_field_value.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/models/custom_value.rb b/app/models/custom_value.rb
index d89bfbb..8026d5f 100644
--- a/app/models/custom_value.rb
+++ b/app/models/custom_value.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/models/document.rb b/app/models/document.rb
index a522168..c536567 100644
--- a/app/models/document.rb
+++ b/app/models/document.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/models/document_category.rb b/app/models/document_category.rb
index 10ba9db..c5fde10 100644
--- a/app/models/document_category.rb
+++ b/app/models/document_category.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/models/document_category_custom_field.rb b/app/models/document_category_custom_field.rb
index add156a..e456368 100644
--- a/app/models/document_category_custom_field.rb
+++ b/app/models/document_category_custom_field.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/models/document_custom_field.rb b/app/models/document_custom_field.rb
index 3ea9d10..31b230d 100644
--- a/app/models/document_custom_field.rb
+++ b/app/models/document_custom_field.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/models/email_address.rb b/app/models/email_address.rb
index 01fd75b..7e15382 100644
--- a/app/models/email_address.rb
+++ b/app/models/email_address.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/models/enabled_module.rb b/app/models/enabled_module.rb
index d1a3202..480061f 100644
--- a/app/models/enabled_module.rb
+++ b/app/models/enabled_module.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/models/enumeration.rb b/app/models/enumeration.rb
index b2337fa..eac4034 100644
--- a/app/models/enumeration.rb
+++ b/app/models/enumeration.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/models/group.rb b/app/models/group.rb
index 8c68330..a1a508e 100644
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/models/group_anonymous.rb b/app/models/group_anonymous.rb
index 7ef1c8e..b872c27 100644
--- a/app/models/group_anonymous.rb
+++ b/app/models/group_anonymous.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/models/group_builtin.rb b/app/models/group_builtin.rb
index d6df3e3..9cedb61 100644
--- a/app/models/group_builtin.rb
+++ b/app/models/group_builtin.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/models/group_custom_field.rb b/app/models/group_custom_field.rb
index 137b096..fe70d76 100644
--- a/app/models/group_custom_field.rb
+++ b/app/models/group_custom_field.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/models/group_non_member.rb b/app/models/group_non_member.rb
index b7d84ee..1d4d6f7 100644
--- a/app/models/group_non_member.rb
+++ b/app/models/group_non_member.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/models/import.rb b/app/models/import.rb
index 5899674..127f7be 100644
--- a/app/models/import.rb
+++ b/app/models/import.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/models/import_item.rb b/app/models/import_item.rb
index 67fb46c..c02c0bc 100644
--- a/app/models/import_item.rb
+++ b/app/models/import_item.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/models/issue.rb b/app/models/issue.rb
index 707c458..cf657d6 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -495,6 +495,17 @@ class Issue < ActiveRecord::Base
if new_record? && !statuses_allowed.include?(status)
self.status = statuses_allowed.first || default_status
end
+ if (u = attrs.delete('assigned_to_id')) && safe_attribute?('assigned_to_id')
+ if u.blank?
+ self.assigned_to_id = nil
+ else
+ u = u.to_i
+ if assignable_users.any?{|assignable_user| assignable_user.id == u}
+ self.assigned_to_id = u
+ end
+ end
+ end
+
attrs = delete_unsafe_attributes(attrs, user)
return if attrs.empty?
@@ -810,7 +821,7 @@ class Issue < ActiveRecord::Base
# Users the issue can be assigned to
def assignable_users
users = project.assignable_users.to_a
- users << author if author
+ users << author if author && author.active?
users << assigned_to if assigned_to
users.uniq.sort
end
@@ -1626,6 +1637,7 @@ class Issue < ActiveRecord::Base
# Same user and notes
if @current_journal
duplicate.init_journal(@current_journal.user, @current_journal.notes)
+ duplicate.private_notes = @current_journal.private_notes
end
duplicate.update_attribute :status, self.status
end
diff --git a/app/models/issue_category.rb b/app/models/issue_category.rb
index db8823e..6476cfb 100644
--- a/app/models/issue_category.rb
+++ b/app/models/issue_category.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/models/issue_custom_field.rb b/app/models/issue_custom_field.rb
index 7211828..0c67989 100644
--- a/app/models/issue_custom_field.rb
+++ b/app/models/issue_custom_field.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/models/issue_import.rb b/app/models/issue_import.rb
index 5a8748c..b6b20a1 100644
--- a/app/models/issue_import.rb
+++ b/app/models/issue_import.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -128,6 +128,9 @@ class IssueImport < Import
if due_date = row_date(row, 'due_date')
attributes['due_date'] = due_date
end
+ if estimated_hours = row_value(row, 'estimated_hours')
+ attributes['estimated_hours'] = estimated_hours
+ end
if done_ratio = row_value(row, 'done_ratio')
attributes['done_ratio'] = done_ratio
end
diff --git a/app/models/issue_priority.rb b/app/models/issue_priority.rb
index b925c3e..72b7718 100644
--- a/app/models/issue_priority.rb
+++ b/app/models/issue_priority.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -19,7 +19,7 @@ class IssuePriority < Enumeration
has_many :issues, :foreign_key => 'priority_id'
after_destroy {|priority| priority.class.compute_position_names}
- after_save {|priority| priority.class.compute_position_names if priority.position_changed? && priority.position}
+ after_save {|priority| priority.class.compute_position_names if (priority.position_changed? && priority.position) || priority.active_changed?}
OptionName = :enumeration_issue_priorities
diff --git a/app/models/issue_priority_custom_field.rb b/app/models/issue_priority_custom_field.rb
index 9211f21..ef05b4f 100644
--- a/app/models/issue_priority_custom_field.rb
+++ b/app/models/issue_priority_custom_field.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/models/issue_query.rb b/app/models/issue_query.rb
index 429201e..c97de0a 100644
--- a/app/models/issue_query.rb
+++ b/app/models/issue_query.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/models/issue_relation.rb b/app/models/issue_relation.rb
index 9df4e2b..26d88a6 100644
--- a/app/models/issue_relation.rb
+++ b/app/models/issue_relation.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/models/issue_status.rb b/app/models/issue_status.rb
index e39d69a..7855f5b 100644
--- a/app/models/issue_status.rb
+++ b/app/models/issue_status.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/models/journal.rb b/app/models/journal.rb
index ec9c9d5..927f86f 100644
--- a/app/models/journal.rb
+++ b/app/models/journal.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/models/journal_detail.rb b/app/models/journal_detail.rb
index d74dd09..f7cea79 100644
--- a/app/models/journal_detail.rb
+++ b/app/models/journal_detail.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/models/mail_handler.rb b/app/models/mail_handler.rb
index 0c3d34c..d705b66 100644
--- a/app/models/mail_handler.rb
+++ b/app/models/mail_handler.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index ac4cc3a..0e51a09 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/models/member.rb b/app/models/member.rb
index 79e9eec..389684d 100644
--- a/app/models/member.rb
+++ b/app/models/member.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/models/member_role.rb b/app/models/member_role.rb
index 526daf9..d65e7b6 100644
--- a/app/models/member_role.rb
+++ b/app/models/member_role.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/models/message.rb b/app/models/message.rb
index de7ebaa..cf13ca4 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/models/news.rb b/app/models/news.rb
index b8bc35f..b5a3924 100644
--- a/app/models/news.rb
+++ b/app/models/news.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/models/principal.rb b/app/models/principal.rb
index f3c8835..3aca264 100644
--- a/app/models/principal.rb
+++ b/app/models/principal.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/models/project.rb b/app/models/project.rb
index 9868e04..197f45e 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/models/project_custom_field.rb b/app/models/project_custom_field.rb
index e6c658f..2db4070 100644
--- a/app/models/project_custom_field.rb
+++ b/app/models/project_custom_field.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/models/query.rb b/app/models/query.rb
index ddc59f9..d201b76 100644
--- a/app/models/query.rb
+++ b/app/models/query.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/models/repository.rb b/app/models/repository.rb
index 3a911cd..be1ea93 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/models/repository/bazaar.rb b/app/models/repository/bazaar.rb
index 99145f3..6d3cf5b 100644
--- a/app/models/repository/bazaar.rb
+++ b/app/models/repository/bazaar.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/models/repository/cvs.rb b/app/models/repository/cvs.rb
index fa535a8..565c3b3 100644
--- a/app/models/repository/cvs.rb
+++ b/app/models/repository/cvs.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/models/repository/darcs.rb b/app/models/repository/darcs.rb
index e719a71..a8b6137 100644
--- a/app/models/repository/darcs.rb
+++ b/app/models/repository/darcs.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/models/repository/filesystem.rb b/app/models/repository/filesystem.rb
index bfa6dc6..a0b049d 100644
--- a/app/models/repository/filesystem.rb
+++ b/app/models/repository/filesystem.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# FileSystem adapter
# File written by Paul Rivier, at Demotera.
diff --git a/app/models/repository/git.rb b/app/models/repository/git.rb
index 724a18a..0873904 100644
--- a/app/models/repository/git.rb
+++ b/app/models/repository/git.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
# Copyright (C) 2007 Patrick Aljord patcito@ŋmail.com
#
# This program is free software; you can redistribute it and/or
diff --git a/app/models/repository/mercurial.rb b/app/models/repository/mercurial.rb
index bb7e317..4ab82c5 100644
--- a/app/models/repository/mercurial.rb
+++ b/app/models/repository/mercurial.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/models/repository/subversion.rb b/app/models/repository/subversion.rb
index f48fbd8..893d71a 100644
--- a/app/models/repository/subversion.rb
+++ b/app/models/repository/subversion.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/models/role.rb b/app/models/role.rb
index 42dddaf..b7d048e 100644
--- a/app/models/role.rb
+++ b/app/models/role.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/models/setting.rb b/app/models/setting.rb
index 2574649..8e7947b 100644
--- a/app/models/setting.rb
+++ b/app/models/setting.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/models/time_entry.rb b/app/models/time_entry.rb
index ea33c0b..431c1a5 100644
--- a/app/models/time_entry.rb
+++ b/app/models/time_entry.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/models/time_entry_activity.rb b/app/models/time_entry_activity.rb
index 2a54725..0d58d0f 100644
--- a/app/models/time_entry_activity.rb
+++ b/app/models/time_entry_activity.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/models/time_entry_activity_custom_field.rb b/app/models/time_entry_activity_custom_field.rb
index bf1ad7b..4ea5357 100644
--- a/app/models/time_entry_activity_custom_field.rb
+++ b/app/models/time_entry_activity_custom_field.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/models/time_entry_custom_field.rb b/app/models/time_entry_custom_field.rb
index 3a235a1..8a1c011 100644
--- a/app/models/time_entry_custom_field.rb
+++ b/app/models/time_entry_custom_field.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/models/time_entry_query.rb b/app/models/time_entry_query.rb
index cb32672..a921f6d 100644
--- a/app/models/time_entry_query.rb
+++ b/app/models/time_entry_query.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/models/token.rb b/app/models/token.rb
index e458a92..a5ca18a 100644
--- a/app/models/token.rb
+++ b/app/models/token.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/models/tracker.rb b/app/models/tracker.rb
index cbf6bc0..dd802ef 100644
--- a/app/models/tracker.rb
+++ b/app/models/tracker.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/models/user.rb b/app/models/user.rb
index 4a6109f..7df9f2d 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/models/user_custom_field.rb b/app/models/user_custom_field.rb
index 163bd80..db61b53 100644
--- a/app/models/user_custom_field.rb
+++ b/app/models/user_custom_field.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/models/user_preference.rb b/app/models/user_preference.rb
index 80b3e6b..461b638 100644
--- a/app/models/user_preference.rb
+++ b/app/models/user_preference.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -25,6 +25,9 @@ class UserPreference < ActiveRecord::Base
def initialize(attributes=nil, *args)
super
+ if new_record? && !(attributes && attributes.key?(:hide_mail))
+ self.hide_mail = Setting.default_users_hide_mail?
+ end
self.others ||= {}
end
diff --git a/app/models/version.rb b/app/models/version.rb
index 7d3387a..cb28426 100644
--- a/app/models/version.rb
+++ b/app/models/version.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/models/version_custom_field.rb b/app/models/version_custom_field.rb
index 0f0960b..b6b1644 100644
--- a/app/models/version_custom_field.rb
+++ b/app/models/version_custom_field.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/models/watcher.rb b/app/models/watcher.rb
index afab6fa..9dde433 100644
--- a/app/models/watcher.rb
+++ b/app/models/watcher.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/models/wiki.rb b/app/models/wiki.rb
index 3725964..188cb5b 100644
--- a/app/models/wiki.rb
+++ b/app/models/wiki.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/models/wiki_content.rb b/app/models/wiki_content.rb
index 992e490..c549786 100644
--- a/app/models/wiki_content.rb
+++ b/app/models/wiki_content.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/models/wiki_page.rb b/app/models/wiki_page.rb
index 988819a..ae1e74c 100644
--- a/app/models/wiki_page.rb
+++ b/app/models/wiki_page.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -126,7 +126,7 @@ class WikiPage < ActiveRecord::Base
child.wiki_id = wiki_id
child.redirect_existing_links = redirect_existing_links
unless child.save
- WikiPage.where(:id => child.id).update_all :parent_nil => nil
+ WikiPage.where(:id => child.id).update_all :parent_id => nil
end
end
end
diff --git a/app/models/wiki_redirect.rb b/app/models/wiki_redirect.rb
index 8e09a4a..76c8447 100644
--- a/app/models/wiki_redirect.rb
+++ b/app/models/wiki_redirect.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/models/workflow_permission.rb b/app/models/workflow_permission.rb
index 095d75b..1990b82 100644
--- a/app/models/workflow_permission.rb
+++ b/app/models/workflow_permission.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/models/workflow_rule.rb b/app/models/workflow_rule.rb
index 976713a..6fd4b05 100644
--- a/app/models/workflow_rule.rb
+++ b/app/models/workflow_rule.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/models/workflow_transition.rb b/app/models/workflow_transition.rb
index bf39e77..ff75254 100644
--- a/app/models/workflow_transition.rb
+++ b/app/models/workflow_transition.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/app/views/custom_fields/_index.html.erb b/app/views/custom_fields/_index.html.erb
index 858665e..b0d3c27 100644
--- a/app/views/custom_fields/_index.html.erb
+++ b/app/views/custom_fields/_index.html.erb
@@ -12,6 +12,7 @@
</tr></thead>
<tbody>
<% (@custom_fields_by_type[tab[:name]] || []).sort.each do |custom_field| -%>
+ <% back_url = custom_fields_path(:tab => tab[:name]) %>
<tr class="<%= cycle("odd", "even") %>">
<td class="name"><%= link_to custom_field.name, edit_custom_field_path(custom_field) %></td>
<td><%= l(custom_field.format.label) %></td>
@@ -20,7 +21,7 @@
<td><%= checked_image custom_field.is_for_all? %></td>
<td><%= l(:label_x_projects, :count => custom_field.projects.count) if custom_field.is_a? IssueCustomField and !custom_field.is_for_all? %></td>
<% end %>
- <td class="reorder"><%= reorder_links('custom_field', {:action => 'update', :id => custom_field}, :put) %></td>
+ <td class="reorder"><%= reorder_links('custom_field', {:action => 'update', :id => custom_field, :back_url => back_url}, :put) %></td>
<td class="buttons">
<%= delete_link custom_field_path(custom_field) %>
</td>
diff --git a/app/views/imports/_fields_mapping.html.erb b/app/views/imports/_fields_mapping.html.erb
index 97dac0e..bb6467e 100644
--- a/app/views/imports/_fields_mapping.html.erb
+++ b/app/views/imports/_fields_mapping.html.erb
@@ -74,6 +74,10 @@
<%= mapping_select_tag @import, 'due_date' %>
</p>
<p>
+ <label><%= l(:field_estimated_hours) %></label>
+ <%= mapping_select_tag @import, 'estimated_hours' %>
+</p>
+<p>
<label><%= l(:field_done_ratio) %></label>
<%= mapping_select_tag @import, 'done_ratio' %>
</p>
diff --git a/app/views/issues/_attributes.html.erb b/app/views/issues/_attributes.html.erb
index 4ec2f81..07b863c 100644
--- a/app/views/issues/_attributes.html.erb
+++ b/app/views/issues/_attributes.html.erb
@@ -49,14 +49,14 @@
<% if @issue.safe_attribute? 'start_date' %>
<p id="start_date_area">
<%= f.text_field(:start_date, :size => 10, :required => @issue.required_attribute?('start_date')) %>
- <%= calendar_for('issue_start_date') if @issue.leaf? %>
+ <%= calendar_for('issue_start_date') %>
</p>
<% end %>
<% if @issue.safe_attribute? 'due_date' %>
<p id="due_date_area">
<%= f.text_field(:due_date, :size => 10, :required => @issue.required_attribute?('due_date')) %>
- <%= calendar_for('issue_due_date') if @issue.leaf? %>
+ <%= calendar_for('issue_due_date') %>
</p>
<% end %>
diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb
index 8310dc7..7cc2811 100644
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -76,8 +76,10 @@
<% end %>
<div id="csv-export-options" style="display:none;">
- <h3 class="title"><%= l(:label_export_options, :export_format => 'CSV') %></h3>
- <%= form_tag(params.merge({:format => 'csv',:page=>nil}), :method => :get, :id => 'csv-export-form') do %>
+ <h3 class="title"><%= l(:label_export_options, :export_format => 'CSV') %></h3>
+ <%= form_tag(_project_issues_path(@project, :format => 'csv'), :method => :get, :id => 'csv-export-form') do %>
+ <%= query_as_hidden_field_tags(@query) %>
+ <%= hidden_field_tag 'sort', params[:sort], :id => nil %>
<p>
<label><%= radio_button_tag 'csv[columns]', '', true %> <%= l(:description_selected_columns) %></label><br />
<label><%= radio_button_tag 'csv[columns]', 'all' %> <%= l(:description_all_columns) %></label>
diff --git a/app/views/layouts/base.html.erb b/app/views/layouts/base.html.erb
index 1d83ca1..4888358 100644
--- a/app/views/layouts/base.html.erb
+++ b/app/views/layouts/base.html.erb
@@ -113,7 +113,7 @@
<div id="footer">
<div class="bgl"><div class="bgr">
- Powered by <%= link_to Redmine::Info.app_name, Redmine::Info.url %> © 2006-2015 Jean-Philippe Lang
+ Powered by <%= link_to Redmine::Info.app_name, Redmine::Info.url %> © 2006-2016 Jean-Philippe Lang
</div></div>
</div>
</div>
diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb
index 46003e6..4b95b01 100644
--- a/app/views/layouts/mailer.html.erb
+++ b/app/views/layouts/mailer.html.erb
@@ -3,13 +3,14 @@
<style>
body {
font-family: Verdana, sans-serif;
- font-size: 0.8em;
- color:#484848;
+ font-size: 14px;
+ line-height: 1.4em;
+ color: #222;
}
h1, h2, h3 { font-family: "Trebuchet MS", Verdana, sans-serif; margin: 0px; }
-h1 { font-size: 1.2em; }
+h1 { font-size: 1.3em; line-height: 1.4em;}
h2, h3 { font-size: 1.1em; }
-a, a:link, a:visited { color: #2A5685;}
+a, a:link, a:visited { color: #169;}
a:hover, a:active { color: #c61a1a; }
a.wiki-anchor { display: none; }
fieldset.attachments {border-width: 1px 0 0 0;}
@@ -18,6 +19,7 @@ hr {
height: 1px;
background: #ccc;
border: 0;
+ margin: 1.2em 0;
}
span.footer {
font-size: 0.8em;
diff --git a/app/views/settings/_authentication.html.erb b/app/views/settings/_authentication.html.erb
index f9c569c..35aa664 100644
--- a/app/views/settings/_authentication.html.erb
+++ b/app/views/settings/_authentication.html.erb
@@ -36,5 +36,13 @@
<p><em class="info"><%= l(:text_session_expiration_settings) %></em></p>
</fieldset>
+<fieldset class="box">
+ <legend><%= l(:label_default_values_for_new_users) %></legend>
+
+ <div class="tabular settings">
+ <p><%= setting_check_box :default_users_hide_mail, :label => :field_hide_mail %></p>
+ </div>
+</fieldset>
+
<%= submit_tag l(:button_save) %>
<% end %>
diff --git a/app/views/users/_general.html.erb b/app/views/users/_general.html.erb
index 0daa421..7d84c0c 100644
--- a/app/views/users/_general.html.erb
+++ b/app/views/users/_general.html.erb
@@ -1,6 +1,6 @@
<%= labelled_form_for @user do |f| %>
<%= render :partial => 'form', :locals => { :f => f } %>
- <% if @user.active? && email_delivery_enabled? -%>
+ <% if @user.active? && email_delivery_enabled? && @user != User.current -%>
<p><label><%= check_box_tag 'send_information', 1, true %> <%= l(:label_send_information) %></label></p>
<% end -%>
<p><%= submit_tag l(:button_save) %></p>
diff --git a/app/views/wiki/_sidebar.html.erb b/app/views/wiki/_sidebar.html.erb
index 7208376..a8e4110 100644
--- a/app/views/wiki/_sidebar.html.erb
+++ b/app/views/wiki/_sidebar.html.erb
@@ -1,5 +1,7 @@
<% if @wiki && @wiki.sidebar -%>
- <%= textilizable @wiki.sidebar.content, :text %>
+ <div class="wiki">
+ <%= textilizable @wiki.sidebar.content, :text %>
+ </div>
<% end -%>
<h3><%= l(:label_wiki) %></h3>
diff --git a/config/configuration.yml.example b/config/configuration.yml.example
index db22fb0..3522ef6 100644
--- a/config/configuration.yml.example
+++ b/config/configuration.yml.example
@@ -182,10 +182,10 @@ default:
# the ImageMagick's `convert` binary. Used to generate attachment thumbnails.
#imagemagick_convert_command:
- # Configuration of RMagcik font.
+ # Configuration of RMagick font.
#
- # Redmine uses RMagcik in order to export gantt png.
- # You don't need this setting if you don't install RMagcik.
+ # Redmine uses RMagick in order to export gantt png.
+ # You don't need this setting if you don't install RMagick.
#
# In CJK (Chinese, Japanese and Korean),
# in order to show CJK characters correctly,
diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb
index 370315d..890eede 100644
--- a/config/initializers/backtrace_silencers.rb
+++ b/config/initializers/backtrace_silencers.rb
@@ -5,3 +5,7 @@
# You can also remove all the silencers if you're trying do debug a problem that might steem from framework code.
# Rails.backtrace_cleaner.remove_silencers!
+
+# Do not remove plugins backtrace
+Rails.backtrace_cleaner.remove_silencers!
+Rails.backtrace_cleaner.add_silencer { |line| line !~ /^\/?(app|config|lib|plugins|test)/ }
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 894e299..8cd0a88 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -1181,3 +1181,4 @@ ar:
setting_attachment_extensions_denied: Disallowed extensions
label_any_open_issues: any open issues
label_no_open_issues: no open issues
+ label_default_values_for_new_users: Default values for new users
diff --git a/config/locales/az.yml b/config/locales/az.yml
index e500bd5..9c41d4a 100644
--- a/config/locales/az.yml
+++ b/config/locales/az.yml
@@ -1276,3 +1276,4 @@ az:
setting_attachment_extensions_denied: Disallowed extensions
label_any_open_issues: any open issues
label_no_open_issues: no open issues
+ label_default_values_for_new_users: Default values for new users
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 591e338..a61315c 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -978,6 +978,7 @@ bg:
label_create_missing_values: Създаване на липсващи стойности
label_api: API
label_field_format_enumeration: Списък ключ/стойност
+ label_default_values_for_new_users: Стойности по подразбиране за нови потребители
button_login: Вход
button_submit: Изпращане
diff --git a/config/locales/bs.yml b/config/locales/bs.yml
index 9a50ef9..ca4bd07 100644
--- a/config/locales/bs.yml
+++ b/config/locales/bs.yml
@@ -1194,3 +1194,4 @@ bs:
setting_attachment_extensions_denied: Disallowed extensions
label_any_open_issues: any open issues
label_no_open_issues: no open issues
+ label_default_values_for_new_users: Default values for new users
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 24370a8..d6674a5 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -1183,3 +1183,4 @@ ca:
setting_attachment_extensions_denied: Disallowed extensions
label_any_open_issues: any open issues
label_no_open_issues: no open issues
+ label_default_values_for_new_users: Default values for new users
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index db55f21..a888e89 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -1182,3 +1182,4 @@ cs:
setting_attachment_extensions_denied: Disallowed extensions
label_any_open_issues: any open issues
label_no_open_issues: no open issues
+ label_default_values_for_new_users: Default values for new users
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 11670ea..e4543d0 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -1198,3 +1198,4 @@ da:
setting_attachment_extensions_denied: Disallowed extensions
label_any_open_issues: any open issues
label_no_open_issues: no open issues
+ label_default_values_for_new_users: Default values for new users
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 0885f5b..4ad2f3b 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -1145,48 +1145,47 @@ de:
setting_search_results_per_page: Suchergebnisse pro Seite
label_blank_value: leer
permission_copy_issues: Tickets kopieren
- error_password_expired: Your password has expired or the administrator requires you
- to change it.
- field_time_entries_visibility: Time logs visibility
- label_parent_task_attributes: Parent tasks attributes
- label_parent_task_attributes_derived: Calculated from subtasks
- label_parent_task_attributes_independent: Independent of subtasks
- label_time_entries_visibility_all: All time entries
- label_time_entries_visibility_own: Time entries created by the user
- label_member_management: Member management
- label_member_management_all_roles: All roles
- label_member_management_selected_roles_only: Only these roles
+ error_password_expired: Ihr Passwort ist abgelaufen oder der Administrator verlangt eine Passwortänderung.
+ field_time_entries_visibility: Zeiten-Sichtbarkeit
+ label_parent_task_attributes: Eigenschaften übergeordneter Aufgaben
+ label_parent_task_attributes_derived: Abgeleitet von Unteraufgaben
+ label_parent_task_attributes_independent: Unabhängig von Unteraufgaben
+ label_time_entries_visibility_all: Alle Zeitaufwände
+ label_time_entries_visibility_own: Nur eigene Aufwände
+ label_member_management: Mitglieder verwalten
+ label_member_management_all_roles: Alle Rollen
+ label_member_management_selected_roles_only: Nur diese Rollen
label_total_spent_time: Aufgewendete Zeit aller Projekte anzeigen
- notice_import_finished: All %{count} items have been imported.
- notice_import_finished_with_errors: ! '%{count} out of %{total} items could not be
- imported.'
- error_invalid_file_encoding: The file is not a valid %{encoding} encoded file
- error_invalid_csv_file_or_settings: The file is not a CSV file or does not match the
- settings below
- error_can_not_read_import_file: An error occurred while reading the file to import
- permission_import_issues: Import issues
- label_import_issues: Import issues
- label_select_file_to_import: Select the file to import
- label_fields_separator: Field separator
- label_fields_wrapper: Field wrapper
- label_encoding: Encoding
- label_comma_char: Comma
- label_semi_colon_char: Semi colon
- label_quote_char: Quote
- label_double_quote_char: Double quote
- label_fields_mapping: Fields mapping
- label_file_content_preview: File content preview
- label_create_missing_values: Create missing values
- button_import: Import
- field_total_estimated_hours: Total estimated time
+ notice_import_finished: Alle %{count} Einträge wurden importiert.
+ notice_import_finished_with_errors: ! '%{count} von %{total} Einträgen konnten nicht
+ importiert werden.'
+ error_invalid_file_encoding: Die Datei ist keine gültige %{encoding} kodierte Datei
+ error_invalid_csv_file_or_settings: Die Dartei ist keine CSV-Datei oder entspricht nicht den Einstellungen unten
+ error_can_not_read_import_file: Beim Einlesen der Datei ist ein Fehler aufgetreten
+ permission_import_issues: Tickets importieren
+ label_import_issues: Tickets importieren
+ label_select_file_to_import: Bitte wählen Sie eine Datei für den Import aus
+ label_fields_separator: Trennzeichen
+ label_fields_wrapper: Textqualifizierer
+ label_encoding: Kodierung
+ label_comma_char: Komma
+ label_semi_colon_char: Semikolon
+ label_quote_char: Anführungszeichen
+ label_double_quote_char: Doppelte Anführungszeichen
+ label_fields_mapping: Zuordnung der Felder
+ label_file_content_preview: Inhaltsvorschau
+ label_create_missing_values: Ergänze fehlende Werte
+ button_import: Importieren
+ field_total_estimated_hours: Summe des geschätzten Aufwands
label_api: API
- label_total_plural: Totals
- label_assigned_issues: Assigned issues
- label_field_format_enumeration: Key/value list
+ label_total_plural: Summe
+ label_assigned_issues: Zugewiesene Tickets
+ label_field_format_enumeration: Eigenschaft/Wert-Paare
label_f_hour_short: '%{value} h'
- field_default_version: Default version
- error_attachment_extension_not_allowed: Attachment extension %{extension} is not allowed
- setting_attachment_extensions_allowed: Allowed extensions
- setting_attachment_extensions_denied: Disallowed extensions
- label_any_open_issues: any open issues
- label_no_open_issues: no open issues
+ field_default_version: Standard-Version
+ error_attachment_extension_not_allowed: Attachment Erweiterung %{extension} ist nicht zugelassen
+ setting_attachment_extensions_allowed: Zugelassene Erweiterungen
+ setting_attachment_extensions_denied: Nicht zugelassene Erweiterungen
+ label_any_open_issues: irgendein offenes Ticket
+ label_no_open_issues: kein offenes Ticket
+ label_default_values_for_new_users: Standardwerte für neue Benutzer
diff --git a/config/locales/el.yml b/config/locales/el.yml
index af9d8cf..d202273 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -1181,3 +1181,4 @@ el:
setting_attachment_extensions_denied: Disallowed extensions
label_any_open_issues: any open issues
label_no_open_issues: no open issues
+ label_default_values_for_new_users: Default values for new users
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 0756d93..2d1e86a 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -1183,3 +1183,4 @@ en-GB:
error_attachment_extension_not_allowed: Attachment extension %{extension} is not allowed
setting_attachment_extensions_allowed: Allowed extensions
setting_attachment_extensions_denied: Disallowed extensions
+ label_default_values_for_new_users: Default values for new users
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 24d5fe7..7d98034 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -975,6 +975,7 @@ en:
label_create_missing_values: Create missing values
label_api: API
label_field_format_enumeration: Key/value list
+ label_default_values_for_new_users: Default values for new users
button_login: Login
button_submit: Submit
diff --git a/config/locales/es-PA.yml b/config/locales/es-PA.yml
index bf3cbed..926d4f8 100644
--- a/config/locales/es-PA.yml
+++ b/config/locales/es-PA.yml
@@ -1195,7 +1195,7 @@ es-PA:
label_fields_separator: Separador de Campos
label_fields_wrapper: Envoltorio de Campo
label_encoding: Codificación
- label_comma_char: Comma
+ label_comma_char: Coma
label_semi_colon_char: Punto y Coma
label_quote_char: Comilla Simple
label_double_quote_char: Comilla Doble
@@ -1205,13 +1205,14 @@ es-PA:
button_import: Importar
field_total_estimated_hours: Total de Tiempo Estimado
label_api: API
- label_total_plural: Totals
- label_assigned_issues: Assigned issues
- label_field_format_enumeration: Key/value list
+ label_total_plural: Totales
+ label_assigned_issues: Incidencias Asignadas
+ label_field_format_enumeration: Lista Llave/valor
label_f_hour_short: '%{value} h'
- field_default_version: Default version
- error_attachment_extension_not_allowed: Attachment extension %{extension} is not allowed
- setting_attachment_extensions_allowed: Allowed extensions
- setting_attachment_extensions_denied: Disallowed extensions
- label_any_open_issues: any open issues
- label_no_open_issues: no open issues
+ field_default_version: Version Predeterminada
+ error_attachment_extension_not_allowed: Extensión adjuntada %{extension} no es permitida
+ setting_attachment_extensions_allowed: Extensiones Permitidas
+ setting_attachment_extensions_denied: Extensiones Prohibidas
+ label_any_open_issues: cualquier incidencias abierta
+ label_no_open_issues: incidencias cerradas
+ label_default_values_for_new_users: Valor predeterminado para nuevos usuarios
diff --git a/config/locales/es.yml b/config/locales/es.yml
index fa9670a..b62e066 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -1187,13 +1187,13 @@ es:
error_invalid_csv_file_or_settings: El archivo no es un archivo CSV o no coincide con la
configuración
error_can_not_read_import_file: Ocurrió un error mientras se leía el archivo a importar
- permission_import_issues: Importar incidencias
- label_import_issues: Importar incidencias
+ permission_import_issues: Importar Peticiones
+ label_import_issues: Importar petición
label_select_file_to_import: Selecciona el archivo a importar
label_fields_separator: Separador de Campos
label_fields_wrapper: Envoltorio de Campo
label_encoding: Codificación
- label_comma_char: Comma
+ label_comma_char: Coma
label_semi_colon_char: Punto y Coma
label_quote_char: Comilla Simple
label_double_quote_char: Comilla Doble
@@ -1203,13 +1203,14 @@ es:
button_import: Importar
field_total_estimated_hours: Total de Tiempo Estimado
label_api: API
- label_total_plural: Totals
- label_assigned_issues: Assigned issues
- label_field_format_enumeration: Key/value list
+ label_total_plural: Totales
+ label_assigned_issues: Peticiones Asignadas
+ label_field_format_enumeration: Lista Llave/valor
label_f_hour_short: '%{value} h'
- field_default_version: Default version
- error_attachment_extension_not_allowed: Attachment extension %{extension} is not allowed
- setting_attachment_extensions_allowed: Allowed extensions
- setting_attachment_extensions_denied: Disallowed extensions
- label_any_open_issues: any open issues
- label_no_open_issues: no open issues
+ field_default_version: Version Predeterminada
+ error_attachment_extension_not_allowed: Extensión adjuntada %{extension} no es permitida
+ setting_attachment_extensions_allowed: Extensiones Permitidas
+ setting_attachment_extensions_denied: Extensiones Prohibidas
+ label_any_open_issues: cualquier peticiones abierta
+ label_no_open_issues: peticiones cerradas
+ label_default_values_for_new_users: Valor predeterminado para nuevos usuarios
diff --git a/config/locales/et.yml b/config/locales/et.yml
index 8a8852b..87a94c5 100644
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -1194,3 +1194,4 @@ et:
setting_attachment_extensions_denied: Disallowed extensions
label_any_open_issues: any open issues
label_no_open_issues: no open issues
+ label_default_values_for_new_users: Default values for new users
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 42a8f99..20e7222 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -1182,3 +1182,4 @@ eu:
setting_attachment_extensions_denied: Disallowed extensions
label_any_open_issues: any open issues
label_no_open_issues: no open issues
+ label_default_values_for_new_users: Default values for new users
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 7b5f065..3ffc474 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -1182,3 +1182,4 @@ fa:
setting_attachment_extensions_denied: Disallowed extensions
label_any_open_issues: any open issues
label_no_open_issues: no open issues
+ label_default_values_for_new_users: Default values for new users
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 201aaac..5021546 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -1202,3 +1202,4 @@ fi:
setting_attachment_extensions_denied: Disallowed extensions
label_any_open_issues: any open issues
label_no_open_issues: no open issues
+ label_default_values_for_new_users: Default values for new users
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 4ec1d33..43873ca 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -993,6 +993,7 @@ fr:
label_create_missing_values: Créer les valeurs manquantes
label_api: API
label_field_format_enumeration: Liste clé/valeur
+ label_default_values_for_new_users: Valeurs par défaut pour les nouveaux utilisateurs
button_login: Connexion
button_submit: Soumettre
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 5d83e7c..381c2c9 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -1189,3 +1189,4 @@ gl:
setting_attachment_extensions_denied: Disallowed extensions
label_any_open_issues: any open issues
label_no_open_issues: no open issues
+ label_default_values_for_new_users: Default values for new users
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 3485c0a..cf5a1dd 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -1186,3 +1186,4 @@ he:
setting_attachment_extensions_denied: Disallowed extensions
label_any_open_issues: any open issues
label_no_open_issues: no open issues
+ label_default_values_for_new_users: Default values for new users
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index 8931e8a..079ddfd 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -1180,3 +1180,4 @@ hr:
setting_attachment_extensions_denied: Disallowed extensions
label_any_open_issues: any open issues
label_no_open_issues: no open issues
+ label_default_values_for_new_users: Default values for new users
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index ebed6d8..026d89f 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -1200,3 +1200,4 @@
setting_attachment_extensions_denied: Disallowed extensions
label_any_open_issues: any open issues
label_no_open_issues: no open issues
+ label_default_values_for_new_users: Default values for new users
diff --git a/config/locales/id.yml b/config/locales/id.yml
index 573a3b9..01a9304 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -1185,3 +1185,4 @@ id:
setting_attachment_extensions_denied: Disallowed extensions
label_any_open_issues: any open issues
label_no_open_issues: no open issues
+ label_default_values_for_new_users: Default values for new users
diff --git a/config/locales/it.yml b/config/locales/it.yml
index e0b377c..0f9da36 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -1176,3 +1176,4 @@ it:
setting_attachment_extensions_denied: Disallowed extensions
label_any_open_issues: any open issues
label_no_open_issues: no open issues
+ label_default_values_for_new_users: Default values for new users
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 2309a6e..7fe0d40 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -1194,3 +1194,4 @@ ja:
setting_attachment_extensions_denied: 禁止する拡張子
label_any_open_issues: 未完了のチケット
label_no_open_issues: なし または完了したチケット
+ label_default_values_for_new_users: 新しいユーザーのデフォルト設定
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index d2dda59..0097370 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -1225,3 +1225,4 @@ ko:
setting_attachment_extensions_denied: Disallowed extensions
label_any_open_issues: any open issues
label_no_open_issues: no open issues
+ label_default_values_for_new_users: Default values for new users
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 705f152..6498353 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -1240,3 +1240,4 @@ lt:
setting_attachment_extensions_denied: Disallowed extensions
label_any_open_issues: any open issues
label_no_open_issues: no open issues
+ label_default_values_for_new_users: Default values for new users
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index 373325b..bcee88d 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -1175,3 +1175,4 @@ lv:
setting_attachment_extensions_denied: Disallowed extensions
label_any_open_issues: any open issues
label_no_open_issues: no open issues
+ label_default_values_for_new_users: Default values for new users
diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index 0121473..6c7a2af 100644
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -1181,3 +1181,4 @@ mk:
setting_attachment_extensions_denied: Disallowed extensions
label_any_open_issues: any open issues
label_no_open_issues: no open issues
+ label_default_values_for_new_users: Default values for new users
diff --git a/config/locales/mn.yml b/config/locales/mn.yml
index e365a5b..c5a74e0 100644
--- a/config/locales/mn.yml
+++ b/config/locales/mn.yml
@@ -1182,3 +1182,4 @@ mn:
setting_attachment_extensions_denied: Disallowed extensions
label_any_open_issues: any open issues
label_no_open_issues: no open issues
+ label_default_values_for_new_users: Default values for new users
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index c4a588c..9a2a175 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -1160,3 +1160,4 @@ nl:
setting_attachment_extensions_denied: Disallowed extensions
label_any_open_issues: any open issues
label_no_open_issues: no open issues
+ label_default_values_for_new_users: Default values for new users
diff --git a/config/locales/no.yml b/config/locales/no.yml
index 2ebf552..35f2b8e 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -1171,3 +1171,4 @@
setting_attachment_extensions_denied: Disallowed extensions
label_any_open_issues: any open issues
label_no_open_issues: no open issues
+ label_default_values_for_new_users: Default values for new users
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 442e7f7..50cd2f3 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -1196,3 +1196,4 @@ pl:
setting_attachment_extensions_denied: Disallowed extensions
label_any_open_issues: any open issues
label_no_open_issues: no open issues
+ label_default_values_for_new_users: Default values for new users
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 1ad3648..8802ba3 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -1200,3 +1200,4 @@ pt-BR:
setting_attachment_extensions_denied: Disallowed extensions
label_any_open_issues: any open issues
label_no_open_issues: no open issues
+ label_default_values_for_new_users: Default values for new users
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index 1dcaba5..da696f2 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -1183,3 +1183,4 @@ pt:
setting_attachment_extensions_denied: Disallowed extensions
label_any_open_issues: any open issues
label_no_open_issues: no open issues
+ label_default_values_for_new_users: Default values for new users
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index b4bd794..2e89625 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -1176,3 +1176,4 @@ ro:
setting_attachment_extensions_denied: Disallowed extensions
label_any_open_issues: any open issues
label_no_open_issues: no open issues
+ label_default_values_for_new_users: Default values for new users
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 7a62d0e..952fc8e 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -1251,36 +1251,35 @@ ru:
label_member_management_selected_roles_only: Только эти роли
label_password_required: Для продолжения введите свой пароль
label_total_spent_time: Всего затрачено времени
- notice_import_finished: All %{count} items have been imported.
- notice_import_finished_with_errors: ! '%{count} out of %{total} items could not be
- imported.'
- error_invalid_file_encoding: The file is not a valid %{encoding} encoded file
- error_invalid_csv_file_or_settings: The file is not a CSV file or does not match the
- settings below
- error_can_not_read_import_file: An error occurred while reading the file to import
- permission_import_issues: Import issues
- label_import_issues: Import issues
- label_select_file_to_import: Select the file to import
- label_fields_separator: Field separator
- label_fields_wrapper: Field wrapper
- label_encoding: Encoding
- label_comma_char: Comma
- label_semi_colon_char: Semi colon
- label_quote_char: Quote
- label_double_quote_char: Double quote
- label_fields_mapping: Fields mapping
- label_file_content_preview: File content preview
- label_create_missing_values: Create missing values
- button_import: Import
- field_total_estimated_hours: Total estimated time
+ notice_import_finished: Все %{count} элемент(а, ов) были импортированы.
+ notice_import_finished_with_errors: ! '%{count} из %{total} элемент(а, ов) не могут быть импортированы.'
+ error_invalid_file_encoding: Кодировка файла не соответствует выбранной %{encoding}
+ error_invalid_csv_file_or_settings: Файл не является файлом CSV или не соответствует представленным настройкам
+ error_can_not_read_import_file: Во время чтения файла для импорта произошла ошибка
+ permission_import_issues: Импорт задач
+ label_import_issues: Импорт задач
+ label_select_file_to_import: Выберите файл для импорта
+ label_fields_separator: Разделитель
+ label_fields_wrapper: Ограничитель
+ label_encoding: Кодировка
+ label_comma_char: Запятая
+ label_semi_colon_char: Точка с запятой
+ label_quote_char: Кавычки
+ label_double_quote_char: Двойные кавычки
+ label_fields_mapping: Соответствие полей
+ label_file_content_preview: Предпросмотр содержимого файла
+ label_create_missing_values: Создать недостающие значения
+ button_import: Импорт
+ field_total_estimated_hours: Всего осталось времени
label_api: API
- label_total_plural: Totals
- label_assigned_issues: Assigned issues
- label_field_format_enumeration: Key/value list
- label_f_hour_short: '%{value} h'
- field_default_version: Default version
- error_attachment_extension_not_allowed: Attachment extension %{extension} is not allowed
- setting_attachment_extensions_allowed: Allowed extensions
- setting_attachment_extensions_denied: Disallowed extensions
- label_any_open_issues: any open issues
- label_no_open_issues: no open issues
+ label_total_plural: Итоги
+ label_assigned_issues: Назначенные задачи
+ label_field_format_enumeration: Список ключ/значение
+ label_f_hour_short: '%{value} ч'
+ field_default_version: Версия по умолчанию
+ error_attachment_extension_not_allowed: Расширение %{extension} запрещено
+ setting_attachment_extensions_allowed: Допустимые расширения
+ setting_attachment_extensions_denied: Запрещённые расширения
+ label_any_open_issues: любые открытые задачи
+ label_no_open_issues: нет открытых задач
+ label_default_values_for_new_users: Default values for new users
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 9bf3dbf..0508f1f 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -1171,3 +1171,4 @@ sk:
setting_attachment_extensions_denied: Disallowed extensions
label_any_open_issues: any open issues
label_no_open_issues: no open issues
+ label_default_values_for_new_users: Default values for new users
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index b8a4303..5674222 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -1181,3 +1181,4 @@ sl:
setting_attachment_extensions_denied: Disallowed extensions
label_any_open_issues: any open issues
label_no_open_issues: no open issues
+ label_default_values_for_new_users: Default values for new users
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index 0520ac0..fd2fdd3 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -1177,3 +1177,4 @@ sq:
setting_attachment_extensions_denied: Disallowed extensions
label_any_open_issues: any open issues
label_no_open_issues: no open issues
+ label_default_values_for_new_users: Default values for new users
diff --git a/config/locales/sr-YU.yml b/config/locales/sr-YU.yml
index e8091ca..3b30b09 100644
--- a/config/locales/sr-YU.yml
+++ b/config/locales/sr-YU.yml
@@ -1183,3 +1183,4 @@ sr-YU:
setting_attachment_extensions_denied: Disallowed extensions
label_any_open_issues: any open issues
label_no_open_issues: no open issues
+ label_default_values_for_new_users: Default values for new users
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 6b1f077..89e5cfa 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -1182,3 +1182,4 @@ sr:
setting_attachment_extensions_denied: Disallowed extensions
label_any_open_issues: any open issues
label_no_open_issues: no open issues
+ label_default_values_for_new_users: Default values for new users
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index e214a8d..73be757 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -1214,3 +1214,4 @@ sv:
setting_attachment_extensions_denied: Disallowed extensions
label_any_open_issues: any open issues
label_no_open_issues: no open issues
+ label_default_values_for_new_users: Default values for new users
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 4f2d00a..122fcd4 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -1178,3 +1178,4 @@ th:
setting_attachment_extensions_denied: Disallowed extensions
label_any_open_issues: any open issues
label_no_open_issues: no open issues
+ label_default_values_for_new_users: Default values for new users
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 5a405a2..0f700fd 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -1157,36 +1157,35 @@ tr:
label_member_management_selected_roles_only: Sadece bu roller
label_password_required: Devam etmek için şifrenizi doğrulayın
label_total_spent_time: Toplam harcanan zaman
- notice_import_finished: All %{count} items have been imported.
- notice_import_finished_with_errors: ! '%{count} out of %{total} items could not be
- imported.'
- error_invalid_file_encoding: The file is not a valid %{encoding} encoded file
- error_invalid_csv_file_or_settings: The file is not a CSV file or does not match the
- settings below
- error_can_not_read_import_file: An error occurred while reading the file to import
- permission_import_issues: Import issues
- label_import_issues: Import issues
- label_select_file_to_import: Select the file to import
- label_fields_separator: Field separator
- label_fields_wrapper: Field wrapper
- label_encoding: Encoding
- label_comma_char: Comma
- label_semi_colon_char: Semi colon
- label_quote_char: Quote
- label_double_quote_char: Double quote
- label_fields_mapping: Fields mapping
- label_file_content_preview: File content preview
- label_create_missing_values: Create missing values
- button_import: Import
- field_total_estimated_hours: Total estimated time
+ notice_import_finished: "%{count} kayıt içeri aktarıldı."
+ notice_import_finished_with_errors: ! '%{total} kayıttan %{count} tanesi aktarılamadı.'
+ error_invalid_file_encoding: Dosyanın karakter kodlaması geçerli bir %{encoding} kodlaması değil.
+ error_invalid_csv_file_or_settings: Dosya CSV dosyası değil veya aşağıdaki ayarlara uymuyor
+ error_can_not_read_import_file: İçeri aktarılacak dosyayı okurken bir hata oluştu
+ permission_import_issues: İşleri içeri aktarma
+ label_import_issues: İşleri içeri aktar
+ label_select_file_to_import: İçeri aktarılacak dosyayı seçiniz
+ label_fields_separator: Alan ayracı
+ label_fields_wrapper: Alan kılıfı
+ label_encoding: Karakter kodlaması
+ label_comma_char: Virgül
+ label_semi_colon_char: Noktalı virgül
+ label_quote_char: Tek tırnak işareti
+ label_double_quote_char: Çift tırnak işareti
+ label_fields_mapping: Alan eşleştirme
+ label_file_content_preview: Dosya içeriği önizlemesi
+ label_create_missing_values: Eşleşlmeyen alanları oluştur
+ button_import: İçeri aktar
+ field_total_estimated_hours: Toplam tahmini zaman
label_api: API
- label_total_plural: Totals
- label_assigned_issues: Assigned issues
- label_field_format_enumeration: Key/value list
- label_f_hour_short: '%{value} h'
- field_default_version: Default version
- error_attachment_extension_not_allowed: Attachment extension %{extension} is not allowed
- setting_attachment_extensions_allowed: Allowed extensions
- setting_attachment_extensions_denied: Disallowed extensions
- label_any_open_issues: any open issues
- label_no_open_issues: no open issues
+ label_total_plural: Toplamlar
+ label_assigned_issues: Atanan işler
+ label_field_format_enumeration: Anahtar/Değer listesi
+ label_f_hour_short: '%{value} s'
+ field_default_version: Ön tanımlı versiyon
+ error_attachment_extension_not_allowed: Dosya uzantısına izin verilmiyor; %{extension}
+ setting_attachment_extensions_allowed: İzin verilen dosya uzantıları
+ setting_attachment_extensions_denied: Yasaklı dosya uzantıları
+ label_any_open_issues: herhangi bir açık iş
+ label_no_open_issues: hiçbir açık iş
+ label_default_values_for_new_users: Default values for new users
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index d7f716b..077bfba 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -1176,3 +1176,4 @@ uk:
setting_attachment_extensions_denied: Disallowed extensions
label_any_open_issues: any open issues
label_no_open_issues: no open issues
+ label_default_values_for_new_users: Default values for new users
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 82b46ff..632e446 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -1234,3 +1234,4 @@ vi:
setting_attachment_extensions_denied: Disallowed extensions
label_any_open_issues: any open issues
label_no_open_issues: no open issues
+ label_default_values_for_new_users: Default values for new users
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index a319470..8d83868 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -1060,6 +1060,7 @@
label_create_missing_values: 建立缺少的數值
label_api: API
label_field_format_enumeration: 鍵/值 清單
+ label_default_values_for_new_users: 新用戶使用之預設值
button_login: 登入
button_submit: 送出
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 039b46b..ab1d87f 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -957,7 +957,7 @@ zh:
text_scm_path_encoding_note: "默认: UTF-8"
field_path_to_repository: 库路径
field_root_directory: 根目录
- field_cvs_module: 模块
+ field_cvs_module: CVS 模块
field_cvsroot: CVSROOT
text_mercurial_repository_note: 本地库 (e.g. /hgrepo, c:\hgrepo)
text_scm_command: 命令
@@ -1145,36 +1145,35 @@ zh:
label_member_management_selected_roles_only: 只限下列角色
label_password_required: 确认您的密码后继续
label_total_spent_time: 总体耗时
- notice_import_finished: All %{count} items have been imported.
- notice_import_finished_with_errors: ! '%{count} out of %{total} items could not be
- imported.'
- error_invalid_file_encoding: The file is not a valid %{encoding} encoded file
- error_invalid_csv_file_or_settings: The file is not a CSV file or does not match the
- settings below
- error_can_not_read_import_file: An error occurred while reading the file to import
- permission_import_issues: Import issues
- label_import_issues: Import issues
- label_select_file_to_import: Select the file to import
- label_fields_separator: Field separator
- label_fields_wrapper: Field wrapper
- label_encoding: Encoding
- label_comma_char: Comma
- label_semi_colon_char: Semi colon
- label_quote_char: Quote
- label_double_quote_char: Double quote
- label_fields_mapping: Fields mapping
- label_file_content_preview: File content preview
- label_create_missing_values: Create missing values
- button_import: Import
+ notice_import_finished: 成功导入 %{count} 个项目.
+ notice_import_finished_with_errors: 有 %{count} 个项目无法导入(共计 %{total} 个)
+ error_invalid_file_encoding: 这不是一个有效的 %{encoding} 编码文件
+ error_invalid_csv_file_or_settings: 这不是一个CSV文件或者不符合以下设置
+ error_can_not_read_import_file: 读取导入文件时发生错误
+ permission_import_issues: 问题导入
+ label_import_issues: 问题导入
+ label_select_file_to_import: 选择要导入的文件
+ label_fields_separator: 字段分隔符
+ label_fields_wrapper: 字段包装识别符
+ label_encoding: 编码
+ label_comma_char: 逗号(,)
+ label_semi_colon_char: 分号(;)
+ label_quote_char: 单引号(')
+ label_double_quote_char: 双引号(")
+ label_fields_mapping: 字段映射
+ label_file_content_preview: 文件内容预览
+ label_create_missing_values: 创建缺失的数值
+ button_import: 导入
field_total_estimated_hours: 预估工时统计
label_api: API
- label_total_plural: Totals
- label_assigned_issues: Assigned issues
- label_field_format_enumeration: Key/value list
- label_f_hour_short: '%{value} h'
- field_default_version: Default version
- error_attachment_extension_not_allowed: Attachment extension %{extension} is not allowed
- setting_attachment_extensions_allowed: Allowed extensions
- setting_attachment_extensions_denied: Disallowed extensions
- label_any_open_issues: any open issues
- label_no_open_issues: no open issues
+ label_total_plural: 总计
+ label_assigned_issues: 被指派的问题
+ label_field_format_enumeration: 键/值 清单
+ label_f_hour_short: '%{value} 小时'
+ field_default_version: 默认版本
+ error_attachment_extension_not_allowed: 不允许上传此类型 %{extension} 附件
+ setting_attachment_extensions_allowed: 允许上传的附件类型
+ setting_attachment_extensions_denied: 禁止上传的附件类型
+ label_any_open_issues: 任意进行中的问题
+ label_no_open_issues: 任意已关闭的问题
+ label_default_values_for_new_users: 新用户默认值
diff --git a/config/routes.rb b/config/routes.rb
index 4745145..9652496 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/config/settings.yml b/config/settings.yml
index 7180dac..3aa979d 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -217,6 +217,8 @@ sequential_project_identifiers:
default: 0
# encodings used to convert repository files content to UTF-8
# multiple values accepted, comma separated
+default_users_hide_mail:
+ default: 1
repositories_encodings:
default: ''
# encoding used to convert commit logs to UTF-8
diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 92e3f08..d615855 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -1,9 +1,63 @@
== Redmine changelog
Redmine - project management software
-Copyright (C) 2006-2015 Jean-Philippe Lang
+Copyright (C) 2006-2016 Jean-Philippe Lang
http://www.redmine.org/
+== 2016-03-13 v3.2.1
+
+* Defect #21588: Simplified Chinese "field_cvs_module" translation has problem (Patch #21430)
+* Defect #21656: Fix Non ASCII attachment filename encoding broken (MOJIBAKE) in Microsoft Edge Explorer
+* Defect #22072: Private notes get copied without private flag to Duplicate issues
+* Defect #22127: Issues can be assigned to any user
+* Defect #21219: Date pickers images for start/due date fields are not shown for issues with subtasks
+* Defect #21477: Assign to "Anonymous" doesn't make much sense
+* Defect #21488: Don't use past start date as default due date in the date picker
+* Defect #21504: IssuePriority.position_name not recalculated every time it should
+* Defect #21551: Private note flag disappears in issue update conflict
+* Defect #21843: Nokogiri security issue
+* Defect #21900: Moving a page with a child raises an error if target wiki contains a page with the same name as the child
+* Defect #20988: % done field shown on issue show subtree even if deactivated for that tracker
+* Defect #21263: Wiki lists in the sidebar are broken
+* Defect #21453: LDAP account creation fails when first name/last name contain non ASCII
+* Defect #21531: rdm-mailhandler with project-from-subaddress fails
+* Defect #21534: Backtrace cleaner should not clean plugin paths
+* Defect #21535: Moving a custom field value in the order switches in the edit view
+* Defect #21775: Field "Done" from issue subtasks table overlaps the layout in responsive mode, width 400
+* Defect #22108: Issues filter for CSV Export are not applied
+* Defect #22178: Grouping issues by key/value custom field raises error 500
+* Feature #21447: Option to show email adresses by default
+* Patch #21650: Simplified Chinese translation of wiki formating for 2.6-stable
+* Patch #21881: Russian wiki translation for 2.6-stable
+* Patch #21898: Catalan wiki translation for 2.6-stable
+* Patch #21456: Simplified Chinese translation of wiki formating for 3.1-stable
+* Patch #21686: Russian translation for 3.1-stable
+* Patch #21687: German translations for 3.1-stable
+* Patch #21689: Turkish translation for 3.1-stable
+* Patch #21882: Russian wiki translation for 3.1-stable
+* Patch #21899: Catalan wiki translation for 3.1-stable
+* Patch #22131: German translations for 3.1-stable
+* Patch #22139: Japanese wiki syntax (Markdown) translation for 3.1-stable
+* Patch #21436: Prevent admins from sending themselves their own password
+* Patch #21454: Simplified Chinese translation for 3.2.0
+* Patch #21487: Larger font for email notifications
+* Patch #21521: Updated Spanish and Spanish Panama Translations
+* Patch #21522: Simplified Chinese translation for r14976
+* Patch #21527: Russian translation for 3.2.0
+* Patch #21593: Add class to contextual edit button that relates to heading on wiki pages
+* Patch #21620: Turkish translation for 3.2-stable
+* Patch #21635: German translations for 3.2
+* Patch #21740: Fixes misspelled word "RMagcik" in configuration.yml.example
+* Patch #21847: Let mobile header be fixed
+* Patch #21867: Add column `estimated_hours` for CSV import.
+* Patch #21883: Russian wiki translation for 3.2-stable
+* Patch #22009: Japanese wiki syntax (Markdown) translation for 3.2-stable
+* Patch #22074: Prevent username from overlapping in mobile menu
+* Patch #22101: Set max-with to 100% for input, select and textea
+* Patch #22104: Prevent font scaling in landscape mode on webkit
+* Patch #22128: Attachment form too wide on small screens
+* Patch #22132: German translations for 3.2-stable
+
== 2015-12-06 v3.2.0
* Defect #17403: Unknown file size while downloading attachment
diff --git a/doc/INSTALL b/doc/INSTALL
index 3dad2f1..8d4b4b5 100644
--- a/doc/INSTALL
+++ b/doc/INSTALL
@@ -1,7 +1,7 @@
== Redmine installation
Redmine - project management software
-Copyright (C) 2006-2015 Jean-Philippe Lang
+Copyright (C) 2006-2016 Jean-Philippe Lang
http://www.redmine.org/
diff --git a/doc/README_FOR_APP b/doc/README_FOR_APP
index 4d4b3b2..e4c7367 100644
--- a/doc/README_FOR_APP
+++ b/doc/README_FOR_APP
@@ -6,7 +6,7 @@ More details can be found at http://www.redmine.org
= License
-Copyright (C) 2006-2015 Jean-Philippe Lang
+Copyright (C) 2006-2016 Jean-Philippe Lang
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/doc/UPGRADING b/doc/UPGRADING
index 729b006..6b4c786 100644
--- a/doc/UPGRADING
+++ b/doc/UPGRADING
@@ -1,7 +1,7 @@
== Redmine upgrade
Redmine - project management software
-Copyright (C) 2006-2015 Jean-Philippe Lang
+Copyright (C) 2006-2016 Jean-Philippe Lang
http://www.redmine.org/
diff --git a/extra/mail_handler/rdm-mailhandler.rb b/extra/mail_handler/rdm-mailhandler.rb
index d1cf130..7784f48 100644
--- a/extra/mail_handler/rdm-mailhandler.rb
+++ b/extra/mail_handler/rdm-mailhandler.rb
@@ -1,6 +1,6 @@
#!/usr/bin/env ruby
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -87,7 +87,7 @@ class RedmineMailHandler
opts.separator("")
opts.separator("Issue attributes control options:")
opts.on( "--project-from-subaddress ADDR", "select project from subadress of ADDR found",
- "in To, Cc, Bcc headers") {|v| self.project_from_subaddress['project'] = v}
+ "in To, Cc, Bcc headers") {|v| self.project_from_subaddress = v}
opts.on("-p", "--project PROJECT", "identifier of the target project") {|v| self.issue_attributes['project'] = v}
opts.on("-s", "--status STATUS", "name of the target status") {|v| self.issue_attributes['status'] = v}
opts.on("-t", "--tracker TRACKER", "name of the target tracker") {|v| self.issue_attributes['tracker'] = v}
diff --git a/lib/plugins/acts_as_activity_provider/lib/acts_as_activity_provider.rb b/lib/plugins/acts_as_activity_provider/lib/acts_as_activity_provider.rb
index 5e96651..8f65eb7 100644
--- a/lib/plugins/acts_as_activity_provider/lib/acts_as_activity_provider.rb
+++ b/lib/plugins/acts_as_activity_provider/lib/acts_as_activity_provider.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/plugins/acts_as_attachable/lib/acts_as_attachable.rb b/lib/plugins/acts_as_attachable/lib/acts_as_attachable.rb
index b4b285b..31403d7 100644
--- a/lib/plugins/acts_as_attachable/lib/acts_as_attachable.rb
+++ b/lib/plugins/acts_as_attachable/lib/acts_as_attachable.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/plugins/acts_as_customizable/lib/acts_as_customizable.rb b/lib/plugins/acts_as_customizable/lib/acts_as_customizable.rb
index 6360e4e..1cde646 100644
--- a/lib/plugins/acts_as_customizable/lib/acts_as_customizable.rb
+++ b/lib/plugins/acts_as_customizable/lib/acts_as_customizable.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/plugins/acts_as_event/lib/acts_as_event.rb b/lib/plugins/acts_as_event/lib/acts_as_event.rb
index b0f4362..37b326b 100644
--- a/lib/plugins/acts_as_event/lib/acts_as_event.rb
+++ b/lib/plugins/acts_as_event/lib/acts_as_event.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/plugins/acts_as_searchable/lib/acts_as_searchable.rb b/lib/plugins/acts_as_searchable/lib/acts_as_searchable.rb
index 06d5db7..be89071 100644
--- a/lib/plugins/acts_as_searchable/lib/acts_as_searchable.rb
+++ b/lib/plugins/acts_as_searchable/lib/acts_as_searchable.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/redmine.rb b/lib/redmine.rb
index a7e29c8..2f4dbb5 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/redmine/access_control.rb b/lib/redmine/access_control.rb
index a20c956..e01cb25 100644
--- a/lib/redmine/access_control.rb
+++ b/lib/redmine/access_control.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/redmine/access_keys.rb b/lib/redmine/access_keys.rb
index b89c8db..302046a 100644
--- a/lib/redmine/access_keys.rb
+++ b/lib/redmine/access_keys.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/redmine/activity.rb b/lib/redmine/activity.rb
index af8d94e..716a899 100644
--- a/lib/redmine/activity.rb
+++ b/lib/redmine/activity.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/redmine/activity/fetcher.rb b/lib/redmine/activity/fetcher.rb
index 1ae8c10..627a084 100644
--- a/lib/redmine/activity/fetcher.rb
+++ b/lib/redmine/activity/fetcher.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/redmine/ciphering.rb b/lib/redmine/ciphering.rb
index a17c853..9257336 100644
--- a/lib/redmine/ciphering.rb
+++ b/lib/redmine/ciphering.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/redmine/configuration.rb b/lib/redmine/configuration.rb
index 9109a00..9ab008e 100644
--- a/lib/redmine/configuration.rb
+++ b/lib/redmine/configuration.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/redmine/core_ext/active_record.rb b/lib/redmine/core_ext/active_record.rb
index 6cce257..6ec901d 100644
--- a/lib/redmine/core_ext/active_record.rb
+++ b/lib/redmine/core_ext/active_record.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/redmine/core_ext/date/calculations.rb b/lib/redmine/core_ext/date/calculations.rb
index fe2fd32..5ad528f 100644
--- a/lib/redmine/core_ext/date/calculations.rb
+++ b/lib/redmine/core_ext/date/calculations.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/redmine/core_ext/string/conversions.rb b/lib/redmine/core_ext/string/conversions.rb
index 106bbce..0e0e67e 100644
--- a/lib/redmine/core_ext/string/conversions.rb
+++ b/lib/redmine/core_ext/string/conversions.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/redmine/core_ext/string/inflections.rb b/lib/redmine/core_ext/string/inflections.rb
index 2fc3f0a..ef188e1 100644
--- a/lib/redmine/core_ext/string/inflections.rb
+++ b/lib/redmine/core_ext/string/inflections.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/redmine/database.rb b/lib/redmine/database.rb
index 89a8012..b0f43b7 100644
--- a/lib/redmine/database.rb
+++ b/lib/redmine/database.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/redmine/default_data/loader.rb b/lib/redmine/default_data/loader.rb
index 054e02a..0fdfad6 100644
--- a/lib/redmine/default_data/loader.rb
+++ b/lib/redmine/default_data/loader.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/redmine/export/csv.rb b/lib/redmine/export/csv.rb
index 3762eb6..8b64ad6 100644
--- a/lib/redmine/export/csv.rb
+++ b/lib/redmine/export/csv.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
#
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/redmine/export/pdf.rb b/lib/redmine/export/pdf.rb
index d14bbd8..fd79c37 100644
--- a/lib/redmine/export/pdf.rb
+++ b/lib/redmine/export/pdf.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
#
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/redmine/export/pdf/issues_pdf_helper.rb b/lib/redmine/export/pdf/issues_pdf_helper.rb
index a7a4956..a9ee230 100644
--- a/lib/redmine/export/pdf/issues_pdf_helper.rb
+++ b/lib/redmine/export/pdf/issues_pdf_helper.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
#
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/redmine/export/pdf/wiki_pdf_helper.rb b/lib/redmine/export/pdf/wiki_pdf_helper.rb
index d4c4a68..37dbc1d 100644
--- a/lib/redmine/export/pdf/wiki_pdf_helper.rb
+++ b/lib/redmine/export/pdf/wiki_pdf_helper.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
#
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/redmine/field_format.rb b/lib/redmine/field_format.rb
index 10e5b48..b2aa679 100644
--- a/lib/redmine/field_format.rb
+++ b/lib/redmine/field_format.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/redmine/helpers/calendar.rb b/lib/redmine/helpers/calendar.rb
index 17d933f..0e21097 100644
--- a/lib/redmine/helpers/calendar.rb
+++ b/lib/redmine/helpers/calendar.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/redmine/helpers/diff.rb b/lib/redmine/helpers/diff.rb
index 785ff38..aa1860a 100644
--- a/lib/redmine/helpers/diff.rb
+++ b/lib/redmine/helpers/diff.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/redmine/helpers/gantt.rb b/lib/redmine/helpers/gantt.rb
index d551112..af78d9e 100644
--- a/lib/redmine/helpers/gantt.rb
+++ b/lib/redmine/helpers/gantt.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/redmine/helpers/time_report.rb b/lib/redmine/helpers/time_report.rb
index 5c62d40..884d00c 100644
--- a/lib/redmine/helpers/time_report.rb
+++ b/lib/redmine/helpers/time_report.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/redmine/hook.rb b/lib/redmine/hook.rb
index 1328a44..fb68106 100644
--- a/lib/redmine/hook.rb
+++ b/lib/redmine/hook.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/redmine/hook/listener.rb b/lib/redmine/hook/listener.rb
index d495a9b..6494a7b 100644
--- a/lib/redmine/hook/listener.rb
+++ b/lib/redmine/hook/listener.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/redmine/hook/view_listener.rb b/lib/redmine/hook/view_listener.rb
index 998bff0..f493578 100644
--- a/lib/redmine/hook/view_listener.rb
+++ b/lib/redmine/hook/view_listener.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/redmine/i18n.rb b/lib/redmine/i18n.rb
index 9523f23..6f0c1ff 100644
--- a/lib/redmine/i18n.rb
+++ b/lib/redmine/i18n.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/redmine/imap.rb b/lib/redmine/imap.rb
index d7f2ad6..c04bb3d 100644
--- a/lib/redmine/imap.rb
+++ b/lib/redmine/imap.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/redmine/menu_manager.rb b/lib/redmine/menu_manager.rb
index 5883059..ff70d2f 100644
--- a/lib/redmine/menu_manager.rb
+++ b/lib/redmine/menu_manager.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/redmine/mime_type.rb b/lib/redmine/mime_type.rb
index d97f7d0..1fff4e0 100644
--- a/lib/redmine/mime_type.rb
+++ b/lib/redmine/mime_type.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/redmine/nested_set/issue_nested_set.rb b/lib/redmine/nested_set/issue_nested_set.rb
index 77e26c2..932f563 100644
--- a/lib/redmine/nested_set/issue_nested_set.rb
+++ b/lib/redmine/nested_set/issue_nested_set.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/redmine/nested_set/project_nested_set.rb b/lib/redmine/nested_set/project_nested_set.rb
index 16e1cdf..fd64081 100644
--- a/lib/redmine/nested_set/project_nested_set.rb
+++ b/lib/redmine/nested_set/project_nested_set.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/redmine/nested_set/traversing.rb b/lib/redmine/nested_set/traversing.rb
index 9683486..5b3c1cb 100644
--- a/lib/redmine/nested_set/traversing.rb
+++ b/lib/redmine/nested_set/traversing.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/redmine/pagination.rb b/lib/redmine/pagination.rb
index c07af54..89ee65f 100644
--- a/lib/redmine/pagination.rb
+++ b/lib/redmine/pagination.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
#
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/redmine/platform.rb b/lib/redmine/platform.rb
index 8662426..8a86382 100644
--- a/lib/redmine/platform.rb
+++ b/lib/redmine/platform.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/redmine/plugin.rb b/lib/redmine/plugin.rb
index fc29633..503c3db 100644
--- a/lib/redmine/plugin.rb
+++ b/lib/redmine/plugin.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/redmine/pop3.rb b/lib/redmine/pop3.rb
index baa845d..f4afe2e 100644
--- a/lib/redmine/pop3.rb
+++ b/lib/redmine/pop3.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/redmine/safe_attributes.rb b/lib/redmine/safe_attributes.rb
index b69bf5e..363048d 100644
--- a/lib/redmine/safe_attributes.rb
+++ b/lib/redmine/safe_attributes.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/redmine/scm/adapters.rb b/lib/redmine/scm/adapters.rb
index 96e8510..6c65044 100644
--- a/lib/redmine/scm/adapters.rb
+++ b/lib/redmine/scm/adapters.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/redmine/scm/adapters/abstract_adapter.rb b/lib/redmine/scm/adapters/abstract_adapter.rb
index 98683b0..9ed8b25 100644
--- a/lib/redmine/scm/adapters/abstract_adapter.rb
+++ b/lib/redmine/scm/adapters/abstract_adapter.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/redmine/scm/adapters/bazaar_adapter.rb b/lib/redmine/scm/adapters/bazaar_adapter.rb
index 21fea7a..1290292 100644
--- a/lib/redmine/scm/adapters/bazaar_adapter.rb
+++ b/lib/redmine/scm/adapters/bazaar_adapter.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/redmine/scm/adapters/darcs_adapter.rb b/lib/redmine/scm/adapters/darcs_adapter.rb
index 36e9fac..415e6b0 100644
--- a/lib/redmine/scm/adapters/darcs_adapter.rb
+++ b/lib/redmine/scm/adapters/darcs_adapter.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/redmine/scm/adapters/filesystem_adapter.rb b/lib/redmine/scm/adapters/filesystem_adapter.rb
index 0289fcb..b7c559e 100644
--- a/lib/redmine/scm/adapters/filesystem_adapter.rb
+++ b/lib/redmine/scm/adapters/filesystem_adapter.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# FileSystem adapter
# File written by Paul Rivier, at Demotera.
diff --git a/lib/redmine/scm/adapters/git_adapter.rb b/lib/redmine/scm/adapters/git_adapter.rb
index 7395bc2..52ecf69 100644
--- a/lib/redmine/scm/adapters/git_adapter.rb
+++ b/lib/redmine/scm/adapters/git_adapter.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/redmine/scm/adapters/mercurial_adapter.rb b/lib/redmine/scm/adapters/mercurial_adapter.rb
index 63bfebb..ccd9ee9 100644
--- a/lib/redmine/scm/adapters/mercurial_adapter.rb
+++ b/lib/redmine/scm/adapters/mercurial_adapter.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/redmine/scm/adapters/subversion_adapter.rb b/lib/redmine/scm/adapters/subversion_adapter.rb
index f5789ff..508a2e5 100644
--- a/lib/redmine/scm/adapters/subversion_adapter.rb
+++ b/lib/redmine/scm/adapters/subversion_adapter.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/redmine/search.rb b/lib/redmine/search.rb
index 99795a0..ecc6bb6 100644
--- a/lib/redmine/search.rb
+++ b/lib/redmine/search.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/redmine/subclass_factory.rb b/lib/redmine/subclass_factory.rb
index 48724b8..ed33113 100644
--- a/lib/redmine/subclass_factory.rb
+++ b/lib/redmine/subclass_factory.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/redmine/syntax_highlighting.rb b/lib/redmine/syntax_highlighting.rb
index edf906d..7480ebd 100644
--- a/lib/redmine/syntax_highlighting.rb
+++ b/lib/redmine/syntax_highlighting.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/redmine/themes.rb b/lib/redmine/themes.rb
index 9792d10..3c40bb1 100644
--- a/lib/redmine/themes.rb
+++ b/lib/redmine/themes.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/redmine/thumbnail.rb b/lib/redmine/thumbnail.rb
index 2c01e68..61e113d 100644
--- a/lib/redmine/thumbnail.rb
+++ b/lib/redmine/thumbnail.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/redmine/unified_diff.rb b/lib/redmine/unified_diff.rb
index 6576d63..67365b0 100644
--- a/lib/redmine/unified_diff.rb
+++ b/lib/redmine/unified_diff.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/redmine/utils.rb b/lib/redmine/utils.rb
index ed27d7e..85d3a4b 100644
--- a/lib/redmine/utils.rb
+++ b/lib/redmine/utils.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/redmine/version.rb b/lib/redmine/version.rb
index 5e4191a..040b316 100644
--- a/lib/redmine/version.rb
+++ b/lib/redmine/version.rb
@@ -4,7 +4,7 @@ module Redmine
module VERSION #:nodoc:
MAJOR = 3
MINOR = 2
- TINY = 0
+ TINY = 1
# Branch values:
# * official release: nil
diff --git a/lib/redmine/views/api_template_handler.rb b/lib/redmine/views/api_template_handler.rb
index f636dff..98e5680 100644
--- a/lib/redmine/views/api_template_handler.rb
+++ b/lib/redmine/views/api_template_handler.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/redmine/views/builders.rb b/lib/redmine/views/builders.rb
index c0a545c..c36de0c 100644
--- a/lib/redmine/views/builders.rb
+++ b/lib/redmine/views/builders.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/redmine/views/builders/json.rb b/lib/redmine/views/builders/json.rb
index 50833fd..5b1d326 100644
--- a/lib/redmine/views/builders/json.rb
+++ b/lib/redmine/views/builders/json.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/redmine/views/builders/structure.rb b/lib/redmine/views/builders/structure.rb
index b11e255..03f73c6 100644
--- a/lib/redmine/views/builders/structure.rb
+++ b/lib/redmine/views/builders/structure.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/redmine/views/builders/xml.rb b/lib/redmine/views/builders/xml.rb
index 9f80a60..9d6ca9d 100644
--- a/lib/redmine/views/builders/xml.rb
+++ b/lib/redmine/views/builders/xml.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/redmine/views/labelled_form_builder.rb b/lib/redmine/views/labelled_form_builder.rb
index 9f07666..965dee8 100644
--- a/lib/redmine/views/labelled_form_builder.rb
+++ b/lib/redmine/views/labelled_form_builder.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/redmine/views/my_page/block.rb b/lib/redmine/views/my_page/block.rb
index b04cfaf..07398d7 100644
--- a/lib/redmine/views/my_page/block.rb
+++ b/lib/redmine/views/my_page/block.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/redmine/views/other_formats_builder.rb b/lib/redmine/views/other_formats_builder.rb
index a02971c..48af0fb 100644
--- a/lib/redmine/views/other_formats_builder.rb
+++ b/lib/redmine/views/other_formats_builder.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/redmine/wiki_formatting.rb b/lib/redmine/wiki_formatting.rb
index 45d5cc7..17348d1 100644
--- a/lib/redmine/wiki_formatting.rb
+++ b/lib/redmine/wiki_formatting.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/redmine/wiki_formatting/html_parser.rb b/lib/redmine/wiki_formatting/html_parser.rb
index a81d9d9..a6d3d8b 100644
--- a/lib/redmine/wiki_formatting/html_parser.rb
+++ b/lib/redmine/wiki_formatting/html_parser.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/redmine/wiki_formatting/macros.rb b/lib/redmine/wiki_formatting/macros.rb
index cae5197..f874837 100644
--- a/lib/redmine/wiki_formatting/macros.rb
+++ b/lib/redmine/wiki_formatting/macros.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/redmine/wiki_formatting/markdown/formatter.rb b/lib/redmine/wiki_formatting/markdown/formatter.rb
index fdf17fe..62ad6f1 100644
--- a/lib/redmine/wiki_formatting/markdown/formatter.rb
+++ b/lib/redmine/wiki_formatting/markdown/formatter.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/redmine/wiki_formatting/markdown/helper.rb b/lib/redmine/wiki_formatting/markdown/helper.rb
index ee4b30f..f864988 100644
--- a/lib/redmine/wiki_formatting/markdown/helper.rb
+++ b/lib/redmine/wiki_formatting/markdown/helper.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/redmine/wiki_formatting/markdown/html_parser.rb b/lib/redmine/wiki_formatting/markdown/html_parser.rb
index f81e389..e3d2929 100644
--- a/lib/redmine/wiki_formatting/markdown/html_parser.rb
+++ b/lib/redmine/wiki_formatting/markdown/html_parser.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/redmine/wiki_formatting/textile/formatter.rb b/lib/redmine/wiki_formatting/textile/formatter.rb
index a52e53f..91ea149 100644
--- a/lib/redmine/wiki_formatting/textile/formatter.rb
+++ b/lib/redmine/wiki_formatting/textile/formatter.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/redmine/wiki_formatting/textile/helper.rb b/lib/redmine/wiki_formatting/textile/helper.rb
index 553560d..eedbe6d 100644
--- a/lib/redmine/wiki_formatting/textile/helper.rb
+++ b/lib/redmine/wiki_formatting/textile/helper.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/redmine/wiki_formatting/textile/html_parser.rb b/lib/redmine/wiki_formatting/textile/html_parser.rb
index 5e4ca76..a5696cb 100644
--- a/lib/redmine/wiki_formatting/textile/html_parser.rb
+++ b/lib/redmine/wiki_formatting/textile/html_parser.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/tasks/ciphering.rake b/lib/tasks/ciphering.rake
index 32b814c..7c9ef07 100644
--- a/lib/tasks/ciphering.rake
+++ b/lib/tasks/ciphering.rake
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/tasks/email.rake b/lib/tasks/email.rake
index 43fa687..fe6fb92 100644
--- a/lib/tasks/email.rake
+++ b/lib/tasks/email.rake
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/tasks/migrate_from_mantis.rake b/lib/tasks/migrate_from_mantis.rake
index ae38787..dba77ef 100644
--- a/lib/tasks/migrate_from_mantis.rake
+++ b/lib/tasks/migrate_from_mantis.rake
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/tasks/migrate_from_trac.rake b/lib/tasks/migrate_from_trac.rake
index 3d6c41c..9556142 100644
--- a/lib/tasks/migrate_from_trac.rake
+++ b/lib/tasks/migrate_from_trac.rake
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/tasks/redmine.rake b/lib/tasks/redmine.rake
index 89450c1..973e63e 100644
--- a/lib/tasks/redmine.rake
+++ b/lib/tasks/redmine.rake
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/lib/tasks/reminder.rake b/lib/tasks/reminder.rake
index 3807297..7e7ef6c 100644
--- a/lib/tasks/reminder.rake
+++ b/lib/tasks/reminder.rake
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/public/help/ca/wiki_syntax_markdown.html b/public/help/ca/wiki_syntax_markdown.html
index c6f6eff..237a0c1 100644
--- a/public/help/ca/wiki_syntax_markdown.html
+++ b/public/help/ca/wiki_syntax_markdown.html
@@ -3,7 +3,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta http-equiv="Content-Style-Type" content="text/css" />
-<title>Wiki formatting</title>
+<title>Format de la Wiki</title>
<style type="text/css">
h1 { font-family: Verdana, sans-serif; font-size: 14px; text-align: center; color: #444; }
body { font-family: Verdana, sans-serif; font-size: 12px; color: #444; }
@@ -20,46 +20,46 @@ table.sample th, table.sample td { border: solid 1px #bbb; padding: 4px; height:
</head>
<body>
-<h1>Wiki Syntax Quick Reference (Markdown)</h1>
+<h1>Guia rapida de la Sintaxis de la Wiki (Markdown)</h1>
<table style="width:100%">
<tr><th colspan="3">Font Styles</th></tr>
-<tr><th><img src="../../images/jstoolbar/bt_strong.png" style="border: 1px solid #bbb;" alt="Strong" /></th><td style="width:50%;">**Strong**</td><td style="width:50%;"><strong>Strong</strong></td></tr>
-<tr><th><img src="../../images/jstoolbar/bt_em.png" style="border: 1px solid #bbb;" alt="Italic" /></th><td>*Italic*</td><td><em>Italic</em></td></tr>
-<tr><th><img src="../../images/jstoolbar/bt_del.png" style="border: 1px solid #bbb;" alt="Deleted" /></th><td>~~Deleted~~</td><td><del>Deleted</del></td></tr>
-<tr><th><img src="../../images/jstoolbar/bt_code.png" style="border: 1px solid #bbb;" alt="Inline Code" /></th><td>`Inline Code`</td><td><code>Inline Code</code></td></tr>
-<tr><th><img src="../../images/jstoolbar/bt_pre.png" style="border: 1px solid #bbb;" alt="Preformatted text" /></th><td>~~~<br /> lines<br /> of code<br />~~~</td><td>
+<tr><th><img src="../../images/jstoolbar/bt_strong.png" style="border: 1px solid #bbb;" alt="Negreta" /></th><td style="width:50%;">**Negreta**</td><td style="width:50%;"><strong>Negreta</strong></td></tr>
+<tr><th><img src="../../images/jstoolbar/bt_em.png" style="border: 1px solid #bbb;" alt="Cursiva" /></th><td>*Cursiva*</td><td><em>Cursiva</em></td></tr>
+<tr><th><img src="../../images/jstoolbar/bt_del.png" style="border: 1px solid #bbb;" alt="Eliminat" /></th><td>~~Eliminat~~</td><td><del>Eliminat</del></td></tr>
+<tr><th><img src="../../images/jstoolbar/bt_code.png" style="border: 1px solid #bbb;" alt="Codi en línia" /></th><td>`Codi en línia`</td><td><code>Codi en línia</code></td></tr>
+<tr><th><img src="../../images/jstoolbar/bt_pre.png" style="border: 1px solid #bbb;" alt="Linies de codi" /></th><td>~~~<br /> linies<br /> de codi<br />~~~</td><td>
<pre>
- lines
- of code
+ linies
+ de codi
</pre>
</td></tr>
-<tr><th colspan="3">Lists</th></tr>
-<tr><th><img src="../../images/jstoolbar/bt_ul.png" style="border: 1px solid #bbb;" alt="Unordered list" /></th><td>* Item 1<br /> * Sub<br />* Item 2</td><td><ul><li>Item 1<ul><li>Sub</li></ul></li><li>Item 2</li></ul></td></tr>
-<tr><th><img src="../../images/jstoolbar/bt_ol.png" style="border: 1px solid #bbb;" alt="Ordered list" /></th><td>1. Item 1<br /> 1. Sub<br />2. Item 2</td><td><ol><li>Item 1<ol><li>Sub</li></ol></li><li>Item 2</li></ol></td></tr>
+<tr><th colspan="3">Llistes</th></tr>
+<tr><th><img src="../../images/jstoolbar/bt_ul.png" style="border: 1px solid #bbb;" alt="Llista desordenada" /></th><td>* Article 1<br /> * Sub<br />* Article 2</td><td><ul><li>Article 1<ul><li>Sub</li></ul></li><li>Article 2</li></ul></td></tr>
+<tr><th><img src="../../images/jstoolbar/bt_ol.png" style="border: 1px solid #bbb;" alt="Llista Ordenada" /></th><td>1. Article 1<br /> 1. Sub<br />2. Article 2</td><td><ol><li>Article 1<ol><li>Sub</li></ol></li><li>Article 2</li></ol></td></tr>
-<tr><th colspan="3">Headings</th></tr>
-<tr><th><img src="../../images/jstoolbar/bt_h1.png" style="border: 1px solid #bbb;" alt="Heading 1" /></th><td># Title 1</td><td><h1>Title 1</h1></td></tr>
-<tr><th><img src="../../images/jstoolbar/bt_h2.png" style="border: 1px solid #bbb;" alt="Heading 2" /></th><td>## Title 2</td><td><h2>Title 2</h2></td></tr>
-<tr><th><img src="../../images/jstoolbar/bt_h3.png" style="border: 1px solid #bbb;" alt="Heading 3" /></th><td>### Title 3</td><td><h3>Title 3</h3></td></tr>
+<tr><th colspan="3">Capçaleres</th></tr>
+<tr><th><img src="../../images/jstoolbar/bt_h1.png" style="border: 1px solid #bbb;" alt="Encapçament 1" /></th><td># Títol 1</td><td><h1>Títol 1</h1></td></tr>
+<tr><th><img src="../../images/jstoolbar/bt_h2.png" style="border: 1px solid #bbb;" alt="Encapçament 2" /></th><td>## Títol 2</td><td><h2>Títol 2</h2></td></tr>
+<tr><th><img src="../../images/jstoolbar/bt_h3.png" style="border: 1px solid #bbb;" alt="Encapçament 3" /></th><td>### Títol 3</td><td><h3>Títol 3</h3></td></tr>
<tr><th colspan="3">Links</th></tr>
<tr><th></th><td>http://foo.bar</td><td><a href="#">http://foo.bar</a></td></tr>
<tr><th></th><td>[Foo](http://foo.bar)</td><td><a href="#">Foo</a></td></tr>
<tr><th colspan="3">Redmine links</th></tr>
-<tr><th><img src="../../images/jstoolbar/bt_link.png" style="border: 1px solid #bbb;" alt="Link to a Wiki page" /></th><td>[[Wiki page]]</td><td><a href="#">Wiki page</a></td></tr>
-<tr><th></th><td>Issue #12</td><td>Issue <a href="#">#12</a></td></tr>
-<tr><th></th><td>Revision r43</td><td>Revision <a href="#">r43</a></td></tr>
+<tr><th><img src="../../images/jstoolbar/bt_link.png" style="border: 1px solid #bbb;" alt="Link a la pagina Wiki" /></th><td>[[Pagina Wiki]]</td><td><a href="#">Pagina Wiki</a></td></tr>
+<tr><th></th><td>Assumpte #12</td><td>Assumpte <a href="#">#12</a></td></tr>
+<tr><th></th><td>Revisió r43</td><td>Revisió <a href="#">r43</a></td></tr>
<tr><th></th><td>commit:f30e13e43</td><td><a href="#">f30e13e4</a></td></tr>
<tr><th></th><td>source:some/file</td><td><a href="#">source:some/file</a></td></tr>
-<tr><th colspan="3">Inline images</th></tr>
-<tr><th><img src="../../images/jstoolbar/bt_img.png" style="border: 1px solid #bbb;" alt="Image" /></th><td></td><td></td></tr>
-<tr><th></th><td></td><td></td></tr>
+<tr><th colspan="3">Imatges</th></tr>
+<tr><th><img src="../../images/jstoolbar/bt_img.png" style="border: 1px solid #bbb;" alt="Imatge" /></th><td></td><td></td></tr>
+<tr><th></th><td></td><td></td></tr>
-<tr><th colspan="3">Tables</th></tr>
+<tr><th colspan="3">Taules</th></tr>
<tr>
<th></th>
<td>| A | B | C |<br />|---|---|---|<br />| A | B | C |<br />| D | E | F |</td>
@@ -76,7 +76,7 @@ table.sample th, table.sample td { border: solid 1px #bbb; padding: 4px; height:
</table>
-<p><a href="wiki_syntax_detailed_markdown.html" onclick="window.open('wiki_syntax_detailed_markdown.html', '', ''); return false;">More Information</a></p>
+<p><a href="wiki_syntax_detailed_markdown.html" onclick="window.open('wiki_syntax_detailed_markdown.html', '', ''); return false;">Més informació</a></p>
</body>
</html>
diff --git a/public/help/ca/wiki_syntax_textile.html b/public/help/ca/wiki_syntax_textile.html
index 55a900d..5d81a44 100644
--- a/public/help/ca/wiki_syntax_textile.html
+++ b/public/help/ca/wiki_syntax_textile.html
@@ -3,7 +3,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta http-equiv="Content-Style-Type" content="text/css" />
-<title>Wiki formatting</title>
+<title>Format de la Wiki</title>
<style type="text/css">
h1 { font-family: Verdana, sans-serif; font-size: 14px; text-align: center; color: #444; }
body { font-family: Verdana, sans-serif; font-size: 12px; color: #444; }
@@ -20,48 +20,48 @@ table.sample th, table.sample td { border: solid 1px #bbb; padding: 4px; height:
</head>
<body>
-<h1>Wiki Syntax Quick Reference</h1>
+<h1>Guia rapida de la Sintaxis de la Wiki</h1>
<table style="width:100%">
-<tr><th colspan="3">Font Styles</th></tr>
-<tr><th><img src="../../images/jstoolbar/bt_strong.png" style="border: 1px solid #bbb;" alt="Strong" /></th><td style="width:50%;">*Strong*</td><td style="width:50%;"><strong>Strong</strong></td></tr>
-<tr><th><img src="../../images/jstoolbar/bt_em.png" style="border: 1px solid #bbb;" alt="Italic" /></th><td>_Italic_</td><td><em>Italic</em></td></tr>
-<tr><th><img src="../../images/jstoolbar/bt_ins.png" style="border: 1px solid #bbb;" alt="Underline" /></th><td>+Underline+</td><td><ins>Underline</ins></td></tr>
-<tr><th><img src="../../images/jstoolbar/bt_del.png" style="border: 1px solid #bbb;" alt="Deleted" /></th><td>-Deleted-</td><td><del>Deleted</del></td></tr>
-<tr><th></th><td>??Quote??</td><td><cite>Quote</cite></td></tr>
-<tr><th><img src="../../images/jstoolbar/bt_code.png" style="border: 1px solid #bbb;" alt="Inline Code" /></th><td>@Inline Code@</td><td><code>Inline Code</code></td></tr>
-<tr><th><img src="../../images/jstoolbar/bt_pre.png" style="border: 1px solid #bbb;" alt="Preformatted text" /></th><td><pre><br /> lines<br /> of code<br /></pre></td><td>
+<tr><th colspan="3">Estil de font</th></tr>
+<tr><th><img src="../../images/jstoolbar/bt_strong.png" style="border: 1px solid #bbb;" alt="Negreta" /></th><td style="width:50%;">*Negreta*</td><td style="width:50%;"><strong>Negreta</strong></td></tr>
+<tr><th><img src="../../images/jstoolbar/bt_em.png" style="border: 1px solid #bbb;" alt="Cursiva" /></th><td>_Cursiva_</td><td><em>Cursiva</em></td></tr>
+<tr><th><img src="../../images/jstoolbar/bt_ins.png" style="border: 1px solid #bbb;" alt="Subratllat" /></th><td>+Subratllat+</td><td><ins>Subratllat</ins></td></tr>
+<tr><th><img src="../../images/jstoolbar/bt_del.png" style="border: 1px solid #bbb;" alt="Eliminat" /></th><td>-Eliminat-</td><td><del>Eliminat</del></td></tr>
+<tr><th></th><td>??Cita??</td><td><cite>Cita</cite></td></tr>
+<tr><th><img src="../../images/jstoolbar/bt_code.png" style="border: 1px solid #bbb;" alt="Codi en línia" /></th><td>@Codi en línia@</td><td><code>Codi en línia</code></td></tr>
+<tr><th><img src="../../images/jstoolbar/bt_pre.png" style="border: 1px solid #bbb;" alt="Linies de codi" /></th><td><pre><br /> linies<br /> de codi<br /></pre></td><td>
<pre>
- lines
- of code
+ linies
+ de codi
</pre>
</td></tr>
-<tr><th colspan="3">Lists</th></tr>
-<tr><th><img src="../../images/jstoolbar/bt_ul.png" style="border: 1px solid #bbb;" alt="Unordered list" /></th><td>* Item 1<br />** Sub<br />* Item 2</td><td><ul><li>Item 1<ul><li>Sub</li></ul></li><li>Item 2</li></ul></td></tr>
-<tr><th><img src="../../images/jstoolbar/bt_ol.png" style="border: 1px solid #bbb;" alt="Ordered list" /></th><td># Item 1<br />## Sub<br /># Item 2</td><td><ol><li>Item 1<ol><li>Sub</li></ol></li><li>Item 2</li></ol></td></tr>
+<tr><th colspan="3">Llistes</th></tr>
+<tr><th><img src="../../images/jstoolbar/bt_ul.png" style="border: 1px solid #bbb;" alt="Llista desordenada" /></th><td>* Article 1<br />** Sub<br />* Article 2</td><td><ul><li>Article 1<ul><li>Sub</li></ul></li><li>Article 2</li></ul></td></tr>
+<tr><th><img src="../../images/jstoolbar/bt_ol.png" style="border: 1px solid #bbb;" alt="Llista ordenada" /></th><td># Article 1<br />## Sub<br /># Article 2</td><td><ol><li>Article 1<ol><li>Sub</li></ol></li><li>Article 2</li></ol></td></tr>
-<tr><th colspan="3">Headings</th></tr>
-<tr><th><img src="../../images/jstoolbar/bt_h1.png" style="border: 1px solid #bbb;" alt="Heading 1" /></th><td>h1. Title 1</td><td><h1>Title 1</h1></td></tr>
-<tr><th><img src="../../images/jstoolbar/bt_h2.png" style="border: 1px solid #bbb;" alt="Heading 2" /></th><td>h2. Title 2</td><td><h2>Title 2</h2></td></tr>
-<tr><th><img src="../../images/jstoolbar/bt_h3.png" style="border: 1px solid #bbb;" alt="Heading 3" /></th><td>h3. Title 3</td><td><h3>Title 3</h3></td></tr>
+<tr><th colspan="3">Capçaleres</th></tr>
+<tr><th><img src="../../images/jstoolbar/bt_h1.png" style="border: 1px solid #bbb;" alt="Encapçament 1" /></th><td>h1. Títol 1</td><td><h1>Títol 1</h1></td></tr>
+<tr><th><img src="../../images/jstoolbar/bt_h2.png" style="border: 1px solid #bbb;" alt="Encapçament 2" /></th><td>h2. Títol 2</td><td><h2>Títol 2</h2></td></tr>
+<tr><th><img src="../../images/jstoolbar/bt_h3.png" style="border: 1px solid #bbb;" alt="Encapçament 3" /></th><td>h3. Títol 3</td><td><h3>Títol 3</h3></td></tr>
<tr><th colspan="3">Links</th></tr>
<tr><th></th><td>http://foo.bar</td><td><a href="#">http://foo.bar</a></td></tr>
<tr><th></th><td>"Foo":http://foo.bar</td><td><a href="#">Foo</a></td></tr>
-<tr><th colspan="3">Redmine links</th></tr>
-<tr><th><img src="../../images/jstoolbar/bt_link.png" style="border: 1px solid #bbb;" alt="Link to a Wiki page" /></th><td>[[Wiki page]]</td><td><a href="#">Wiki page</a></td></tr>
-<tr><th></th><td>Issue #12</td><td>Issue <a href="#">#12</a></td></tr>
-<tr><th></th><td>Revision r43</td><td>Revision <a href="#">r43</a></td></tr>
+<tr><th colspan="3">Links del Redmine</th></tr>
+<tr><th><img src="../../images/jstoolbar/bt_link.png" style="border: 1px solid #bbb;" alt="Link a la pagina Wiki" /></th><td>[[Pagina Wiki]]</td><td><a href="#">Pagina Wiki</a></td></tr>
+<tr><th></th><td>Assumpte #12</td><td>Assumpte <a href="#">#12</a></td></tr>
+<tr><th></th><td>Revisió r43</td><td>Revisió <a href="#">r43</a></td></tr>
<tr><th></th><td>commit:f30e13e43</td><td><a href="#">f30e13e4</a></td></tr>
<tr><th></th><td>source:some/file</td><td><a href="#">source:some/file</a></td></tr>
-<tr><th colspan="3">Inline images</th></tr>
-<tr><th><img src="../../images/jstoolbar/bt_img.png" style="border: 1px solid #bbb;" alt="Image" /></th><td>!<em>image_url</em>!</td><td></td></tr>
-<tr><th></th><td>!<em>attached_image</em>!</td><td></td></tr>
+<tr><th colspan="3">Imatges</th></tr>
+<tr><th><img src="../../images/jstoolbar/bt_img.png" style="border: 1px solid #bbb;" alt="Imatge" /></th><td>!<em>imatge_url</em>!</td><td></td></tr>
+<tr><th></th><td>!<em>imatge_adjunta</em>!</td><td></td></tr>
-<tr><th colspan="3">Tables</th></tr>
+<tr><th colspan="3">Taules</th></tr>
<tr>
<th></th>
<td>|_. A |_. B |_. C |<br />| A | B | C |<br />|/2. row span | B | C |<br />|\2. col span |</td>
@@ -79,7 +79,7 @@ table.sample th, table.sample td { border: solid 1px #bbb; padding: 4px; height:
</table>
-<p><a href="wiki_syntax_detailed_textile.html" onclick="window.open('wiki_syntax_detailed_textile.html', '', ''); return false;">More Information</a></p>
+<p><a href="wiki_syntax_detailed_textile.html" onclick="window.open('wiki_syntax_detailed_textile.html', '', ''); return false;">Més informació</a></p>
</body>
</html>
diff --git a/public/help/ja/wiki_syntax_detailed_markdown.html b/public/help/ja/wiki_syntax_detailed_markdown.html
index b423948..fc36822 100644
--- a/public/help/ja/wiki_syntax_detailed_markdown.html
+++ b/public/help/ja/wiki_syntax_detailed_markdown.html
@@ -33,192 +33,192 @@
</head>
<body>
-<h1><a name="1" class="wiki-page"></a>Wiki formatting (Markdown)</h1>
+<h1><a name="1" class="wiki-page"></a>Wiki記法 (Markdown)</h1>
<h2><a name="2" class="wiki-page"></a>Links</h2>
- <h3><a name="3" class="wiki-page"></a>Redmine links</h3>
+ <h3><a name="3" class="wiki-page">Redmine内のリンク</a></h3>
- <p>Redmine allows hyperlinking between resources (issues, changesets, wiki pages...) from anywhere wiki formatting is used.</p>
+ <p>RedmineはWiki記法が使える箇所のどこからでも、チケット・チェンジセット・Wikiページなどのリソースへのリンクができます。</p>
<ul>
- <li>Link to an issue: <strong>#124</strong> (displays <del><a href="#" class="issue" title="bulk edit doesn't change the category or fixed version properties (Closed)">#124</a></del>, link is striked-through if the issue is closed)</li>
- <li>Link to an issue note: <strong>#124-6</strong>, or <strong>#124#note-6</strong></li>
+ <li>チケットへのリンク: <strong>#124</strong> (終了したチケットは <del><a href="#" class="issue" title="bulk edit doesn't change the category or fixed version properties (Closed)">#124</a></del> のように取り消し線付きで表示されます)</li>
+ <li>チケットの注記へのリンク: <strong>#124-6</strong> または <strong>#124#note-6</strong></li>
</ul>
- <p>Wiki links:</p>
+ <p>Wikiへのリンク:</p>
<ul>
- <li><strong>[[Guide]]</strong> displays a link to the page named 'Guide': <a href="#" class="wiki-page">Guide</a></li>
- <li><strong>[[Guide#further-reading]]</strong> takes you to the anchor "further-reading". Headings get automatically assigned anchors so that you can refer to them: <a href="#" class="wiki-page">Guide</a></li>
- <li><strong>[[Guide|User manual]]</strong> displays a link to the same page but with a different text: <a href="#" class="wiki-page">User manual</a></li>
+ <li><strong>[[Guide]]</strong> "Guide"という名称のページへのリンク: <a href="#" class="wiki-page">Guide</a></li>
+ <li><strong>[[Guide#further-reading]]</strong> "Guide"というページ内の"further-reading"というアンカーに飛びます。見出しには自動的にアンカーが設定されるのでこのようにリンク先とすることができます: <a href="#" class="wiki-page">Guide</a></li>
+ <li><strong>[[Guide|User manual]]</strong> "Guide"というページへのリンクを異なるテキストで表示: <a href="#" class="wiki-page">User manual</a></li>
</ul>
- <p>You can also link to pages of an other project wiki:</p>
+ <p>別のプロジェクトのwikiへのリンクも可能です:</p>
<ul>
- <li><strong>[[sandbox:some page]]</strong> displays a link to the page named 'Some page' of the Sandbox wiki</li>
- <li><strong>[[sandbox:]]</strong> displays a link to the Sandbox wiki main page</li>
+ <li><strong>[[sandbox:some page]]</strong> sandboxというプロジェクトのwikiの"some page"という名称のページへのリンク</li>
+ <li><strong>[[sandbox:]]</strong> sanbdoxというプロジェクトのwikiのメインページへのリンク</li>
</ul>
- <p>Wiki links are displayed in red if the page doesn't exist yet, eg: <a href="#" class="wiki-page new">Nonexistent page</a>.</p>
+ <p>存在しないwikiページへのリンクは赤で表示されます。 例: <a href="#" class="wiki-page new">Nonexistent page</a>.</p>
- <p>Links to other resources:</p>
+ <p>そのほかのリソースへのリンク:</p>
<ul>
- <li>Documents:
+ <li>文書:
<ul>
- <li><strong>document#17</strong> (link to document with id 17)</li>
- <li><strong>document:Greetings</strong> (link to the document with title "Greetings")</li>
- <li><strong>document:"Some document"</strong> (double quotes can be used when document title contains spaces)</li>
- <li><strong>sandbox:document:"Some document"</strong> (link to a document with title "Some document" in other project "sandbox")</li>
+ <li><strong>document#17</strong> (id 17の文書へのリンク)</li>
+ <li><strong>document:Greetings</strong> ("Greetings" というタイトルの文書へのリンク)</li>
+ <li><strong>document:"Some document"</strong> (文書のタイトルに空白が含まれる場合はダブルクォーテーションで囲んでください)</li>
+ <li><strong>sandbox:document:"Some document"</strong> ("sandbox" というプロジェクトの "Some document" というタイトルの文書へのリンク)</li>
</ul>
</li>
</ul>
<ul>
- <li>Versions:
+ <li>バージョン:
<ul>
- <li><strong>version#3</strong> (link to version with id 3)</li>
- <li><strong>version:1.0.0</strong> (link to version named "1.0.0")</li>
+ <li><strong>version#3</strong> (id 3のバージョンへのリンク)</li>
+ <li><strong>version:1.0.0</strong> ("1.0.0"という名称のバージョンへのリンク)</li>
<li><strong>version:"1.0 beta 2"</strong></li>
- <li><strong>sandbox:version:1.0.0</strong> (link to version "1.0.0" in the project "sandbox")</li>
+ <li><strong>sandbox:version:1.0.0</strong> ("sandbox"というプロジェクトの "1.0.0" という名称のバージョンへのリンク)</li>
</ul>
</li>
</ul>
<ul>
- <li>Attachments:
+ <li>添付ファイル:
<ul>
- <li><strong>attachment:file.zip</strong> (link to the attachment of the current object named file.zip)</li>
- <li>For now, attachments of the current object can be referenced only (if you're on an issue, it's possible to reference attachments of this issue only)</li>
+ <li><strong>attachment:file.zip</strong> (現在のオブジェクトに添付された file.zip というファイルへのリンク)</li>
+ <li>現在のオブジェクト上の添付ファイルのみリンク先として指定できます (例えばあるチケットからは、そのチケットに添付されたファイルのみリンク先にできます)</li>
</ul>
</li>
</ul>
<ul>
- <li>Changesets:
+ <li>チェンジセット:
<ul>
- <li><strong>r758</strong> (link to a changeset)</li>
- <li><strong>commit:c6f4d0fd</strong> (link to a changeset with a non-numeric hash)</li>
- <li><strong>svn1|r758</strong> (link to a changeset of a specific repository, for projects with multiple repositories)</li>
- <li><strong>commit:hg|c6f4d0fd</strong> (link to a changeset with a non-numeric hash of a specific repository)</li>
- <li><strong>sandbox:r758</strong> (link to a changeset of another project)</li>
- <li><strong>sandbox:commit:c6f4d0fd</strong> (link to a changeset with a non-numeric hash of another project)</li>
+ <li><strong>r758</strong> (チェンジセットへのリンク)</li>
+ <li><strong>commit:c6f4d0fd</strong> (ハッシュ値によるチェンジセットへのリンク)</li>
+ <li><strong>svn1|r758</strong> (複数のリポジトリが設定されたプロジェクトで、特定のリポジトリのチェンジセットへのリンク)</li>
+ <li><strong>commit:hg|c6f4d0fd</strong> (ハッシュ値による、特定のリポジトリのチェンジセットへのリンク)</li>
+ <li><strong>sandbox:r758</strong> (他のプロジェクトのチェンジセットへのリンク)</li>
+ <li><strong>sandbox:commit:c6f4d0fd</strong> (ハッシュ値による、他のプロジェクトのチェンジセットへのリンク)</li>
</ul>
</li>
</ul>
<ul>
- <li>Repository files:
+ <li>リポジトリ内のファイル:
<ul>
- <li><strong>source:some/file</strong> (link to the file located at /some/file in the project's repository)</li>
- <li><strong>source:some/file at 52</strong> (link to the file's revision 52)</li>
- <li><strong>source:some/file#L120</strong> (link to line 120 of the file)</li>
- <li><strong>source:some/file at 52#L120</strong> (link to line 120 of the file's revision 52)</li>
- <li><strong>source:"some file at 52#L120"</strong> (use double quotes when the URL contains spaces</li>
- <li><strong>export:some/file</strong> (force the download of the file)</li>
- <li><strong>source:svn1|some/file</strong> (link to a file of a specific repository, for projects with multiple repositories)</li>
- <li><strong>sandbox:source:some/file</strong> (link to the file located at /some/file in the repository of the project "sandbox")</li>
- <li><strong>sandbox:export:some/file</strong> (force the download of the file)</li>
+ <li><strong>source:some/file</strong> (プロジェクトのリポジトリ内の /some/file というファイルへのリンク)</li>
+ <li><strong>source:some/file at 52</strong> (ファイルのリビジョン52へのリンク)</li>
+ <li><strong>source:some/file#L120</strong> (ファイルの120行目へのリンク)</li>
+ <li><strong>source:some/file at 52#L120</strong> (リビジョン52のファイルの120行目へのリンク)</li>
+ <li><strong>source:"some file at 52#L120"</strong> (URLにスペースが含まれる場合はダブルクォーテーションで囲んでください)</li>
+ <li><strong>export:some/file</strong> (ファイルのダウンロードを強制)</li>
+ <li><strong>source:svn1|some/file</strong> (複数のリポジトリが設定されたプロジェクトで、特定のリポジトリのファイルへのリンク)</li>
+ <li><strong>sandbox:source:some/file</strong> ("sandbox" というプロジェクトのリポジトリ上の /some/file というファイルへのリンク)</li>
+ <li><strong>sandbox:export:some/file</strong> (ファイルのダウンロードを強制)</li>
</ul>
</li>
</ul>
<ul>
- <li>Forums:
+ <li>フォーラム:
<ul>
- <li><strong>forum#1</strong> (link to forum with id 1</li>
- <li><strong>forum:Support</strong> (link to forum named Support)</li>
- <li><strong>forum:"Technical Support"</strong> (use double quotes if forum name contains spaces)</li>
+ <li><strong>forum#1</strong> (id 1のフォーラムへのリンク)</li>
+ <li><strong>forum:Support</strong> ("Support"という名称のフォーラムへのリンク)</li>
+ <li><strong>forum:"Technical Support"</strong> (フォーラム名に空白が含まれる場合はダブルクォーテーションで囲んでください)</li>
</ul>
</li>
</ul>
<ul>
- <li>Forum messages:
+ <li>フォーラムのメッセージ:
<ul>
- <li><strong>message#1218</strong> (link to message with id 1218)</li>
+ <li><strong>message#1218</strong> (id 1218のメッセージへのリンク)</li>
</ul>
</li>
</ul>
<ul>
- <li>Projects:
+ <li>プロジェクト:
<ul>
- <li><strong>project#3</strong> (link to project with id 3)</li>
- <li><strong>project:some-project</strong> (link to project with name or slug of "some-project")</li>
- <li><strong>project:"Some Project"</strong> (use double quotes for project name containing spaces)</li>
+ <li><strong>project#3</strong> (id 3のプロジェクトへのリンク)</li>
+ <li><strong>project:someproject</strong> ("someproject"という名称のプロジェクトへのリンク)</li>
+ <li><strong>project:"some project"</strong> (プロジェクト名に空白が含まれる場合はダブルクォーテーションで囲んでください)</li>
</ul>
</li>
</ul>
<ul>
- <li>News:
+ <li>ニュース:
<ul>
- <li><strong>news#2</strong> (link to news item with id 2)</li>
- <li><strong>news:Greetings</strong> (link to news item named "Greetings")</li>
- <li><strong>news:"First Release"</strong> (use double quotes if news item name contains spaces)</li>
+ <li><strong>news#2</strong> (id 2のニュースへのリンク)</li>
+ <li><strong>news:Greetings</strong> ("Greetings"というタイトルのニュースへのリンク)</li>
+ <li><strong>news:"First Release"</strong> (タイトルに空白が含まれる場合はダブルクォーテーションで囲んでください)</li>
</ul>
</li>
</ul>
- <p>Escaping:</p>
+ <p>エスケープ:</p>
<ul>
- <li>You can prevent Redmine links from being parsed by preceding them with an exclamation mark: !</li>
+ <li>テキストをRedmineのリンクとして解釈させたくない場合は感嘆符 ! を前につけてください。</li>
</ul>
- <h3><a name="4" class="wiki-page"></a>External links</h3>
+ <h3><a name="4" class="wiki-page"></a>外部リンク</h3>
- <p>HTTP URLs and email addresses are automatically turned into clickable links:</p>
+ <p>HTTP URLとメールアドレスは自動的にリンクになります:</p>
<pre>
http://www.redmine.org, someone at foo.bar
</pre>
- <p>displays: <a class="external" href="http://www.redmine.org">http://www.redmine.org</a>, <a href="mailto:someone at foo.bar" class="email">someone at foo.bar</a></p>
+ <p>上記記述の表示例です: <a class="external" href="http://www.redmine.org">http://www.redmine.org</a>, <a href="mailto:someone at foo.bar" class="email">someone at foo.bar</a></p>
- <p>If you want to display a specific text instead of the URL, you can use the standard markdown syntax:</p>
+ <p>URLのかわりに別のテキストを表示させたい場合は、通常のMarkdown記法が利用できます:</p>
<pre>
[Redmine web site](http://www.redmine.org)
</pre>
- <p>displays: <a href="http://www.redmine.org" class="external">Redmine web site</a></p>
+ <p>上記記述の表示例です: <a href="http://www.redmine.org" class="external">Redmine web site</a></p>
- <h2><a name="5" class="wiki-page"></a>Text formatting</h2>
+ <h2><a name="5" class="wiki-page"></a>テキストの書式</h2>
- <p>For things such as headlines, bold, tables, lists, Redmine supports Markdown syntax. See <a class="external" href="http://daringfireball.net/projects/markdown/syntax">http://daringfireball.net/projects/markdown/syntax</a> for information on using any of these features. A few samples are included below, but the engine is capable of much more of that.</p>
+ <p>見出し、太字、テーブル、リスト等は、RedmineはMarkdownでの記述に対応しています。Markdownの詳細は <a class="external" href="http://daringfireball.net/projects/markdown/syntax">http://daringfireball.net/projects/markdown/syntax</a> を参照してください。Markdownの一例を以下に示しますが、実際にはここで取り上げた以外の記法にも対応しています。</p>
- <h3><a name="6" class="wiki-page"></a>Font style</h3>
+ <h3><a name="6" class="wiki-page"></a>文字の書式</h3>
<pre>
-* **bold**
-* *Italic*
-* ***bold italic***
-* ~~strike-through~~
+* **太字**
+* *斜体*
+* ***太字で斜体***
+* ~~取り消し線~~
</pre>
- <p>Display:</p>
+ <p>表示例:</p>
<ul>
- <li><strong>bold</strong></li>
- <li><em>italic</em></li>
- <li><em><strong>bold italic</strong></em></li>
- <li><del>strike-through</del></li>
+ <li><strong>太字</strong></li>
+ <li><em>斜体</em></li>
+ <li><em><strong>太字で斜体</strong></em></li>
+ <li><del>取り消し線</del></li>
</ul>
- <h3><a name="7" class="wiki-page"></a>Inline images</h3>
+ <h3><a name="7" class="wiki-page"></a>画像</h3>
<ul>
- <li><strong></strong> displays an image located at image_url (markdown syntax)</li>
- <li>If you have an image attached to your wiki page, it can be displayed inline using its filename: <strong></strong></li>
+ <li><strong></strong> image_urlで指定されたURLの画像を表示 (Markdownの記法)</li>
+ <li>Wikiページに添付された画像があれば、ファイル名を指定して画像を表示させることができます: <strong></strong></li>
</ul>
- <h3><a name="8" class="wiki-page"></a>Headings</h3>
+ <h3><a name="8" class="wiki-page"></a>見出し</h3>
<pre>
# Heading
@@ -226,80 +226,80 @@ http://www.redmine.org, someone at foo.bar
### Subsubheading
</pre>
- <p>Redmine assigns an anchor to each of those headings thus you can link to them with "#Heading", "#Subheading" and so forth.</p>
+ <p>Redmineは見出しにアンカーを設定するので、"#Heading", "#Subheading"のように記述して見出しへのリンクが行えます。</p>
- <h3><a name="10" class="wiki-page"></a>Blockquotes</h3>
+ <h3><a name="10" class="wiki-page"></a>引用</h3>
- <p>Start the paragraph with <strong>></strong></p>
+ <p>段落を <strong>></strong> で開始してください。</p>
<pre>
> Rails is a full-stack framework for developing database-backed web applications according to the Model-View-Control pattern.
To go live, all you need to add is a database and a web server.
</pre>
- <p>Display:</p>
+ <p>表示例:</p>
<blockquote>
<p>Rails is a full-stack framework for developing database-backed web applications according to the Model-View-Control pattern.<br />To go live, all you need to add is a database and a web server.</p>
</blockquote>
- <h3><a name="11" class="wiki-page"></a>Table of content</h3>
+ <h3><a name="11" class="wiki-page"></a>目次</h3>
<pre>
-{{toc}} => left aligned toc
-{{>toc}} => right aligned toc
+{{toc}} => 目次(左寄せ)
+{{>toc}} => 目次(右寄せ)
</pre>
- <h3><a name="14" class="wiki-page"></a>Horizontal Rule</h3>
+ <h3><a name="14" class="wiki-page"></a>区切り線</h3>
<pre>
---
</pre>
- <h2><a name="12" class="wiki-page"></a>Macros</h2>
+ <h2><a name="12" class="wiki-page"></a>マクロ</h2>
- <p>Redmine has the following builtin macros:</p>
+ <p>Redmineには以下の組み込みマクロが用意されています:</p>
<p>
<dl>
<dt><code>hello_world</code></dt>
- <dd><p>Sample macro.</p></dd>
+ <dd><p>サンプルのマクロです。</p></dd>
<dt><code>macro_list</code></dt>
- <dd><p>Displays a list of all available macros, including description if available.</p></dd>
+ <dd><p>利用可能なマクロの一覧を表示します。マクロの説明があればそれも表示します。</p></dd>
<dt><code>child_pages</code></dt>
- <dd><p>Displays a list of child pages. With no argument, it displays the child pages of the current wiki page. Examples:</p>
- <pre><code>{{child_pages}} -- can be used from a wiki page only
-{{child_pages(depth=2)}} -- display 2 levels nesting only</code></pre></dd>
+ <dd><p>子ページの一覧を表示します。引数の指定が無ければ現在のwikiページの子ページを表示します。以下は使用例です:</p>
+ <pre><code>{{child_pages}} -- wikiページでのみ使用可能です
+{{child_pages(depth=2)}} -- 2階層分のみ表示します</code></pre></dd>
<dt><code>include</code></dt>
- <dd><p>Include a wiki page. Example:</p>
+ <dd><p>別のWikiページの内容を挿入します。 以下は使用例です:</p>
<pre><code>{{include(Foo)}}</code></pre>
- <p>or to include a page of a specific project wiki:</p>
+ <p>別プロジェクトのWikiページを挿入することもできます:</p>
<pre><code>{{include(projectname:Foo)}}</code></pre></dd>
<dt><code>collapse</code></dt>
- <dd><p>Inserts of collapsed block of text. Example:</p>
- <pre><code>{{collapse(View details...)
-This is a block of text that is collapsed by default.
-It can be expanded by clicking a link.
+ <dd><p>折り畳まれた状態のテキストを挿入します。以下は使用例です:</p>
+ <pre><code>{{collapse(詳細を表示...)
+この部分はデフォルトでは折り畳まれた状態で表示されます。
+リンクをクリックすると展開されます。
}}</code></pre></dd>
<dt><code>thumbnail</code></dt>
- <dd><p>Displays a clickable thumbnail of an attached image. Examples:</p>
+ <dd><p>添付ファイルのクリック可能なサムネイル画像を表示します。以下は使用例です:</p>
<pre>{{thumbnail(image.png)}}
{{thumbnail(image.png, size=300, title=Thumbnail)}}</pre></dd>
</dl>
</p>
- <h2><a name="13" class="wiki-page"></a>Code highlighting</h2>
+ <h2><a name="13" class="wiki-page"></a>コードハイライト</h2>
- <p>Default code highlightment relies on <a href="http://coderay.rubychan.de/" class="external">CodeRay</a>, a fast syntax highlighting library written completely in Ruby. It currently supports c, clojure, cpp (c++, cplusplus), css, delphi (pascal), diff (patch), erb (eruby, rhtml), go, groovy, haml, html (xhtml), java, javascript (ecmascript, ecma_script, java_script, js), json, lua, php, python, ruby (irb), sass, sql, taskpaper, text (plain, plaintext), xml and yaml (yml) languages, [...]
+ <p>Redmineのコードハイライトは <a href="http://coderay.rubychan.de/" class="external">CodeRay</a> という、Rubyで記述された高速なライブラリを使用しています。現時点では c, clojure, cpp (c++, cplusplus), css, delphi (pascal), diff (patch), erb (eruby, rhtml), go, groovy, haml, html (xhtml), java, javascript (ecmascript, ecma_script, java_script, js), json, lua, php, python, ruby (irb), sass, sql, taskpaper, text (plain, plaintext), xml, yaml (yml) に対応しています。括弧内の名前はコードハイライトの指定時に利用できる別名です。</p>
- <p>You can highlight code at any place that supports wiki formatting using this syntax (note that the language name or alias is case-insensitive):</p>
+ <p>Wiki記法に対応している箇所であればどこでも以下の記述によりコードハイライトが利用できます (言語名・別名では大文字・小文字は区別されません):</p>
<pre>
~~~ ruby
@@ -307,7 +307,7 @@ It can be expanded by clicking a link.
~~~
</pre>
- <p>Example:</p>
+ <p>表示例:</p>
<pre><code class="ruby syntaxhl"><span class="CodeRay"><span class="comment"># The Greeter class</span>
<span class="keyword">class</span> <span class="class">Greeter</span>
diff --git a/public/help/ja/wiki_syntax_markdown.html b/public/help/ja/wiki_syntax_markdown.html
index c6f6eff..4da947d 100644
--- a/public/help/ja/wiki_syntax_markdown.html
+++ b/public/help/ja/wiki_syntax_markdown.html
@@ -20,44 +20,44 @@ table.sample th, table.sample td { border: solid 1px #bbb; padding: 4px; height:
</head>
<body>
-<h1>Wiki Syntax Quick Reference (Markdown)</h1>
+<h1>Wiki記法 クイックリファレンス (Markdown)</h1>
<table style="width:100%">
<tr><th colspan="3">Font Styles</th></tr>
-<tr><th><img src="../../images/jstoolbar/bt_strong.png" style="border: 1px solid #bbb;" alt="Strong" /></th><td style="width:50%;">**Strong**</td><td style="width:50%;"><strong>Strong</strong></td></tr>
-<tr><th><img src="../../images/jstoolbar/bt_em.png" style="border: 1px solid #bbb;" alt="Italic" /></th><td>*Italic*</td><td><em>Italic</em></td></tr>
-<tr><th><img src="../../images/jstoolbar/bt_del.png" style="border: 1px solid #bbb;" alt="Deleted" /></th><td>~~Deleted~~</td><td><del>Deleted</del></td></tr>
-<tr><th><img src="../../images/jstoolbar/bt_code.png" style="border: 1px solid #bbb;" alt="Inline Code" /></th><td>`Inline Code`</td><td><code>Inline Code</code></td></tr>
-<tr><th><img src="../../images/jstoolbar/bt_pre.png" style="border: 1px solid #bbb;" alt="Preformatted text" /></th><td>~~~<br /> lines<br /> of code<br />~~~</td><td>
+<tr><th><img src="../../images/jstoolbar/bt_strong.png" style="border: 1px solid #bbb;" alt="太字" /></th><td style="width:50%;">**太字**</td><td style="width:50%;"><strong>太字</strong></td></tr>
+<tr><th><img src="../../images/jstoolbar/bt_em.png" style="border: 1px solid #bbb;" alt="斜体" /></th><td>*斜体*</td><td><em>斜体</em></td></tr>
+<tr><th><img src="../../images/jstoolbar/bt_del.png" style="border: 1px solid #bbb;" alt="取り消し線" /></th><td>~~取り消し線~~</td><td><del>取り消し線</del></td></tr>
+<tr><th><img src="../../images/jstoolbar/bt_code.png" style="border: 1px solid #bbb;" alt="コード" /></th><td>`コード`</td><td><code>コード</code></td></tr>
+<tr><th><img src="../../images/jstoolbar/bt_pre.png" style="border: 1px solid #bbb;" alt="整形済みテキスト" /></th><td>~~~<br /> 複数行の<br /> コード<br />~~~</td><td>
<pre>
- lines
- of code
+ 複数行の
+ コード
</pre>
</td></tr>
-<tr><th colspan="3">Lists</th></tr>
-<tr><th><img src="../../images/jstoolbar/bt_ul.png" style="border: 1px solid #bbb;" alt="Unordered list" /></th><td>* Item 1<br /> * Sub<br />* Item 2</td><td><ul><li>Item 1<ul><li>Sub</li></ul></li><li>Item 2</li></ul></td></tr>
-<tr><th><img src="../../images/jstoolbar/bt_ol.png" style="border: 1px solid #bbb;" alt="Ordered list" /></th><td>1. Item 1<br /> 1. Sub<br />2. Item 2</td><td><ol><li>Item 1<ol><li>Sub</li></ol></li><li>Item 2</li></ol></td></tr>
+<tr><th colspan="3">リスト</th></tr>
+<tr><th><img src="../../images/jstoolbar/bt_ul.png" style="border: 1px solid #bbb;" alt="リスト" /></th><td>* 項目1<br /> * 下位階層の項目<br />* 項目2</td><td><ul><li>項目1<ul><li>下位階層の項目</li></ul></li><li>項目2</li></ul></td></tr>
+<tr><th><img src="../../images/jstoolbar/bt_ol.png" style="border: 1px solid #bbb;" alt="順序付きリスト" /></th><td>1. 項目1<br /> 1. 下位階層の項目<br />2. 項目2</td><td><ol><li>項目1<ol><li>下位階層の項目</li></ol></li><li>項目2</li></ol></td></tr>
-<tr><th colspan="3">Headings</th></tr>
-<tr><th><img src="../../images/jstoolbar/bt_h1.png" style="border: 1px solid #bbb;" alt="Heading 1" /></th><td># Title 1</td><td><h1>Title 1</h1></td></tr>
-<tr><th><img src="../../images/jstoolbar/bt_h2.png" style="border: 1px solid #bbb;" alt="Heading 2" /></th><td>## Title 2</td><td><h2>Title 2</h2></td></tr>
-<tr><th><img src="../../images/jstoolbar/bt_h3.png" style="border: 1px solid #bbb;" alt="Heading 3" /></th><td>### Title 3</td><td><h3>Title 3</h3></td></tr>
+<tr><th colspan="3">見出し</th></tr>
+<tr><th><img src="../../images/jstoolbar/bt_h1.png" style="border: 1px solid #bbb;" alt="Heading 1" /></th><td># タイトル1</td><td><h1>タイトル1</h1></td></tr>
+<tr><th><img src="../../images/jstoolbar/bt_h2.png" style="border: 1px solid #bbb;" alt="Heading 2" /></th><td>## タイトル2</td><td><h2>タイトル2</h2></td></tr>
+<tr><th><img src="../../images/jstoolbar/bt_h3.png" style="border: 1px solid #bbb;" alt="Heading 3" /></th><td>### タイトル3</td><td><h3>タイトル3</h3></td></tr>
-<tr><th colspan="3">Links</th></tr>
+<tr><th colspan="3">リンク</th></tr>
<tr><th></th><td>http://foo.bar</td><td><a href="#">http://foo.bar</a></td></tr>
<tr><th></th><td>[Foo](http://foo.bar)</td><td><a href="#">Foo</a></td></tr>
-<tr><th colspan="3">Redmine links</th></tr>
-<tr><th><img src="../../images/jstoolbar/bt_link.png" style="border: 1px solid #bbb;" alt="Link to a Wiki page" /></th><td>[[Wiki page]]</td><td><a href="#">Wiki page</a></td></tr>
-<tr><th></th><td>Issue #12</td><td>Issue <a href="#">#12</a></td></tr>
-<tr><th></th><td>Revision r43</td><td>Revision <a href="#">r43</a></td></tr>
+<tr><th colspan="3">Redmine内のリンク</th></tr>
+<tr><th><img src="../../images/jstoolbar/bt_link.png" style="border: 1px solid #bbb;" alt="Wikiページへのリンク" /></th><td>[[Wiki page]]</td><td><a href="#">Wiki page</a></td></tr>
+<tr><th></th><td>チケット #12</td><td>チケット <a href="#">#12</a></td></tr>
+<tr><th></th><td>リビジョン r43</td><td>リビジョン <a href="#">r43</a></td></tr>
<tr><th></th><td>commit:f30e13e43</td><td><a href="#">f30e13e4</a></td></tr>
<tr><th></th><td>source:some/file</td><td><a href="#">source:some/file</a></td></tr>
-<tr><th colspan="3">Inline images</th></tr>
-<tr><th><img src="../../images/jstoolbar/bt_img.png" style="border: 1px solid #bbb;" alt="Image" /></th><td></td><td></td></tr>
-<tr><th></th><td></td><td></td></tr>
+<tr><th colspan="3">画像</th></tr>
+<tr><th><img src="../../images/jstoolbar/bt_img.png" style="border: 1px solid #bbb;" alt="Image" /></th><td></td><td></td></tr>
+<tr><th></th><td></td><td></td></tr>
<tr><th colspan="3">Tables</th></tr>
<tr>
@@ -76,7 +76,7 @@ table.sample th, table.sample td { border: solid 1px #bbb; padding: 4px; height:
</table>
-<p><a href="wiki_syntax_detailed_markdown.html" onclick="window.open('wiki_syntax_detailed_markdown.html', '', ''); return false;">More Information</a></p>
+<p><a href="wiki_syntax_detailed_markdown.html" onclick="window.open('wiki_syntax_detailed_markdown.html', '', ''); return false;">より詳細なリファレンス</a></p>
</body>
</html>
diff --git a/public/help/ru/wiki_syntax_detailed_textile.html b/public/help/ru/wiki_syntax_detailed_textile.html
index c2bde9e..989b334 100644
--- a/public/help/ru/wiki_syntax_detailed_textile.html
+++ b/public/help/ru/wiki_syntax_detailed_textile.html
@@ -39,15 +39,15 @@
<h3><a name="3" class="wiki-page"></a>Ссылки Redmine</h3>
- <p>Redmine allows hyperlinking between resources (issues, changesets, wiki pages...) from anywhere wiki formatting is used.</p>
+ <p>Redmine допускает гиперссылки между ресурсами (задачи, версии, wiki-страницы) отовсюду в wiki-формате.</p>
<ul>
<li>Ссылка на задачу: <strong>#124</strong>
(
<del><a href="#" class="issue"
- title="bulk edit doesn't change the category or fixed version properties (Closed)">#124</a></del>
+ title="крупное редактирование не меняет категорию и свойства исправленной версии (Закрыто)">#124</a></del>
- ссылка зачёркнута, если задача закрыта)
</li>
- <li>Link to an issue note: <strong>#124-6</strong>, or <strong>#124#note-6</strong></li>
+ <li>Ссылка на задачу: <strong>#124-6</strong>, или <strong>#124#note-6</strong></li>
</ul>
<p>Wiki ссылки:</p>
@@ -115,14 +115,14 @@
</ul>
<ul>
- <li>Changesets:
+ <li>Версии:
<ul>
- <li><strong>r758</strong> (link to a changeset)</li>
- <li><strong>commit:c6f4d0fd</strong> (link to a changeset with a non-numeric hash)</li>
- <li><strong>svn1|r758</strong> (link to a changeset of a specific repository, for projects with multiple repositories)</li>
- <li><strong>commit:hg|c6f4d0fd</strong> (link to a changeset with a non-numeric hash of a specific repository)</li>
- <li><strong>sandbox:r758</strong> (link to a changeset of another project)</li>
- <li><strong>sandbox:commit:c6f4d0fd</strong> (link to a changeset with a non-numeric hash of another project)</li>
+ <li><strong>r758</strong> (ссылка на версию)</li>
+ <li><strong>commit:c6f4d0fd</strong> (ссылка неа версию с нецифровым хешем)</li>
+ <li><strong>svn1|r758</strong> (ссылка на версию специфичного хранилища, для проектов лежащих в нескольких хранилищах)</li>
+ <li><strong>commit:hg|c6f4d0fd</strong> (ссылка на версию с нецифровым хешем в специфичном хранилище)</li>
+ <li><strong>sandbox:r758</strong> (ссылка на версию в другом проекте)</li>
+ <li><strong>sandbox:commit:c6f4d0fd</strong> (ссылка на версию с нецифровым хешем в другом проекте)</li>
</ul></li>
</ul>
@@ -134,9 +134,9 @@
<li><strong>source:some/file at 52</strong> (ссылка на 52 ревизию файла)</li>
<li><strong>source:some/file#L120</strong> (ссылка на 120 строку файла)</li>
<li><strong>source:some/file at 52#L120</strong> (ссылка на 120 строку в 52 ревизии файла)</li>
- <li><strong>source:"some file at 52#L120"</strong> (используйте use double quotes when the URL contains spaces</li>
+ <li><strong>source:"some file at 52#L120"</strong> (используйте кавычки, если в ссылке есть пробелы)</li>
<li><strong>export:some/file</strong> (ссылка на загрузку файла)</li>
- <li><strong>source:svn1|some/file</strong> (link to a file of a specific repository, for projects with multiple repositories)</li>
+ <li><strong>source:svn1|some/file</strong> (ссылка на версию специфичного хранилища, для проектов лежащих в нескольких хранилищах)</li>
<li><strong>sandbox:source:some/file</strong> (ссылка на файл /some/file, расположенный в хранилище проекта
"sandbox")
</li>
@@ -145,11 +145,11 @@
</ul>
<ul>
- <li>Forums:
+ <li>Форумы:
<ul>
- <li><strong>forum#1</strong> (link to forum with id 1</li>
- <li><strong>forum:Support</strong> (link to forum named Support)</li>
- <li><strong>forum:"Technical Support"</strong> (use double quotes if forum name contains spaces)</li>
+ <li><strong>forum#1</strong> (ссылка на форум с id 1)</li>
+ <li><strong>forum:Support</strong> (ссылка на форум "Support")</li>
+ <li><strong>forum:"Technical Support"</strong> (используйте кавычки, если в названии есть пробелы)</li>
</ul></li>
</ul>
@@ -165,16 +165,16 @@
<ul>
<li><strong>project#3</strong> (ссылка на проект с id 3)</li>
<li><strong>project:someproject</strong> (ссылка на проект "someproject")</li>
- <li><strong>project:"Some Project"</strong> (use double quotes for project name containing spaces)</li>
+ <li><strong>project:"Some Project"</strong> (используйте кавычки, если в названии есть пробелы)</li>
</ul></li>
</ul>
<ul>
- <li>News:
+ <li>Новости:
<ul>
- <li><strong>news#2</strong> (link to news item with id 2)</li>
- <li><strong>news:Greetings</strong> (link to news item named "Greetings")</li>
- <li><strong>news:"First Release"</strong> (use double quotes if news item name contains spaces)</li>
+ <li><strong>news#2</strong> (ссылка на новость с id 2)</li>
+ <li><strong>news:Greetings</strong> (ссылка на новость "Greetings")</li>
+ <li><strong>news:"First Release"</strong> (используйте кавычки, если в названии есть пробелы)</li>
</ul></li>
</ul>
@@ -308,35 +308,35 @@ bq. Rails - это полноценный, многоуровневый фрей
<dd><p>Выводит список доступных макросов с описаниями, если они имеются.</p></dd>
<dt><code>child_pages</code></dt>
- <dd><p>Displays a list of child pages. With no argument, it displays the child pages of the current wiki page. Examples:</p>
- <pre><code>{{child_pages}} -- can be used from a wiki page only
-{{child_pages(depth=2)}} -- display 2 levels nesting only</code></pre></dd>
+ <dd><p>Вывод списка дочерних страниц. Без аргументов выводится список дочерних страниц для текущей wiki-страницы. Пример:</p>
+ <pre><code>{{child_pages}} -- можно использователь только на wiki-странице
+{{child_pages(depth=2)}} -- вывести только 2 уровня вложенности</code></pre></dd>
<dt><code>include</code></dt>
- <dd><p>Вставить wiki страницу. Пример:</p>
+ <dd><p>Вставить wiki-страницу. Пример:</p>
<pre><code>{{include(Foo)}}</code></pre>
- <p>or to include a page of a specific project wiki:</p>
+ <p>или вставить сраницу wiki конкретного проекта:</p>
<pre><code>{{include(projectname:Foo)}}</code></pre></dd>
<dt><code>collapse</code></dt>
- <dd><p>Inserts of collapsed block of text. Example:</p>
- <pre><code>{{collapse(View details...)
-This is a block of text that is collapsed by default.
-It can be expanded by clicking a link.
+ <dd><p>Вставить скрываемый текст. Пример:</p>
+ <pre><code>{{collapse(Читать дальше...)
+Этот блок текста по умолчанию скрыт.
+Он расскроется, если нажать на ссылку.
}}</code></pre></dd>
<dt><code>thumbnail</code></dt>
- <dd><p>Displays a clickable thumbnail of an attached image. Examples:</p>
+ <dd><p>Отображет кликабельный эскиз приложенной картинки. Пример:</p>
<pre>{{thumbnail(image.png)}}
-{{thumbnail(image.png, size=300, title=Thumbnail)}}</pre></dd>
+{{thumbnail(image.png, size=300, title=Эскиз)}}</pre></dd>
</dl>
</p>
<h2><a name="13" class="wiki-page"></a>Подсветка кода</h2>
- <p>Default code highlightment relies on <a href="http://coderay.rubychan.de/" class="external">CodeRay</a>, a fast syntax highlighting library written completely in Ruby. It currently supports c, clojure, cpp (c++, cplusplus), css, delphi (pascal), diff (patch), erb (eruby, rhtml), go, groovy, haml, html (xhtml), java, javascript (ecmascript, ecma_script, java_script, js), json, lua, php, python, ruby (irb), sass, sql, taskpaper, text (plain, plaintext), xml and yaml (yml) languages, [...]
+ <p>По умолчанию за подсветку код отвечает <a href="http://coderay.rubychan.de/" class="external">CodeRay</a>, и для лучшей производительности библиотеки написаны на Ruby. Сейчас поддерживаются c, clojure, cpp (c++, cplusplus), css, delphi (pascal), diff (patch), erb (eruby, rhtml), go, groovy, haml, html (xhtml), java, javascript (ecmascript, ecma_script, java_script, js), json, lua, php, python, ruby (irb), sass, sql, taskpaper, text (plain, plaintext), xml and yaml (yml) языки.</p>
-<p>You can highlight code at any place that supports wiki formatting using this syntax (note that the language name or alias is case-insensitive):</p>
+<p>Вы можете подсветить код в любом месте, где поддерживается wiki-форматирование (название языка не зависит от регистра):</p>
<pre>
<pre><code class="ruby">
diff --git a/public/help/ru/wiki_syntax_textile.html b/public/help/ru/wiki_syntax_textile.html
index ae3e694..cca33f0 100644
--- a/public/help/ru/wiki_syntax_textile.html
+++ b/public/help/ru/wiki_syntax_textile.html
@@ -71,8 +71,8 @@ table.sample th, table.sample td { border: solid 1px #bbb; padding: 4px; height:
</td>
</tr>
<tr><th colspan="3">Списки</th></tr>
-<tr><th><img src="../../images/jstoolbar/bt_ul.png" style="border: 1px solid #bbb;" alt="Несортированный список" /></th><td>* Элемент 1<br />** Sub<br />* Элемент 2</td><td><ul><li>Элемент 1<ul><li>Sub</li></ul></li><li>Элемент 2</li></ul></td></tr>
-<tr><th><img src="../../images/jstoolbar/bt_ol.png" style="border: 1px solid #bbb;" alt="Сортированный список" /></th><td># Элемент 1<br />## Sub<br /># Элемент 2</td><td><ol><li>Элемент 1<ol><li>Sub</li></ol></li><li>Элемент 2</li></ol></td></tr>
+<tr><th><img src="../../images/jstoolbar/bt_ul.png" style="border: 1px solid #bbb;" alt="Несортированный список" /></th><td>* Элемент 1<br />** Подэлемент<br />* Элемент 2</td><td><ul><li>Элемент 1<ul><li>Подэлемент</li></ul></li><li>Элемент 2</li></ul></td></tr>
+<tr><th><img src="../../images/jstoolbar/bt_ol.png" style="border: 1px solid #bbb;" alt="Сортированный список" /></th><td># Элемент 1<br />## Подэлемент<br /># Элемент 2</td><td><ol><li>Элемент 1<ol><li>Подэлемент</li></ol></li><li>Элемент 2</li></ol></td></tr>
<tr>
<th colspan="3">Заголовки</th>
</tr>
diff --git a/public/help/zh/wiki_syntax_detailed_textile.html b/public/help/zh/wiki_syntax_detailed_textile.html
index 09f3210..c0ee179 100644
--- a/public/help/zh/wiki_syntax_detailed_textile.html
+++ b/public/help/zh/wiki_syntax_detailed_textile.html
@@ -33,273 +33,273 @@
</head>
<body>
-<h1><a name="1" class="wiki-page"></a>Wiki formatting</h1>
+<h1><a name="1" class="wiki-page"></a>Wiki 文本格式</h1>
- <h2><a name="2" class="wiki-page"></a>Links</h2>
+ <h2><a name="2" class="wiki-page"></a>链接</h2>
- <h3><a name="3" class="wiki-page"></a>Redmine links</h3>
+ <h3><a name="3" class="wiki-page"></a>Redmine 链接</h3>
- <p>Redmine allows hyperlinking between resources (issues, changesets, wiki pages...) from anywhere wiki formatting is used.</p>
+ <p>在任何使用文本格式的地方，Redmine都允许在资源（问题、变更、wiki页面...）间建立超链接。</p>
<ul>
- <li>Link to an issue: <strong>#124</strong> (displays <del><a href="#" class="issue" title="bulk edit doesn't change the category or fixed version properties (Closed)">#124</a></del>, link is striked-through if the issue is closed)</li>
- <li>Link to an issue note: <strong>#124-6</strong>, or <strong>#124#note-6</strong></li>
+ <li>链接至一个问题： <strong>#124</strong> (显示 <del><a href="#" class="issue" title="bulk edit doesn't change the category or fixed version properties (Closed)">#124</a></del>，若该问题已结束则会用删除线来表示)</li>
+ <li>链接至一个问题的说明： <strong>#124-6</strong>, 或者 <strong>#124#note-6</strong></li>
</ul>
- <p>Wiki links:</p>
+ <p>Wiki链接</p>
<ul>
- <li><strong>[[Guide]]</strong> displays a link to the page named 'Guide': <a href="#" class="wiki-page">Guide</a></li>
- <li><strong>[[Guide#further-reading]]</strong> takes you to the anchor "further-reading". Headings get automatically assigned anchors so that you can refer to them: <a href="#" class="wiki-page">Guide</a></li>
- <li><strong>[[Guide|User manual]]</strong> displays a link to the same page but with a different text: <a href="#" class="wiki-page">User manual</a></li>
+ <li><strong>[[Guide]]</strong> 显示一个页面名为'Guide'的链接： <a href="#" class="wiki-page">Guide</a></li>
+ <li><strong>[[Guide#further-reading]]</strong> 链接到页面内的"further-reading"标签. 每个标题都会自动绑定一个标签，方便您进行链接: <a href="#" class="wiki-page">Guide</a></li>
+ <li><strong>[[Guide|User manual]]</strong> 使用不同的文字来显示一个页面名称为'Guide'的链接： <a href="#" class="wiki-page">User manual</a></li>
</ul>
- <p>You can also link to pages of an other project wiki:</p>
+ <p>您也可以链接到其他项目的Wiki页面（使用项目标识）：</p>
<ul>
- <li><strong>[[sandbox:some page]]</strong> displays a link to the page named 'Some page' of the Sandbox wiki</li>
- <li><strong>[[sandbox:]]</strong> displays a link to the Sandbox wiki main page</li>
+ <li><strong>[[sandbox:some page]]</strong> 显示Sandbox项目wiki页面的一个名为'Some page'的链接</li>
+ <li><strong>[[sandbox:]]</strong> 显示Sandbox项目wiki首页的链接</li>
</ul>
- <p>Wiki links are displayed in red if the page doesn't exist yet, eg: <a href="#" class="wiki-page new">Nonexistent page</a>.</p>
+ <p>当页面不存在的时候，Wiki链接会以红色来显示，例如： <a href="#" class="wiki-page new">Nonexistent page</a>.</p>
- <p>Links to other resources:</p>
+ <p>链接至其他资源：</p>
<ul>
- <li>Documents:
+ <li>文档：
<ul>
- <li><strong>document#17</strong> (link to document with id 17)</li>
- <li><strong>document:Greetings</strong> (link to the document with title "Greetings")</li>
- <li><strong>document:"Some document"</strong> (double quotes can be used when document title contains spaces)</li>
- <li><strong>sandbox:document:"Some document"</strong> (link to a document with title "Some document" in other project "sandbox")</li>
+ <li><strong>document#17</strong> (链接到id为17的文档)</li>
+ <li><strong>document:Greetings</strong> (链接到标题为“Greeting”的文档)</li>
+ <li><strong>document:"Some document"</strong> (文档标题包含空格时使用双引号来表示)</li>
+ <li><strong>sandbox:document:"Some document"</strong> (链接至sandbox项目中标题为“Some document”的文档)</li>
</ul></li>
</ul>
<ul>
- <li>Versions:
+ <li>版本：
<ul>
- <li><strong>version#3</strong> (link to version with id 3)</li>
- <li><strong>version:1.0.0</strong> (link to version named "1.0.0")</li>
- <li><strong>version:"1.0 beta 2"</strong></li>
- <li><strong>sandbox:version:1.0.0</strong> (link to version "1.0.0" in the project "sandbox")</li>
+ <li><strong>version#3</strong> (链接至id为3的版本)</li>
+ <li><strong>version:1.0.0</strong> (链接到名称为“1.0.0”的版本)</li>
+ <li><strong>version:"1.0 beta 2"</strong>(版本名称包含空格时使用双引号来表示)</li>
+ <li><strong>sandbox:version:1.0.0</strong> (连接至sandbox项目中的“1.0.0”版本)</li>
</ul></li>
</ul>
<ul>
- <li>Attachments:
+ <li>附件：
<ul>
- <li><strong>attachment:file.zip</strong> (link to the attachment of the current object named file.zip)</li>
- <li>For now, attachments of the current object can be referenced only (if you're on an issue, it's possible to reference attachments of this issue only)</li>
+ <li><strong>attachment:file.zip</strong> (链接至当前页面下名为file.zip的附件)</li>
+ <li>目前，只有当前页面下的附件能够被引用（如果您在一个问题中，则仅可以引用此问题下的附件）</li>
</ul></li>
</ul>
<ul>
- <li>Changesets:
+ <li>变更集：
<ul>
- <li><strong>r758</strong> (link to a changeset)</li>
- <li><strong>commit:c6f4d0fd</strong> (link to a changeset with a non-numeric hash)</li>
- <li><strong>svn1|r758</strong> (link to a changeset of a specific repository, for projects with multiple repositories)</li>
- <li><strong>commit:hg|c6f4d0fd</strong> (link to a changeset with a non-numeric hash of a specific repository)</li>
- <li><strong>sandbox:r758</strong> (link to a changeset of another project)</li>
- <li><strong>sandbox:commit:c6f4d0fd</strong> (link to a changeset with a non-numeric hash of another project)</li>
+ <li><strong>r758</strong> (链接至一个变更集)</li>
+ <li><strong>commit:c6f4d0fd</strong> (链接至一个非数字哈希的变更集)</li>
+ <li><strong>svn1|r758</strong> (链接至指定版本库中的变更集，用于使用多个版本库的项目)</li>
+ <li><strong>commit:hg|c6f4d0fd</strong> (链接至指定版本库中，使用非数字哈希的变更集，此例子中是"hg"版本库下的哈希变更集)</li>
+ <li><strong>sandbox:r758</strong> (链接至其他项目的变更集)</li>
+ <li><strong>sandbox:commit:c6f4d0fd</strong> (链接至其他项目中，使用非数字哈希的变更集)</li>
</ul></li>
</ul>
<ul>
- <li>Repository files:
+ <li>版本库文件:
<ul>
- <li><strong>source:some/file</strong> (link to the file located at /some/file in the project's repository)</li>
- <li><strong>source:some/file at 52</strong> (link to the file's revision 52)</li>
- <li><strong>source:some/file#L120</strong> (link to line 120 of the file)</li>
- <li><strong>source:some/file at 52#L120</strong> (link to line 120 of the file's revision 52)</li>
- <li><strong>source:"some file at 52#L120"</strong> (use double quotes when the URL contains spaces</li>
- <li><strong>export:some/file</strong> (force the download of the file)</li>
- <li><strong>source:svn1|some/file</strong> (link to a file of a specific repository, for projects with multiple repositories)</li>
- <li><strong>sandbox:source:some/file</strong> (link to the file located at /some/file in the repository of the project "sandbox")</li>
- <li><strong>sandbox:export:some/file</strong> (force the download of the file)</li>
+ <li><strong>source:some/file</strong> (链接至项目版本库中位于/some/file的文件)</li>
+ <li><strong>source:some/file at 52</strong> (链接至此文件的第52版)</li>
+ <li><strong>source:some/file#L120</strong> (链接至此文件的第120行)</li>
+ <li><strong>source:some/file at 52#L120</strong> (链接至此文件的第52版的第120行)</li>
+ <li><strong>source:"some file at 52#L120"</strong> (当URL中包含空格时使用双引号来表示)</li>
+ <li><strong>export:some/file</strong> (强制下载此文件，而不是在页面上查看)</li>
+ <li><strong>source:svn1|some/file</strong> (链接至指定版本库中的文件, 用于使用多个版本库的项目)</li>
+ <li><strong>sandbox:source:some/file</strong> (链接至"sandbox"项目的版本库中位于/some/file的文件)</li>
+ <li><strong>sandbox:export:some/file</strong> (强制下载"sandbox"项目的版本库中位于/some/file的文件，而不是在页面上查看)</li>
</ul></li>
</ul>
<ul>
- <li>Forums:
+ <li>论坛：
<ul>
- <li><strong>forum#1</strong> (link to forum with id 1</li>
- <li><strong>forum:Support</strong> (link to forum named Support)</li>
- <li><strong>forum:"Technical Support"</strong> (use double quotes if forum name contains spaces)</li>
+ <li><strong>forum#1</strong> (链接至id为2的论坛)</li>
+ <li><strong>forum:Support</strong> (链接至名称为"Support"的论坛)</li>
+ <li><strong>forum:"Technical Support"</strong> (论坛名称包含空格时使用双引号表示)</li>
</ul></li>
</ul>
<ul>
- <li>Forum messages:
+ <li>论坛消息：
<ul>
- <li><strong>message#1218</strong> (link to message with id 1218)</li>
+ <li><strong>message#1218</strong> (链接至id为1218的论坛消息)</li>
</ul></li>
</ul>
<ul>
- <li>Projects:
+ <li>项目:
<ul>
- <li><strong>project#3</strong> (link to project with id 3)</li>
- <li><strong>project:some-project</strong> (link to project with name or slug of "some-project")</li>
- <li><strong>project:"Some Project"</strong> (use double quotes for project name containing spaces)</li>
+ <li><strong>project#3</strong> (链接至id为3的项目)</li>
+ <li><strong>project:someproject</strong> (链接至名称为"someproject"的项目)</li>
+ <li><strong>project:"Some Project"</strong> (项目名称包含空格时，使用双引号来表示)</li>
</ul></li>
</ul>
<ul>
- <li>News:
+ <li>新闻:
<ul>
- <li><strong>news#2</strong> (link to news item with id 2)</li>
- <li><strong>news:Greetings</strong> (link to news item named "Greetings")</li>
- <li><strong>news:"First Release"</strong> (use double quotes if news item name contains spaces)</li>
+ <li><strong>news#2</strong> (链接至id为1的新闻)</li>
+ <li><strong>news:Greetings</strong> (链接至名称为"Greetings"的新闻)</li>
+ <li><strong>news:"First Release"</strong> (新闻名称包含空格时，使用双引号来表示)</li>
</ul></li>
</ul>
- <p>Escaping:</p>
+ <p>转义字符：</p>
<ul>
- <li>You can prevent Redmine links from being parsed by preceding them with an exclamation mark: !</li>
+ <li>您可以在文本的前面加上感叹号(!)来避免该文本被解析成Redmine链接</li>
</ul>
- <h3><a name="4" class="wiki-page"></a>External links</h3>
+ <h3><a name="4" class="wiki-page"></a>外部链接</h3>
- <p>HTTP URLs and email addresses are automatically turned into clickable links:</p>
+ <p>HTTP链接和Email地址可以被自动转换成可点击的链接： </p>
<pre>
http://www.redmine.org, someone at foo.bar
</pre>
- <p>displays: <a class="external" href="http://www.redmine.org">http://www.redmine.org</a>, <a href="mailto:someone at foo.bar" class="email">someone at foo.bar</a></p>
+ <p>显示为： <a class="external" href="http://www.redmine.org">http://www.redmine.org</a>, <a href="mailto:someone at foo.bar" class="email">someone at foo.bar</a></p>
- <p>If you want to display a specific text instead of the URL, you can use the standard textile syntax:</p>
+ <p>如果您想要显示指定的文本而不是链接,您可以通过下列标准的 textile 语法:</p>
<pre>
-"Redmine web site":http://www.redmine.org
+"Redmine 官网":http://www.redmine.org
</pre>
- <p>displays: <a href="http://www.redmine.org" class="external">Redmine web site</a></p>
+ <p>显示为： <a href="http://www.redmine.org" class="external">Redmine 官网</a></p>
- <h2><a name="5" class="wiki-page"></a>Text formatting</h2>
+ <h2><a name="5" class="wiki-page"></a>字体格式</h2>
- <p>For things such as headlines, bold, tables, lists, Redmine supports Textile syntax. See <a class="external" href="http://en.wikipedia.org/wiki/Textile_%28markup_language%29">http://en.wikipedia.org/wiki/Textile_(markup_language)</a> for information on using any of these features. A few samples are included below, but the engine is capable of much more of that.</p>
+ <p>对于像是标题、粗体、表格、列表等文字格式， Redmine 支持使用 <a class="external" href="http://en.wikipedia.org/wiki/Textile_%28markup_language%29">http://en.wikipedia.org/wiki/Textile_(markup_language)</a> 查找关于使用这些特性的信息。下面将展示其中的一些常用的语法。</p>
- <h3><a name="6" class="wiki-page"></a>Font style</h3>
+ <h3><a name="6" class="wiki-page"></a>字体风格</h3>
<pre>
-* *bold*
-* _italic_
-* _*bold italic*_
-* +underline+
-* -strike-through-
+* *粗体*
+* _斜体_
+* _*粗体 斜体*_
+* +下划线+
+* -中划线-
</pre>
- <p>Display:</p>
+ <p>显示为:</p>
<ul>
- <li><strong>bold</strong></li>
- <li><em>italic</em></li>
- <li><em><strong>bold italic</strong></em></li>
- <li><ins>underline</ins></li>
- <li><del>strike-through</del></li>
+ <li><strong>粗体</strong></li>
+ <li><em>斜体</em></li>
+ <li><em><strong>粗体 斜体</strong></em></li>
+ <li><ins>下划线</ins></li>
+ <li><del>中划线</del></li>
</ul>
- <h3><a name="7" class="wiki-page"></a>Inline images</h3>
+ <h3><a name="7" class="wiki-page"></a>内嵌图片</h3>
<ul>
<li><strong>!image_url!</strong> displays an image located at image_url (textile syntax)</li>
<li><strong>!>image_url!</strong> right floating image</li>
- <li>If you have an image attached to your wiki page, it can be displayed inline using its filename: <strong>!attached_image.png!</strong></li>
+ <li>你可以上传图片附件到 wiki 页面，然后使用它的文件名作为路径： <strong>!已上传的图片.png!</strong></li>
</ul>
- <h3><a name="8" class="wiki-page"></a>Headings</h3>
+ <h3><a name="8" class="wiki-page"></a>标题</h3>
<pre>
-h1. Heading
-h2. Subheading
-h3. Subsubheading
+h1. 一级标题
+h2. 二级标题
+h3. 三级标题
</pre>
- <p>Redmine assigns an anchor to each of those headings thus you can link to them with "#Heading", "#Subheading" and so forth.</p>
+ <p>你可以使用“#一级标题”、“#二级标题”等等来链接到这些标题</p>
- <h3><a name="9" class="wiki-page"></a>Paragraphs</h3>
+ <h3><a name="9" class="wiki-page"></a>段落</h3>
<pre>
-p>. right aligned
-p=. centered
+p>. 向右对齐
+p=. 居中
</pre>
- <p style="text-align:center;">This is a centered paragraph.</p>
+ <p style="text-align:center;">这是一个居中对齐的段落</p>
- <h3><a name="10" class="wiki-page"></a>Blockquotes</h3>
+ <h3><a name="10" class="wiki-page"></a>引用文字</h3>
- <p>Start the paragraph with <strong>bq.</strong></p>
+ <p>在段落前加上 <strong>bq.</strong></p>
<pre>
bq. Rails is a full-stack framework for developing database-backed web applications according to the Model-View-Control pattern.
To go live, all you need to add is a database and a web server.
</pre>
- <p>Display:</p>
+ <p>显示为：</p>
<blockquote>
<p>Rails is a full-stack framework for developing database-backed web applications according to the Model-View-Control pattern.<br />To go live, all you need to add is a database and a web server.</p>
</blockquote>
- <h3><a name="11" class="wiki-page"></a>Table of content</h3>
+ <h3><a name="11" class="wiki-page"></a>目录</h3>
<pre>
-{{toc}} => left aligned toc
-{{>toc}} => right aligned toc
+{{toc}} => 靠左对齐目录
+{{>toc}} => 靠右对齐目录
</pre>
- <h3><a name="14" class="wiki-page"></a>Horizontal Rule</h3>
+ <h3><a name="14" class="wiki-page"></a>水平线</h3>
<pre>
---
</pre>
- <h2><a name="12" class="wiki-page"></a>Macros</h2>
+ <h2><a name="12" class="wiki-page"></a>宏</h2>
- <p>Redmine has the following builtin macros:</p>
+ <p>Redmine内建了以下宏:</p>
<p>
<dl>
<dt><code>hello_world</code></dt>
- <dd><p>Sample macro.</p></dd>
+ <dd><p>宏示例.</p></dd>
<dt><code>macro_list</code></dt>
- <dd><p>Displays a list of all available macros, including description if available.</p></dd>
+ <dd><p>显示所有可用的宏列表，如果该宏有提供说明也会一并显示。</p></dd>
<dt><code>child_pages</code></dt>
- <dd><p>Displays a list of child pages. With no argument, it displays the child pages of the current wiki page. Examples:</p>
- <pre><code>{{child_pages}} -- can be used from a wiki page only
-{{child_pages(depth=2)}} -- display 2 levels nesting only</code></pre></dd>
+ <dd><p>显示一个子页面列表。默认显示当前Wiki页面的所有子页面。 示例：</p>
+ <pre><code>{{child_pages}} -- 只能在Wiki页面调用
+{{child_pages(depth=2)}} -- 显示两级子页面</code></pre></dd>
<dt><code>include</code></dt>
- <dd><p>Include a wiki page. Example:</p>
+ <dd><p>引用一个Wiki页面。示例：</p>
<pre><code>{{include(Foo)}}</code></pre>
- <p>or to include a page of a specific project wiki:</p>
+ <p>或者引用一个指定项目的Wiki页面：</p>
<pre><code>{{include(projectname:Foo)}}</code></pre></dd>
<dt><code>collapse</code></dt>
- <dd><p>Inserts of collapsed block of text. Example:</p>
+ <dd><p>插入一个折叠文本块。示例：</p>
<pre><code>{{collapse(View details...)
-This is a block of text that is collapsed by default.
-It can be expanded by clicking a link.
+这是一个默认折叠的文本块。
+点击链接后将会展开此文本块.
}}</code></pre></dd>
<dt><code>thumbnail</code></dt>
- <dd><p>Displays a clickable thumbnail of an attached image. Examples:</p>
+ <dd><p>显示一个图像附件的可点击缩略图。示例:</p>
<pre>{{thumbnail(image.png)}}
{{thumbnail(image.png, size=300, title=Thumbnail)}}</pre></dd>
</dl>
</p>
- <h2><a name="13" class="wiki-page"></a>Code highlighting</h2>
+ <h2><a name="13" class="wiki-page"></a>代码高亮</h2>
<p>Default code highlightment relies on <a href="http://coderay.rubychan.de/" class="external">CodeRay</a>, a fast syntax highlighting library written completely in Ruby. It currently supports c, clojure, cpp (c++, cplusplus), css, delphi (pascal), diff (patch), erb (eruby, rhtml), go, groovy, haml, html (xhtml), java, javascript (ecmascript, ecma_script, java_script, js), json, lua, php, python, ruby (irb), sass, sql, taskpaper, text (plain, plaintext), xml and yaml (yml) languages, [...]
@@ -307,11 +307,11 @@ It can be expanded by clicking a link.
<pre>
<pre><code class="ruby">
- Place your code here.
+ 这里写 Ruby 代码
</code></pre>
</pre>
- <p>Example:</p>
+ <p>示例：</p>
<pre><code class="ruby syntaxhl"><span class="CodeRay"><span class="comment"># The Greeter class</span>
<span class="keyword">class</span> <span class="class">Greeter</span>
diff --git a/public/help/zh/wiki_syntax_textile.html b/public/help/zh/wiki_syntax_textile.html
index 55a900d..c077f75 100644
--- a/public/help/zh/wiki_syntax_textile.html
+++ b/public/help/zh/wiki_syntax_textile.html
@@ -20,48 +20,48 @@ table.sample th, table.sample td { border: solid 1px #bbb; padding: 4px; height:
</head>
<body>
-<h1>Wiki Syntax Quick Reference</h1>
+<h1>Wiki 语法快速参考</h1>
<table style="width:100%">
-<tr><th colspan="3">Font Styles</th></tr>
-<tr><th><img src="../../images/jstoolbar/bt_strong.png" style="border: 1px solid #bbb;" alt="Strong" /></th><td style="width:50%;">*Strong*</td><td style="width:50%;"><strong>Strong</strong></td></tr>
-<tr><th><img src="../../images/jstoolbar/bt_em.png" style="border: 1px solid #bbb;" alt="Italic" /></th><td>_Italic_</td><td><em>Italic</em></td></tr>
-<tr><th><img src="../../images/jstoolbar/bt_ins.png" style="border: 1px solid #bbb;" alt="Underline" /></th><td>+Underline+</td><td><ins>Underline</ins></td></tr>
-<tr><th><img src="../../images/jstoolbar/bt_del.png" style="border: 1px solid #bbb;" alt="Deleted" /></th><td>-Deleted-</td><td><del>Deleted</del></td></tr>
-<tr><th></th><td>??Quote??</td><td><cite>Quote</cite></td></tr>
-<tr><th><img src="../../images/jstoolbar/bt_code.png" style="border: 1px solid #bbb;" alt="Inline Code" /></th><td>@Inline Code@</td><td><code>Inline Code</code></td></tr>
-<tr><th><img src="../../images/jstoolbar/bt_pre.png" style="border: 1px solid #bbb;" alt="Preformatted text" /></th><td><pre><br /> lines<br /> of code<br /></pre></td><td>
+<tr><th colspan="3">字体风格</th></tr>
+<tr><th><img src="../../images/jstoolbar/bt_strong.png" style="border: 1px solid #bbb;" alt="粗体" /></th><td style="width:50%;">*粗体*</td><td style="width:50%;"><strong>粗体</strong></td></tr>
+<tr><th><img src="../../images/jstoolbar/bt_em.png" style="border: 1px solid #bbb;" alt="斜体" /></th><td>_Italic_</td><td><em>斜体</em></td></tr>
+<tr><th><img src="../../images/jstoolbar/bt_ins.png" style="border: 1px solid #bbb;" alt="下划线" /></th><td>+下划线+</td><td><ins>下划线</ins></td></tr>
+<tr><th><img src="../../images/jstoolbar/bt_del.png" style="border: 1px solid #bbb;" alt="删除线" /></th><td>-删除线-</td><td><del>删除线</del></td></tr>
+<tr><th></th><td>??引用??</td><td><cite>引用</cite></td></tr>
+<tr><th><img src="../../images/jstoolbar/bt_code.png" style="border: 1px solid #bbb;" alt="内嵌程序代码" /></th><td>@内嵌程序代码@</td><td><code>内嵌程序代码</code></td></tr>
+<tr><th><img src="../../images/jstoolbar/bt_pre.png" style="border: 1px solid #bbb;" alt="预先格式化的段落" /></th><td><pre><br /> 格式化<br /> 的段落<br /></pre></td><td>
<pre>
- lines
- of code
+ 格式化
+ 的段落
</pre>
</td></tr>
-<tr><th colspan="3">Lists</th></tr>
-<tr><th><img src="../../images/jstoolbar/bt_ul.png" style="border: 1px solid #bbb;" alt="Unordered list" /></th><td>* Item 1<br />** Sub<br />* Item 2</td><td><ul><li>Item 1<ul><li>Sub</li></ul></li><li>Item 2</li></ul></td></tr>
-<tr><th><img src="../../images/jstoolbar/bt_ol.png" style="border: 1px solid #bbb;" alt="Ordered list" /></th><td># Item 1<br />## Sub<br /># Item 2</td><td><ol><li>Item 1<ol><li>Sub</li></ol></li><li>Item 2</li></ol></td></tr>
+<tr><th colspan="3">列表</th></tr>
+<tr><th><img src="../../images/jstoolbar/bt_ul.png" style="border: 1px solid #bbb;" alt="不排序列表" /></th><td>* 列表项 1<br />** Sub<br />* 列表项 2</td><td><ul><li>列表项 1<ul><li>子项</li></ul></li><li>列表项 2</li></ul></td></tr>
+<tr><th><img src="../../images/jstoolbar/bt_ol.png" style="border: 1px solid #bbb;" alt="排序列表" /></th><td># 列表项 1<br />## Sub<br /># 列表项 2</td><td><ol><li>列表项 1<ol><li>子项</li></ol></li><li>列表项 2</li></ol></td></tr>
-<tr><th colspan="3">Headings</th></tr>
-<tr><th><img src="../../images/jstoolbar/bt_h1.png" style="border: 1px solid #bbb;" alt="Heading 1" /></th><td>h1. Title 1</td><td><h1>Title 1</h1></td></tr>
-<tr><th><img src="../../images/jstoolbar/bt_h2.png" style="border: 1px solid #bbb;" alt="Heading 2" /></th><td>h2. Title 2</td><td><h2>Title 2</h2></td></tr>
-<tr><th><img src="../../images/jstoolbar/bt_h3.png" style="border: 1px solid #bbb;" alt="Heading 3" /></th><td>h3. Title 3</td><td><h3>Title 3</h3></td></tr>
+<tr><th colspan="3">标题</th></tr>
+<tr><th><img src="../../images/jstoolbar/bt_h1.png" style="border: 1px solid #bbb;" alt="标题 1" /></th><td>h1. 标题 1</td><td><h1>标题 1</h1></td></tr>
+<tr><th><img src="../../images/jstoolbar/bt_h2.png" style="border: 1px solid #bbb;" alt="标题 2" /></th><td>h2. 标题 2</td><td><h2>标题 2</h2></td></tr>
+<tr><th><img src="../../images/jstoolbar/bt_h3.png" style="border: 1px solid #bbb;" alt="标题 3" /></th><td>h3. 标题 3</td><td><h3>标题 3</h3></td></tr>
-<tr><th colspan="3">Links</th></tr>
+<tr><th colspan="3">链接</th></tr>
<tr><th></th><td>http://foo.bar</td><td><a href="#">http://foo.bar</a></td></tr>
<tr><th></th><td>"Foo":http://foo.bar</td><td><a href="#">Foo</a></td></tr>
-<tr><th colspan="3">Redmine links</th></tr>
-<tr><th><img src="../../images/jstoolbar/bt_link.png" style="border: 1px solid #bbb;" alt="Link to a Wiki page" /></th><td>[[Wiki page]]</td><td><a href="#">Wiki page</a></td></tr>
-<tr><th></th><td>Issue #12</td><td>Issue <a href="#">#12</a></td></tr>
-<tr><th></th><td>Revision r43</td><td>Revision <a href="#">r43</a></td></tr>
-<tr><th></th><td>commit:f30e13e43</td><td><a href="#">f30e13e4</a></td></tr>
-<tr><th></th><td>source:some/file</td><td><a href="#">source:some/file</a></td></tr>
+<tr><th colspan="3">Redmine 链接</th></tr>
+<tr><th><img src="../../images/jstoolbar/bt_link.png" style="border: 1px solid #bbb;" alt="链接到一个Wiki 页面" /></th><td>[[Wiki 页面]]</td><td><a href="#">Wiki 页面</a></td></tr>
+<tr><th></th><td>问题 #12</td><td>问题 <a href="#">#12</a></td></tr>
+<tr><th></th><td>修订 r43</td><td>修订 <a href="#">r43</a></td></tr>
+<tr><th></th><td>commit:f30e13e43</td><td>提交: <a href="#">f30e13e4</a></td></tr>
+<tr><th></th><td>source:some/file</td><td>代码：<a href="#">source:some/file</a></td></tr>
-<tr><th colspan="3">Inline images</th></tr>
+<tr><th colspan="3">内嵌图片</th></tr>
<tr><th><img src="../../images/jstoolbar/bt_img.png" style="border: 1px solid #bbb;" alt="Image" /></th><td>!<em>image_url</em>!</td><td></td></tr>
<tr><th></th><td>!<em>attached_image</em>!</td><td></td></tr>
-<tr><th colspan="3">Tables</th></tr>
+<tr><th colspan="3">表格</th></tr>
<tr>
<th></th>
<td>|_. A |_. B |_. C |<br />| A | B | C |<br />|/2. row span | B | C |<br />|\2. col span |</td>
@@ -70,8 +70,8 @@ table.sample th, table.sample td { border: solid 1px #bbb; padding: 4px; height:
<tbody>
<th>A</th><th>B</th><th>C</th>
<tr><td>A</td><td>B</td><td>C</td></tr>
- <tr><td rowspan="2">row span</td><td>B</td><td>C</td></tr>
- <tr><td colspan="2">col span</td></tr>
+ <tr><td rowspan="2">行合并</td><td>B</td><td>C</td></tr>
+ <tr><td colspan="2">列合并</td></tr>
</tbody>
</table>
</td>
@@ -79,7 +79,7 @@ table.sample th, table.sample td { border: solid 1px #bbb; padding: 4px; height:
</table>
-<p><a href="wiki_syntax_detailed_textile.html" onclick="window.open('wiki_syntax_detailed_textile.html', '', ''); return false;">More Information</a></p>
+<p><a href="wiki_syntax_detailed_textile.html" onclick="window.open('wiki_syntax_detailed_textile.html', '', ''); return false;">更多帮助信息</a></p>
</body>
</html>
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 3a27039..f76d39f 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -1,5 +1,5 @@
/* Redmine - project management software
- Copyright (C) 2006-2015 Jean-Philippe Lang */
+ Copyright (C) 2006-2016 Jean-Philippe Lang */
function checkAll(id, checked) {
$('#'+id).find('input[type=checkbox]:enabled').prop('checked', checked);
@@ -561,7 +561,13 @@ function beforeShowDatePicker(input, inst) {
break;
case "issue_due_date" :
if ($("#issue_start_date").size() > 0) {
- default_date = $("#issue_start_date").val();
+ var start_date = $("#issue_start_date").val();
+ if (start_date != "") {
+ start_date = new Date(Date.parse(start_date));
+ if (start_date > new Date()) {
+ default_date = $("#issue_start_date").val();
+ }
+ }
}
break;
}
diff --git a/public/javascripts/attachments.js b/public/javascripts/attachments.js
index c3714e2..f335245 100644
--- a/public/javascripts/attachments.js
+++ b/public/javascripts/attachments.js
@@ -1,5 +1,5 @@
/* Redmine - project management software
- Copyright (C) 2006-2015 Jean-Philippe Lang */
+ Copyright (C) 2006-2016 Jean-Philippe Lang */
function addFile(inputEl, file, eagerUpload) {
diff --git a/public/javascripts/context_menu.js b/public/javascripts/context_menu.js
index 2b48e35..1237107 100644
--- a/public/javascripts/context_menu.js
+++ b/public/javascripts/context_menu.js
@@ -1,5 +1,5 @@
/* Redmine - project management software
- Copyright (C) 2006-2015 Jean-Philippe Lang */
+ Copyright (C) 2006-2016 Jean-Philippe Lang */
var contextMenuObserving;
var contextMenuUrl;
diff --git a/public/javascripts/gantt.js b/public/javascripts/gantt.js
index 128f355..6ff023b 100644
--- a/public/javascripts/gantt.js
+++ b/public/javascripts/gantt.js
@@ -1,5 +1,5 @@
/* Redmine - project management software
- Copyright (C) 2006-2015 Jean-Philippe Lang */
+ Copyright (C) 2006-2016 Jean-Philippe Lang */
var draw_gantt = null;
var draw_top;
diff --git a/public/javascripts/project_identifier.js b/public/javascripts/project_identifier.js
index 233fe3c..c795be1 100644
--- a/public/javascripts/project_identifier.js
+++ b/public/javascripts/project_identifier.js
@@ -1,5 +1,5 @@
/* Redmine - project management software
- Copyright (C) 2006-2015 Jean-Philippe Lang */
+ Copyright (C) 2006-2016 Jean-Philippe Lang */
// Automatic project identifier generation
diff --git a/public/javascripts/repository_navigation.js b/public/javascripts/repository_navigation.js
index 3634ffe..b5c79c2 100644
--- a/public/javascripts/repository_navigation.js
+++ b/public/javascripts/repository_navigation.js
@@ -1,5 +1,5 @@
/* Redmine - project management software
- Copyright (C) 2006-2015 Jean-Philippe Lang */
+ Copyright (C) 2006-2016 Jean-Philippe Lang */
$(document).ready(function() {
/*
diff --git a/public/javascripts/revision_graph.js b/public/javascripts/revision_graph.js
index c83e0c4..fee2b84 100644
--- a/public/javascripts/revision_graph.js
+++ b/public/javascripts/revision_graph.js
@@ -1,5 +1,5 @@
/* Redmine - project management software
- Copyright (C) 2006-2015 Jean-Philippe Lang */
+ Copyright (C) 2006-2016 Jean-Philippe Lang */
var revisionGraph = null;
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 2885920..2bb3804 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -79,6 +79,9 @@ pre, code {font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace;}
#sidebar .contextual { margin-right: 1em; }
#sidebar ul, ul.flat {margin: 0; padding: 0;}
#sidebar ul li, ul.flat li {list-style-type:none;margin: 0px 2px 0px 0px; padding: 0px 0px 0px 0px;}
+#sidebar div.wiki h3 {font-size:13px; margin-top:0; color:#555;}
+#sidebar div.wiki ul {margin:inherit; padding-left:40px;}
+#sidebar div.wiki ul li {list-style-type:inherit;}
#content { width: 75%; background-color: #fff; margin: 0px; border-right: 1px solid #ddd; padding: 6px 10px 10px 10px; z-index: 10; }
* html #content{ width: 75%; padding-left: 0; margin-top: 0px; padding: 6px 10px 10px 10px;}
diff --git a/public/stylesheets/responsive.css b/public/stylesheets/responsive.css
index 981850c..69bb212 100644
--- a/public/stylesheets/responsive.css
+++ b/public/stylesheets/responsive.css
@@ -52,6 +52,7 @@
html {
overflow-y: auto; /* avoid 2nd scrollbar on desktop */
+ -webkit-text-size-adjust: 100%; /* prevent font scaling in landscape mode on webkit */
}
body {
@@ -94,6 +95,8 @@
padding: 0;
border: none;
background-color: #628db6;
+ position: fixed;
+ z-index: 9999;
}
/* Hide project name on mobile (project name is still visible in select menu) */
@@ -188,7 +191,7 @@
\*----------------------------------------*/
#main {
- padding: 0;
+ padding: 64px 0 0; /* padding-top equals header height */
}
#main.nosidebar #content,
@@ -509,6 +512,13 @@
.flyout-menu__avatar .user {
padding-left: 15px;
+ padding-right: 15px;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ white-space: nowrap;
+ -webkit-flex-grow: 1;
+ -ms-flex-grow: 1;
+ flex-grow: 1;
}
/* user link when no avatar is present */
@@ -524,9 +534,12 @@
html.flyout-is-active {
overflow: hidden;
}
+
+ .flyout-is-active #wrapper, .flyout-is-active #header {
+ right: 250px; /* when left flyout is active, move body and header to the right (same amount like flyout-menu's width) */
+ }
.flyout-is-active #wrapper {
- right: 250px; /* when left flyout is active, move body to the right (same amount like flyout-menu's width) */
overflow: visible;
height: 100%;
}
@@ -654,6 +667,10 @@
G) FORMS
\*----------------------------------------*/
+ input, select, textarea {
+ max-width: 100%;
+ }
+
/* tabular forms resets for mobile */
.tabular p, .tabular.settings p {
padding-left: 0;
@@ -688,6 +705,72 @@
span#watchers_inputs {
width: 100%;
}
+
+ /* subtasks and related issues list on issue show */
+ #issue_tree .issues, #relations .issues {
+ border-collapse: separate;
+ border-spacing: 0 1em; /* vertical space between tasks */
+ }
+
+ #issue_tree .issue > td:not(.checkbox), #relations .issue > td:not(.checkbox) {
+ display: block;
+ float: left;
+ text-align: left;
+ padding-right: 5px;
+ }
+
+ #issue_tree .issue > td, #relations .issue > td, #issue_tree .issue .user {
+ text-overflow: ellipsis; /* if text exceeds its space, add ... */
+ overflow: hidden;
+ }
+
+ #issue_tree .issue > td.subject, #relations .issue > td.subject {
+ width: 100% !important; /* let subject have one full width column */
+ }
+
+ #issue_tree .issue > td:not(.checkbox), #relations .issue > td:not(.checkbox) {
+ width: 33.33%; /* three columns for all cells that are not subject */
+ }
+
+ #relations .issues, #relations .issue {
+ position: relative; /* needed for .buttons positioning */
+ }
+
+ /* positioniong of unline button */
+ #relations .issue > td.buttons {
+ text-align: right;
+ position: absolute;
+ right: 0;
+ margin: 0;
+ padding-right: 0;
+ }
+
+ #relations .issue .buttons a {
+ vertical-align: middle;
+ padding-right: 5px;
+ }
+
+ #relations .issue > td.subject {
+ padding-right: 25px; /* this is the spaces that .buttons uses next to subject */
+ }
+
+ /* attachment upload form */
+ #attachments_fields span {
+ position: relative;
+ clear: both;
+ margin-bottom: 1em;
+ white-space: normal;
+ }
+ #attachments_fields span a.remove-upload {
+ position: absolute;
+ top: 0;
+ right: 0;
+ }
+
+ #attachments_fields input.description {
+ margin-left: 0;
+ width: 100%;
+ }
}
@media all and (max-width: 599px) {
diff --git a/test/coverage/html_formatter.rb b/test/coverage/html_formatter.rb
index 07be51b..f13b78c 100644
--- a/test/coverage/html_formatter.rb
+++ b/test/coverage/html_formatter.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/extra/redmine_pm/repository_git_test_pm.rb b/test/extra/redmine_pm/repository_git_test_pm.rb
index b77d6de..c833bb6 100644
--- a/test/extra/redmine_pm/repository_git_test_pm.rb
+++ b/test/extra/redmine_pm/repository_git_test_pm.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/extra/redmine_pm/repository_subversion_test_pm.rb b/test/extra/redmine_pm/repository_subversion_test_pm.rb
index 744d1c2..e031bba 100644
--- a/test/extra/redmine_pm/repository_subversion_test_pm.rb
+++ b/test/extra/redmine_pm/repository_subversion_test_pm.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/extra/redmine_pm/test_case.rb b/test/extra/redmine_pm/test_case.rb
index 449a397..a9fd08e 100644
--- a/test/extra/redmine_pm/test_case.rb
+++ b/test/extra/redmine_pm/test_case.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/fixtures/files/import_issues.csv b/test/fixtures/files/import_issues.csv
index b648a42..918f9fc 100644
--- a/test/fixtures/files/import_issues.csv
+++ b/test/fixtures/files/import_issues.csv
@@ -1,4 +1,4 @@
-priority;subject;description;start_date;due_date;parent;private;progress;custom;version;category;user
-High;First;First description;2015-07-08;2015-08-25;;no;;PostgreSQL;;New category;dlopper
-Normal;Child 1;Child description;;;1;yes;10;MySQL;2.0;New category;
-Normal;Child of existing issue;Child description;;;#2;no;20;;2.1;Printing;
+priority;subject;description;start_date;due_date;parent;private;progress;custom;version;category;user;estimated_hours
+High;First;First description;2015-07-08;2015-08-25;;no;;PostgreSQL;;New category;dlopper;1
+Normal;Child 1;Child description;;;1;yes;10;MySQL;2.0;New category;;2
+Normal;Child of existing issue;Child description;;;#2;no;20;;2.1;Printing;;3
diff --git a/test/functional/account_controller_openid_test.rb b/test/functional/account_controller_openid_test.rb
index 019b3ef..ef120a4 100644
--- a/test/functional/account_controller_openid_test.rb
+++ b/test/functional/account_controller_openid_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/functional/account_controller_test.rb b/test/functional/account_controller_test.rb
index 8dfda0f..020dce9 100644
--- a/test/functional/account_controller_test.rb
+++ b/test/functional/account_controller_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/functional/activities_controller_test.rb b/test/functional/activities_controller_test.rb
index 34a15ee..7a42b47 100644
--- a/test/functional/activities_controller_test.rb
+++ b/test/functional/activities_controller_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/functional/admin_controller_test.rb b/test/functional/admin_controller_test.rb
index 3064d5f..498fe7e 100644
--- a/test/functional/admin_controller_test.rb
+++ b/test/functional/admin_controller_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/functional/attachments_controller_test.rb b/test/functional/attachments_controller_test.rb
index 5174c8d..566009a 100644
--- a/test/functional/attachments_controller_test.rb
+++ b/test/functional/attachments_controller_test.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
#
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/functional/auth_sources_controller_test.rb b/test/functional/auth_sources_controller_test.rb
index 7e15ee8..18225c8 100644
--- a/test/functional/auth_sources_controller_test.rb
+++ b/test/functional/auth_sources_controller_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/functional/auto_completes_controller_test.rb b/test/functional/auto_completes_controller_test.rb
index c59b5af..eda685b 100644
--- a/test/functional/auto_completes_controller_test.rb
+++ b/test/functional/auto_completes_controller_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/functional/boards_controller_test.rb b/test/functional/boards_controller_test.rb
index c585760..9044441 100644
--- a/test/functional/boards_controller_test.rb
+++ b/test/functional/boards_controller_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/functional/calendars_controller_test.rb b/test/functional/calendars_controller_test.rb
index 596b972..e856006 100644
--- a/test/functional/calendars_controller_test.rb
+++ b/test/functional/calendars_controller_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/functional/comments_controller_test.rb b/test/functional/comments_controller_test.rb
index 10e8691..90dad81 100644
--- a/test/functional/comments_controller_test.rb
+++ b/test/functional/comments_controller_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/functional/context_menus_controller_test.rb b/test/functional/context_menus_controller_test.rb
index 2b5bd74..103fbcc 100644
--- a/test/functional/context_menus_controller_test.rb
+++ b/test/functional/context_menus_controller_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/functional/custom_field_enumerations_controller_test.rb b/test/functional/custom_field_enumerations_controller_test.rb
index 6bcddac..bf72667 100644
--- a/test/functional/custom_field_enumerations_controller_test.rb
+++ b/test/functional/custom_field_enumerations_controller_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/functional/custom_fields_controller_test.rb b/test/functional/custom_fields_controller_test.rb
index a4d9f01..b30aa4f 100644
--- a/test/functional/custom_fields_controller_test.rb
+++ b/test/functional/custom_fields_controller_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/functional/documents_controller_test.rb b/test/functional/documents_controller_test.rb
index c53142b..505f1df 100644
--- a/test/functional/documents_controller_test.rb
+++ b/test/functional/documents_controller_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/functional/email_addresses_controller_test.rb b/test/functional/email_addresses_controller_test.rb
index 7c52d9c..1b3c6e8 100644
--- a/test/functional/email_addresses_controller_test.rb
+++ b/test/functional/email_addresses_controller_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/functional/enumerations_controller_test.rb b/test/functional/enumerations_controller_test.rb
index e892ef9..e6dadf3 100644
--- a/test/functional/enumerations_controller_test.rb
+++ b/test/functional/enumerations_controller_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/functional/files_controller_test.rb b/test/functional/files_controller_test.rb
index d79b88a..2ed957a 100644
--- a/test/functional/files_controller_test.rb
+++ b/test/functional/files_controller_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/functional/gantts_controller_test.rb b/test/functional/gantts_controller_test.rb
index 416b8d0..e144ab0 100644
--- a/test/functional/gantts_controller_test.rb
+++ b/test/functional/gantts_controller_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/functional/groups_controller_test.rb b/test/functional/groups_controller_test.rb
index 7bce2af..345dff0 100644
--- a/test/functional/groups_controller_test.rb
+++ b/test/functional/groups_controller_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/functional/imports_controller_test.rb b/test/functional/imports_controller_test.rb
index 6648676..9c8dafa 100644
--- a/test/functional/imports_controller_test.rb
+++ b/test/functional/imports_controller_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/functional/issue_categories_controller_test.rb b/test/functional/issue_categories_controller_test.rb
index 9a2c6b5..21fc540 100644
--- a/test/functional/issue_categories_controller_test.rb
+++ b/test/functional/issue_categories_controller_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/functional/issue_relations_controller_test.rb b/test/functional/issue_relations_controller_test.rb
index d72fea1..d389fa1 100644
--- a/test/functional/issue_relations_controller_test.rb
+++ b/test/functional/issue_relations_controller_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/functional/issue_statuses_controller_test.rb b/test/functional/issue_statuses_controller_test.rb
index 82c573e..b953bd3 100644
--- a/test/functional/issue_statuses_controller_test.rb
+++ b/test/functional/issue_statuses_controller_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index b52648f..5c77e52 100644
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -281,6 +281,32 @@ class IssuesControllerTest < ActionController::TestCase
assert_not_nil assigns(:issue_count_by_group)
end
+ def test_index_with_query_grouped_by_key_value_custom_field
+ cf = IssueCustomField.create!(:name => 'Key', :is_for_all => true, :tracker_ids => [1,2,3], :field_format => 'enumeration')
+ cf.enumerations << valueb = CustomFieldEnumeration.new(:name => 'Value B', :position => 1)
+ cf.enumerations << valuea = CustomFieldEnumeration.new(:name => 'Value A', :position => 2)
+ CustomValue.create!(:custom_field => cf, :customized => Issue.find(1), :value => valueb.id)
+ CustomValue.create!(:custom_field => cf, :customized => Issue.find(2), :value => valueb.id)
+ CustomValue.create!(:custom_field => cf, :customized => Issue.find(3), :value => valuea.id)
+ CustomValue.create!(:custom_field => cf, :customized => Issue.find(5), :value => '')
+
+ get :index, :project_id => 1, :set_filter => 1, :group_by => "cf_#{cf.id}"
+ assert_response :success
+ assert_template 'index'
+ assert_not_nil assigns(:issues)
+ assert_not_nil assigns(:issue_count_by_group)
+
+ assert_select 'tr.group', 3
+ assert_select 'tr.group' do
+ assert_select 'span.name', :text => 'Value B'
+ assert_select 'span.count', :text => '2'
+ end
+ assert_select 'tr.group' do
+ assert_select 'span.name', :text => 'Value A'
+ assert_select 'span.count', :text => '1'
+ end
+ end
+
def test_index_with_query_grouped_by_user_custom_field
cf = IssueCustomField.create!(:name => 'User', :is_for_all => true, :tracker_ids => [1,2,3], :field_format => 'user')
CustomValue.create!(:custom_field => cf, :customized => Issue.find(1), :value => '2')
@@ -428,6 +454,26 @@ class IssuesControllerTest < ActionController::TestCase
end
end
+ def test_index_should_include_query_params_as_hidden_fields_in_csv_export_form
+ get :index, :project_id => 1, :set_filter => "1", :tracker_id => "2", :sort => 'status', :c => ["status", "priority"]
+
+ assert_select '#csv-export-form[action=?]', '/projects/ecookbook/issues.csv'
+ assert_select '#csv-export-form[method=?]', 'get'
+
+ assert_select '#csv-export-form' do
+ assert_select 'input[name=?][value=?]', 'set_filter', '1'
+
+ assert_select 'input[name=?][value=?]', 'f[]', 'tracker_id'
+ assert_select 'input[name=?][value=?]', 'op[tracker_id]', '='
+ assert_select 'input[name=?][value=?]', 'v[tracker_id][]', '2'
+
+ assert_select 'input[name=?][value=?]', 'c[]', 'status'
+ assert_select 'input[name=?][value=?]', 'c[]', 'priority'
+
+ assert_select 'input[name=?][value=?]', 'sort', 'status'
+ end
+ end
+
def test_index_csv
get :index, :format => 'csv'
assert_response :success
@@ -3814,13 +3860,15 @@ class IssuesControllerTest < ActionController::TestCase
@request.session[:user_id] = 2
# update issues assignee
- post :bulk_update, :ids => [1, 2], :notes => 'Bulk editing',
- :issue => {:priority_id => '',
- :assigned_to_id => group.id,
- :custom_field_values => {'2' => ''}}
-
- assert_response 302
- assert_equal [group, group], Issue.where(:id => [1, 2]).collect {|i| i.assigned_to}
+ with_settings :issue_group_assignment => '1' do
+ post :bulk_update, :ids => [1, 2], :notes => 'Bulk editing',
+ :issue => {:priority_id => '',
+ :assigned_to_id => group.id,
+ :custom_field_values => {'2' => ''}}
+
+ assert_response 302
+ assert_equal [group, group], Issue.where(:id => [1, 2]).collect {|i| i.assigned_to}
+ end
end
def test_bulk_update_on_different_projects
@@ -4204,7 +4252,7 @@ class IssuesControllerTest < ActionController::TestCase
assert_no_difference 'Project.find(1).issues.count' do
post :bulk_update, :ids => [1, 2], :copy => '1',
:issue => {
- :project_id => '2', :tracker_id => '', :assigned_to_id => '4',
+ :project_id => '2', :tracker_id => '', :assigned_to_id => '2',
:status_id => '1', :start_date => '2009-12-01', :due_date => '2009-12-31'
}
end
@@ -4214,7 +4262,7 @@ class IssuesControllerTest < ActionController::TestCase
assert_equal 2, copied_issues.size
copied_issues.each do |issue|
assert_equal 2, issue.project_id, "Project is incorrect"
- assert_equal 4, issue.assigned_to_id, "Assigned to is incorrect"
+ assert_equal 2, issue.assigned_to_id, "Assigned to is incorrect"
assert_equal 1, issue.status_id, "Status is incorrect"
assert_equal '2009-12-01', issue.start_date.to_s, "Start date is incorrect"
assert_equal '2009-12-31', issue.due_date.to_s, "Due date is incorrect"
diff --git a/test/functional/issues_controller_transaction_test.rb b/test/functional/issues_controller_transaction_test.rb
index b38b096..b71af65 100644
--- a/test/functional/issues_controller_transaction_test.rb
+++ b/test/functional/issues_controller_transaction_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -210,6 +210,27 @@ class IssuesControllerTransactionTest < ActionController::TestCase
assert_nil issue.fixed_version_id
journal = Journal.order('id DESC').first
assert_equal 'add_notes_conflict_resolution', journal.notes
+ assert_equal false, journal.private_notes
+ assert journal.details.empty?
+ end
+
+ def test_update_stale_issue_with_add_notes_conflict_resolution_should_preserve_private_notes
+ @request.session[:user_id] = 2
+
+ journal = new_record(Journal) do
+ put :update, :id => 1,
+ :issue => {
+ :fixed_version_id => 4,
+ :notes => 'add_privates_notes_conflict_resolution',
+ :private_notes => '1',
+ :lock_version => 2
+ },
+ :conflict_resolution => 'add_notes'
+ end
+
+ assert_response 302
+ assert_equal 'add_privates_notes_conflict_resolution', journal.notes
+ assert_equal true, journal.private_notes
assert journal.details.empty?
end
diff --git a/test/functional/issues_custom_fields_visibility_test.rb b/test/functional/issues_custom_fields_visibility_test.rb
index 58d03fd..dc169b7 100644
--- a/test/functional/issues_custom_fields_visibility_test.rb
+++ b/test/functional/issues_custom_fields_visibility_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/functional/journals_controller_test.rb b/test/functional/journals_controller_test.rb
index c82d2e5..58b19d8 100644
--- a/test/functional/journals_controller_test.rb
+++ b/test/functional/journals_controller_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/functional/mail_handler_controller_test.rb b/test/functional/mail_handler_controller_test.rb
index 465b29c..a6c2dfa 100644
--- a/test/functional/mail_handler_controller_test.rb
+++ b/test/functional/mail_handler_controller_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/functional/members_controller_test.rb b/test/functional/members_controller_test.rb
index 5bad287..05a4fa5 100644
--- a/test/functional/members_controller_test.rb
+++ b/test/functional/members_controller_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/functional/messages_controller_test.rb b/test/functional/messages_controller_test.rb
index cc61e5a..87bba5f 100644
--- a/test/functional/messages_controller_test.rb
+++ b/test/functional/messages_controller_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/functional/my_controller_test.rb b/test/functional/my_controller_test.rb
index 92ee247..ae2a161 100644
--- a/test/functional/my_controller_test.rb
+++ b/test/functional/my_controller_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/functional/news_controller_test.rb b/test/functional/news_controller_test.rb
index b957dde..6fe50f4 100644
--- a/test/functional/news_controller_test.rb
+++ b/test/functional/news_controller_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/functional/previews_controller_test.rb b/test/functional/previews_controller_test.rb
index 2d1040a..cf8aed5 100644
--- a/test/functional/previews_controller_test.rb
+++ b/test/functional/previews_controller_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/functional/principal_memberships_controller_test.rb b/test/functional/principal_memberships_controller_test.rb
index 03a4a9a..7dbecd9 100644
--- a/test/functional/principal_memberships_controller_test.rb
+++ b/test/functional/principal_memberships_controller_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/functional/project_enumerations_controller_test.rb b/test/functional/project_enumerations_controller_test.rb
index 943c086..336932c 100644
--- a/test/functional/project_enumerations_controller_test.rb
+++ b/test/functional/project_enumerations_controller_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb
index b711d5e..e7ae221 100644
--- a/test/functional/projects_controller_test.rb
+++ b/test/functional/projects_controller_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/functional/queries_controller_test.rb b/test/functional/queries_controller_test.rb
index 68dac7a..c7ad258 100644
--- a/test/functional/queries_controller_test.rb
+++ b/test/functional/queries_controller_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/functional/reports_controller_test.rb b/test/functional/reports_controller_test.rb
index be29998..a032690 100644
--- a/test/functional/reports_controller_test.rb
+++ b/test/functional/reports_controller_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/functional/repositories_bazaar_controller_test.rb b/test/functional/repositories_bazaar_controller_test.rb
index 29b5bf7..9b8ec2b 100644
--- a/test/functional/repositories_bazaar_controller_test.rb
+++ b/test/functional/repositories_bazaar_controller_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/functional/repositories_controller_test.rb b/test/functional/repositories_controller_test.rb
index 056375c..fed6a7c 100644
--- a/test/functional/repositories_controller_test.rb
+++ b/test/functional/repositories_controller_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/functional/repositories_cvs_controller_test.rb b/test/functional/repositories_cvs_controller_test.rb
index ba35e1e..8940724 100644
--- a/test/functional/repositories_cvs_controller_test.rb
+++ b/test/functional/repositories_cvs_controller_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/functional/repositories_darcs_controller_test.rb b/test/functional/repositories_darcs_controller_test.rb
index 7ff63a5..33a085e 100644
--- a/test/functional/repositories_darcs_controller_test.rb
+++ b/test/functional/repositories_darcs_controller_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/functional/repositories_filesystem_controller_test.rb b/test/functional/repositories_filesystem_controller_test.rb
index 34333cf..6d872cd 100644
--- a/test/functional/repositories_filesystem_controller_test.rb
+++ b/test/functional/repositories_filesystem_controller_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/functional/repositories_git_controller_test.rb b/test/functional/repositories_git_controller_test.rb
index e774b93..f92d39d 100644
--- a/test/functional/repositories_git_controller_test.rb
+++ b/test/functional/repositories_git_controller_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/functional/repositories_mercurial_controller_test.rb b/test/functional/repositories_mercurial_controller_test.rb
index eb64409..24fe59a 100644
--- a/test/functional/repositories_mercurial_controller_test.rb
+++ b/test/functional/repositories_mercurial_controller_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/functional/repositories_subversion_controller_test.rb b/test/functional/repositories_subversion_controller_test.rb
index 664330f..d801040 100644
--- a/test/functional/repositories_subversion_controller_test.rb
+++ b/test/functional/repositories_subversion_controller_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/functional/roles_controller_test.rb b/test/functional/roles_controller_test.rb
index b5c80f2..03cd91a 100644
--- a/test/functional/roles_controller_test.rb
+++ b/test/functional/roles_controller_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/functional/search_controller_test.rb b/test/functional/search_controller_test.rb
index 10f6b02..c074a6c 100644
--- a/test/functional/search_controller_test.rb
+++ b/test/functional/search_controller_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/functional/search_custom_fields_visibility_test.rb b/test/functional/search_custom_fields_visibility_test.rb
index d64930e..070f1a7 100644
--- a/test/functional/search_custom_fields_visibility_test.rb
+++ b/test/functional/search_custom_fields_visibility_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/functional/sessions_controller_test.rb b/test/functional/sessions_controller_test.rb
index 4911d1d..2f3572f 100644
--- a/test/functional/sessions_controller_test.rb
+++ b/test/functional/sessions_controller_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/functional/settings_controller_test.rb b/test/functional/settings_controller_test.rb
index de5fddd..6efa045 100644
--- a/test/functional/settings_controller_test.rb
+++ b/test/functional/settings_controller_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/functional/sys_controller_test.rb b/test/functional/sys_controller_test.rb
index 4395159..ab8d066 100644
--- a/test/functional/sys_controller_test.rb
+++ b/test/functional/sys_controller_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/functional/time_entry_reports_controller_test.rb b/test/functional/time_entry_reports_controller_test.rb
index 406b7f5..a70beec 100644
--- a/test/functional/time_entry_reports_controller_test.rb
+++ b/test/functional/time_entry_reports_controller_test.rb
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/functional/timelog_controller_test.rb b/test/functional/timelog_controller_test.rb
index 7ce39ca..ce6f593 100644
--- a/test/functional/timelog_controller_test.rb
+++ b/test/functional/timelog_controller_test.rb
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/functional/timelog_custom_fields_visibility_test.rb b/test/functional/timelog_custom_fields_visibility_test.rb
index 4ebbf33..5598b2e 100644
--- a/test/functional/timelog_custom_fields_visibility_test.rb
+++ b/test/functional/timelog_custom_fields_visibility_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/functional/trackers_controller_test.rb b/test/functional/trackers_controller_test.rb
index 365b369..f3d7a1c 100644
--- a/test/functional/trackers_controller_test.rb
+++ b/test/functional/trackers_controller_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/functional/users_controller_test.rb b/test/functional/users_controller_test.rb
index b34c809..86c92e9 100644
--- a/test/functional/users_controller_test.rb
+++ b/test/functional/users_controller_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/functional/versions_controller_test.rb b/test/functional/versions_controller_test.rb
index 26f209e..185afe2 100644
--- a/test/functional/versions_controller_test.rb
+++ b/test/functional/versions_controller_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/functional/watchers_controller_test.rb b/test/functional/watchers_controller_test.rb
index 1b64176..3cbaf84 100644
--- a/test/functional/watchers_controller_test.rb
+++ b/test/functional/watchers_controller_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/functional/welcome_controller_test.rb b/test/functional/welcome_controller_test.rb
index f39f9f3..c9c12af 100644
--- a/test/functional/welcome_controller_test.rb
+++ b/test/functional/welcome_controller_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/functional/wiki_controller_test.rb b/test/functional/wiki_controller_test.rb
index 0b86ef0..82aca52 100644
--- a/test/functional/wiki_controller_test.rb
+++ b/test/functional/wiki_controller_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/functional/wikis_controller_test.rb b/test/functional/wikis_controller_test.rb
index d3edfbd..48618e2 100644
--- a/test/functional/wikis_controller_test.rb
+++ b/test/functional/wikis_controller_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/functional/workflows_controller_test.rb b/test/functional/workflows_controller_test.rb
index 2f455c4..3316b1f 100644
--- a/test/functional/workflows_controller_test.rb
+++ b/test/functional/workflows_controller_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/account_test.rb b/test/integration/account_test.rb
index 38f5da7..0f12a1c 100644
--- a/test/integration/account_test.rb
+++ b/test/integration/account_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/admin_test.rb b/test/integration/admin_test.rb
index 402d0ed..22a675a 100644
--- a/test/integration/admin_test.rb
+++ b/test/integration/admin_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/api_test/api_routing_test.rb b/test/integration/api_test/api_routing_test.rb
index 4fcd9ec..ccdb933 100644
--- a/test/integration/api_test/api_routing_test.rb
+++ b/test/integration/api_test/api_routing_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/api_test/api_test.rb b/test/integration/api_test/api_test.rb
index b81f8e0..84a96e4 100644
--- a/test/integration/api_test/api_test.rb
+++ b/test/integration/api_test/api_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/api_test/attachments_test.rb b/test/integration/api_test/attachments_test.rb
index 0f7e6eb..4ec4c84 100644
--- a/test/integration/api_test/attachments_test.rb
+++ b/test/integration/api_test/attachments_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/api_test/authentication_test.rb b/test/integration/api_test/authentication_test.rb
index 26708eb..afc7904 100644
--- a/test/integration/api_test/authentication_test.rb
+++ b/test/integration/api_test/authentication_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/api_test/custom_fields_attribute_test.rb b/test/integration/api_test/custom_fields_attribute_test.rb
index 15c2acf..7fbfc19 100644
--- a/test/integration/api_test/custom_fields_attribute_test.rb
+++ b/test/integration/api_test/custom_fields_attribute_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/api_test/custom_fields_test.rb b/test/integration/api_test/custom_fields_test.rb
index ee05fb0..54f8b89 100644
--- a/test/integration/api_test/custom_fields_test.rb
+++ b/test/integration/api_test/custom_fields_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/api_test/disabled_rest_api_test.rb b/test/integration/api_test/disabled_rest_api_test.rb
index 768a833..2248206 100644
--- a/test/integration/api_test/disabled_rest_api_test.rb
+++ b/test/integration/api_test/disabled_rest_api_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/api_test/enumerations_test.rb b/test/integration/api_test/enumerations_test.rb
index 110b83f..de55856 100644
--- a/test/integration/api_test/enumerations_test.rb
+++ b/test/integration/api_test/enumerations_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/api_test/groups_test.rb b/test/integration/api_test/groups_test.rb
index 107ece5..0221fd2 100644
--- a/test/integration/api_test/groups_test.rb
+++ b/test/integration/api_test/groups_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/api_test/issue_categories_test.rb b/test/integration/api_test/issue_categories_test.rb
index 6e02402..f9083a7 100644
--- a/test/integration/api_test/issue_categories_test.rb
+++ b/test/integration/api_test/issue_categories_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/api_test/issue_relations_test.rb b/test/integration/api_test/issue_relations_test.rb
index fa33460..125346d 100644
--- a/test/integration/api_test/issue_relations_test.rb
+++ b/test/integration/api_test/issue_relations_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/api_test/issue_statuses_test.rb b/test/integration/api_test/issue_statuses_test.rb
index d5c9994..f888cac 100644
--- a/test/integration/api_test/issue_statuses_test.rb
+++ b/test/integration/api_test/issue_statuses_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/api_test/issues_test.rb b/test/integration/api_test/issues_test.rb
index 4fc17fe..9748317 100644
--- a/test/integration/api_test/issues_test.rb
+++ b/test/integration/api_test/issues_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/api_test/jsonp_test.rb b/test/integration/api_test/jsonp_test.rb
index 5cb5f5d..d46b789 100644
--- a/test/integration/api_test/jsonp_test.rb
+++ b/test/integration/api_test/jsonp_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/api_test/memberships_test.rb b/test/integration/api_test/memberships_test.rb
index 7ee82fc..92d4b09 100644
--- a/test/integration/api_test/memberships_test.rb
+++ b/test/integration/api_test/memberships_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/api_test/news_test.rb b/test/integration/api_test/news_test.rb
index a0c6f1c..5dca2ff 100644
--- a/test/integration/api_test/news_test.rb
+++ b/test/integration/api_test/news_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/api_test/projects_test.rb b/test/integration/api_test/projects_test.rb
index b532f5a..7f9eeeb 100644
--- a/test/integration/api_test/projects_test.rb
+++ b/test/integration/api_test/projects_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/api_test/queries_test.rb b/test/integration/api_test/queries_test.rb
index 2ba8e56..e253577 100644
--- a/test/integration/api_test/queries_test.rb
+++ b/test/integration/api_test/queries_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/api_test/roles_test.rb b/test/integration/api_test/roles_test.rb
index 0df9206..47d5017 100644
--- a/test/integration/api_test/roles_test.rb
+++ b/test/integration/api_test/roles_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/api_test/time_entries_test.rb b/test/integration/api_test/time_entries_test.rb
index b4c2a09..f9d31eb 100644
--- a/test/integration/api_test/time_entries_test.rb
+++ b/test/integration/api_test/time_entries_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/api_test/trackers_test.rb b/test/integration/api_test/trackers_test.rb
index beabc46..53f7c56 100644
--- a/test/integration/api_test/trackers_test.rb
+++ b/test/integration/api_test/trackers_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/api_test/users_test.rb b/test/integration/api_test/users_test.rb
index d8d78ad..140d788 100644
--- a/test/integration/api_test/users_test.rb
+++ b/test/integration/api_test/users_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/api_test/versions_test.rb b/test/integration/api_test/versions_test.rb
index 0202d6c..6093237 100644
--- a/test/integration/api_test/versions_test.rb
+++ b/test/integration/api_test/versions_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/api_test/wiki_pages_test.rb b/test/integration/api_test/wiki_pages_test.rb
index 0ea6516..9a091e7 100644
--- a/test/integration/api_test/wiki_pages_test.rb
+++ b/test/integration/api_test/wiki_pages_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/application_test.rb b/test/integration/application_test.rb
index e01b44a..35296f8 100644
--- a/test/integration/application_test.rb
+++ b/test/integration/application_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/attachments_test.rb b/test/integration/attachments_test.rb
index 6707ea3..114e47a 100644
--- a/test/integration/attachments_test.rb
+++ b/test/integration/attachments_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/feeds_test.rb b/test/integration/feeds_test.rb
index 68506d1..7e78a25 100644
--- a/test/integration/feeds_test.rb
+++ b/test/integration/feeds_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/issues_test.rb b/test/integration/issues_test.rb
index 0df8c8a..fb80002 100644
--- a/test/integration/issues_test.rb
+++ b/test/integration/issues_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/layout_test.rb b/test/integration/layout_test.rb
index 2de17ca..2fcf6da 100644
--- a/test/integration/layout_test.rb
+++ b/test/integration/layout_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/lib/redmine/hook_test.rb b/test/integration/lib/redmine/hook_test.rb
index 274b5cc..648decf 100644
--- a/test/integration/lib/redmine/hook_test.rb
+++ b/test/integration/lib/redmine/hook_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/lib/redmine/menu_manager_test.rb b/test/integration/lib/redmine/menu_manager_test.rb
index 30fb448..516872c 100644
--- a/test/integration/lib/redmine/menu_manager_test.rb
+++ b/test/integration/lib/redmine/menu_manager_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/lib/redmine/themes_test.rb b/test/integration/lib/redmine/themes_test.rb
index 66cfea2..65968af 100644
--- a/test/integration/lib/redmine/themes_test.rb
+++ b/test/integration/lib/redmine/themes_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/projects_test.rb b/test/integration/projects_test.rb
index 7ee1ab1..4dafc42 100644
--- a/test/integration/projects_test.rb
+++ b/test/integration/projects_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/repositories_git_test.rb b/test/integration/repositories_git_test.rb
index 75b5ec0..4f50c1f 100644
--- a/test/integration/repositories_git_test.rb
+++ b/test/integration/repositories_git_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/routing/account_test.rb b/test/integration/routing/account_test.rb
index 0d6d24f..d31d8f1 100644
--- a/test/integration/routing/account_test.rb
+++ b/test/integration/routing/account_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/routing/activities_test.rb b/test/integration/routing/activities_test.rb
index 709c086..e5d2206 100644
--- a/test/integration/routing/activities_test.rb
+++ b/test/integration/routing/activities_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/routing/admin_test.rb b/test/integration/routing/admin_test.rb
index 16e2c1c..197e4a8 100644
--- a/test/integration/routing/admin_test.rb
+++ b/test/integration/routing/admin_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/routing/attachments_test.rb b/test/integration/routing/attachments_test.rb
index 7a964c1..a29a007 100644
--- a/test/integration/routing/attachments_test.rb
+++ b/test/integration/routing/attachments_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/routing/auth_sources_test.rb b/test/integration/routing/auth_sources_test.rb
index 4e79f74..09cafea 100644
--- a/test/integration/routing/auth_sources_test.rb
+++ b/test/integration/routing/auth_sources_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/routing/auto_completes_test.rb b/test/integration/routing/auto_completes_test.rb
index 619baa9..2d2fe7c 100644
--- a/test/integration/routing/auto_completes_test.rb
+++ b/test/integration/routing/auto_completes_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/routing/boards_test.rb b/test/integration/routing/boards_test.rb
index a8d1820..208f5ac 100644
--- a/test/integration/routing/boards_test.rb
+++ b/test/integration/routing/boards_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/routing/calendars_test.rb b/test/integration/routing/calendars_test.rb
index a8050d2..72123ea 100644
--- a/test/integration/routing/calendars_test.rb
+++ b/test/integration/routing/calendars_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/routing/comments_test.rb b/test/integration/routing/comments_test.rb
index 3deb12d..2dc5999 100644
--- a/test/integration/routing/comments_test.rb
+++ b/test/integration/routing/comments_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/routing/context_menus_test.rb b/test/integration/routing/context_menus_test.rb
index 021edbd..e0104ef 100644
--- a/test/integration/routing/context_menus_test.rb
+++ b/test/integration/routing/context_menus_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/routing/custom_fields_test.rb b/test/integration/routing/custom_fields_test.rb
index 0fbb10b..b95b106 100644
--- a/test/integration/routing/custom_fields_test.rb
+++ b/test/integration/routing/custom_fields_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/routing/documents_test.rb b/test/integration/routing/documents_test.rb
index 6298d9b..0162c5c 100644
--- a/test/integration/routing/documents_test.rb
+++ b/test/integration/routing/documents_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/routing/enumerations_test.rb b/test/integration/routing/enumerations_test.rb
index 05b3542..f7417f2 100644
--- a/test/integration/routing/enumerations_test.rb
+++ b/test/integration/routing/enumerations_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/routing/files_test.rb b/test/integration/routing/files_test.rb
index e35a570..058cb1d 100644
--- a/test/integration/routing/files_test.rb
+++ b/test/integration/routing/files_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/routing/gantts_test.rb b/test/integration/routing/gantts_test.rb
index d229443..61513da 100644
--- a/test/integration/routing/gantts_test.rb
+++ b/test/integration/routing/gantts_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/routing/groups_test.rb b/test/integration/routing/groups_test.rb
index 782fa68..c9116f4 100644
--- a/test/integration/routing/groups_test.rb
+++ b/test/integration/routing/groups_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/routing/imports_test.rb b/test/integration/routing/imports_test.rb
index a06b1d9..d4933d7 100644
--- a/test/integration/routing/imports_test.rb
+++ b/test/integration/routing/imports_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/routing/issue_categories_test.rb b/test/integration/routing/issue_categories_test.rb
index 6a45ebb..5e70c10 100644
--- a/test/integration/routing/issue_categories_test.rb
+++ b/test/integration/routing/issue_categories_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/routing/issue_relations_test.rb b/test/integration/routing/issue_relations_test.rb
index 764a609..50aefe1 100644
--- a/test/integration/routing/issue_relations_test.rb
+++ b/test/integration/routing/issue_relations_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/routing/issue_statuses_test.rb b/test/integration/routing/issue_statuses_test.rb
index 184752f..af7ca23 100644
--- a/test/integration/routing/issue_statuses_test.rb
+++ b/test/integration/routing/issue_statuses_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/routing/issues_test.rb b/test/integration/routing/issues_test.rb
index c7d7523..45b3457 100644
--- a/test/integration/routing/issues_test.rb
+++ b/test/integration/routing/issues_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/routing/journals_test.rb b/test/integration/routing/journals_test.rb
index c0bcf0e..3240942 100644
--- a/test/integration/routing/journals_test.rb
+++ b/test/integration/routing/journals_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/routing/mail_handler_test.rb b/test/integration/routing/mail_handler_test.rb
index d4b3e4b..c93b35a 100644
--- a/test/integration/routing/mail_handler_test.rb
+++ b/test/integration/routing/mail_handler_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/routing/members_test.rb b/test/integration/routing/members_test.rb
index 9080634..ae3eb5b 100644
--- a/test/integration/routing/members_test.rb
+++ b/test/integration/routing/members_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/routing/messages_test.rb b/test/integration/routing/messages_test.rb
index ff2b14a..b685ced 100644
--- a/test/integration/routing/messages_test.rb
+++ b/test/integration/routing/messages_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/routing/my_test.rb b/test/integration/routing/my_test.rb
index f10c107..95b349c 100644
--- a/test/integration/routing/my_test.rb
+++ b/test/integration/routing/my_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/routing/news_test.rb b/test/integration/routing/news_test.rb
index ae23630..00b4ba0 100644
--- a/test/integration/routing/news_test.rb
+++ b/test/integration/routing/news_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/routing/previews_test.rb b/test/integration/routing/previews_test.rb
index c072c51..b705b67 100644
--- a/test/integration/routing/previews_test.rb
+++ b/test/integration/routing/previews_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/routing/principal_memberships_test.rb b/test/integration/routing/principal_memberships_test.rb
index 3137f32..b40eb2c 100644
--- a/test/integration/routing/principal_memberships_test.rb
+++ b/test/integration/routing/principal_memberships_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/routing/project_enumerations_test.rb b/test/integration/routing/project_enumerations_test.rb
index 9148c41..09c5e82 100644
--- a/test/integration/routing/project_enumerations_test.rb
+++ b/test/integration/routing/project_enumerations_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/routing/projects_test.rb b/test/integration/routing/projects_test.rb
index ff283c0..ed68ec6 100644
--- a/test/integration/routing/projects_test.rb
+++ b/test/integration/routing/projects_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/routing/queries_test.rb b/test/integration/routing/queries_test.rb
index 45b0856..d98af0c 100644
--- a/test/integration/routing/queries_test.rb
+++ b/test/integration/routing/queries_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/routing/reports_test.rb b/test/integration/routing/reports_test.rb
index c80b969..7633052 100644
--- a/test/integration/routing/reports_test.rb
+++ b/test/integration/routing/reports_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/routing/repositories_test.rb b/test/integration/routing/repositories_test.rb
index 5114cd2..47aa66f 100644
--- a/test/integration/routing/repositories_test.rb
+++ b/test/integration/routing/repositories_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/routing/roles_test.rb b/test/integration/routing/roles_test.rb
index 4afba90..c9ac1ba 100644
--- a/test/integration/routing/roles_test.rb
+++ b/test/integration/routing/roles_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/routing/search_test.rb b/test/integration/routing/search_test.rb
index 0f8e63a..ca0917d 100644
--- a/test/integration/routing/search_test.rb
+++ b/test/integration/routing/search_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/routing/settings_test.rb b/test/integration/routing/settings_test.rb
index 420f6e1..f422c90 100644
--- a/test/integration/routing/settings_test.rb
+++ b/test/integration/routing/settings_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/routing/sys_test.rb b/test/integration/routing/sys_test.rb
index 3b67692..1c0c14a 100644
--- a/test/integration/routing/sys_test.rb
+++ b/test/integration/routing/sys_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/routing/timelog_test.rb b/test/integration/routing/timelog_test.rb
index c84f22e..9a20573 100644
--- a/test/integration/routing/timelog_test.rb
+++ b/test/integration/routing/timelog_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/routing/trackers_test.rb b/test/integration/routing/trackers_test.rb
index e793fb6..95edcb8 100644
--- a/test/integration/routing/trackers_test.rb
+++ b/test/integration/routing/trackers_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/routing/users_test.rb b/test/integration/routing/users_test.rb
index 24606ff..a2fca16 100644
--- a/test/integration/routing/users_test.rb
+++ b/test/integration/routing/users_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/routing/versions_test.rb b/test/integration/routing/versions_test.rb
index 8cf8859..64d8724 100644
--- a/test/integration/routing/versions_test.rb
+++ b/test/integration/routing/versions_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/routing/watchers_test.rb b/test/integration/routing/watchers_test.rb
index a99c2e3..a8dbe1e 100644
--- a/test/integration/routing/watchers_test.rb
+++ b/test/integration/routing/watchers_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/routing/welcome_test.rb b/test/integration/routing/welcome_test.rb
index 37e66f9..16d93a0 100644
--- a/test/integration/routing/welcome_test.rb
+++ b/test/integration/routing/welcome_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/routing/wiki_test.rb b/test/integration/routing/wiki_test.rb
index a132137..135bb3f 100644
--- a/test/integration/routing/wiki_test.rb
+++ b/test/integration/routing/wiki_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/routing/wikis_test.rb b/test/integration/routing/wikis_test.rb
index 4fea7c5..2dcabf1 100644
--- a/test/integration/routing/wikis_test.rb
+++ b/test/integration/routing/wikis_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/routing/workflows_test.rb b/test/integration/routing/workflows_test.rb
index 78cc9a9..6dc45ba 100644
--- a/test/integration/routing/workflows_test.rb
+++ b/test/integration/routing/workflows_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/sessions_test.rb b/test/integration/sessions_test.rb
index 39a2b8a..6b48677 100644
--- a/test/integration/sessions_test.rb
+++ b/test/integration/sessions_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/integration/users_test.rb b/test/integration/users_test.rb
index 1ae2f27..a87c25b 100644
--- a/test/integration/users_test.rb
+++ b/test/integration/users_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 0ee9b63..16f0599 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/travis/install-openldap.sh b/test/travis/install-openldap.sh
deleted file mode 100644
index 7b13823..0000000
--- a/test/travis/install-openldap.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#! /bin/sh
-
-DEBIAN_FRONTEND=noninteractive apt-get install -y --force-yes slapd ldap-utils
-dpkg -l '*slapd*' '*ldap-utils*'
-
-TOP_DIR=`dirname $0`/../..
-
-/etc/init.d/slapd stop
-
-rm -rf /etc/ldap/slapd.d/*
-rmdir /etc/ldap/slapd.d/
-rm -rf /var/lib/ldap/*
-
-cp ${TOP_DIR}/test/fixtures/ldap/slapd.ubuntu.12.04.conf /etc/ldap/slapd.conf
-slaptest -u -v -f /etc/ldap/slapd.conf
-
-/etc/init.d/slapd start
-
-ldapadd -x -D "cn=Manager,dc=redmine,dc=org" \
- -w secret -h localhost -p 389 -f ${TOP_DIR}/test/fixtures/ldap/test-ldap.ldif
diff --git a/test/travis/mariadb.pref b/test/travis/mariadb.pref
deleted file mode 100644
index 3d0eeab..0000000
--- a/test/travis/mariadb.pref
+++ /dev/null
@@ -1,6 +0,0 @@
-# https://mariadb.com/kb/en/mariadb/installing-mariadb-deb-files/
-# /etc/apt/preferences.d/
-
-Package: *
-Pin: origin ftp.osuosl.org
-Pin-Priority: 1000
diff --git a/test/ui/base.rb b/test/ui/base.rb
index f7273e2..b88e9d0 100644
--- a/test/ui/base.rb
+++ b/test/ui/base.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -60,6 +60,11 @@ module Redmine
assert_equal '/my/page', current_path
end
+ setup do
+ # Set the page width higher than 900 to get the full layout with sidebar
+ page.driver.browser.manage.window.resize_to(1024, 900)
+ end
+
teardown do
Capybara.reset_sessions! # Forget the (simulated) browser state
Capybara.use_default_driver # Revert Capybara.current_driver to Capybara.default_driver
diff --git a/test/ui/custom_fields_test_ui.rb b/test/ui/custom_fields_test_ui.rb
new file mode 100644
index 0000000..ee97024
--- /dev/null
+++ b/test/ui/custom_fields_test_ui.rb
@@ -0,0 +1,38 @@
+# Redmine - project management software
+# Copyright (C) 2006-2016 Jean-Philippe Lang
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+require File.expand_path('../base', __FILE__)
+
+class Redmine::UiTest::CustomFieldsTest < Redmine::UiTest::Base
+ fixtures :projects, :users, :email_addresses, :roles, :members, :member_roles,
+ :trackers, :projects_trackers, :enabled_modules,
+ :custom_fields, :custom_values, :custom_fields_trackers
+
+ def test_reordering_should_redirect_to_index
+ assert_equal 1, UserCustomField.find(4).position
+ log_user 'admin', 'admin'
+ visit '/custom_fields'
+
+ # click 'User' tab
+ page.first('a#tab-UserCustomField').click
+ # click 'Move down' link on the first row
+ page.first('td.reorder a:nth-child(3)').click
+
+ assert_equal "/custom_fields?tab=UserCustomField", URI.parse(current_url).request_uri
+ assert_equal 2, UserCustomField.find(4).position
+ end
+end
diff --git a/test/ui/issues_test_ui.rb b/test/ui/issues_test_ui.rb
index 92f4cdd..1af658e 100644
--- a/test/ui/issues_test_ui.rb
+++ b/test/ui/issues_test_ui.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -21,7 +21,7 @@ class Redmine::UiTest::IssuesTest < Redmine::UiTest::Base
fixtures :projects, :users, :email_addresses, :roles, :members, :member_roles,
:trackers, :projects_trackers, :enabled_modules, :issue_statuses, :issues,
:enumerations, :custom_fields, :custom_values, :custom_fields_trackers,
- :watchers
+ :watchers, :journals, :journal_details
def test_create_issue
log_user('jsmith', 'jsmith')
@@ -150,15 +150,30 @@ class Redmine::UiTest::IssuesTest < Redmine::UiTest::Base
end
end
- def test_create_issue_start_due_date_default
+ def test_default_due_date_proposed_in_date_picker
log_user('jsmith', 'jsmith')
visit '/projects/ecookbook/issues/new'
+
+ # Future start date: due date should default to start date
+ fill_in 'Start date', :with => '2027-04-01'
+ fill_in 'Due date', :with => ''
+ page.first('p#due_date_area img').click
+ page.first("td.ui-datepicker-days-cell-over a").click
+ assert_equal '2027-04-01', page.find('input#issue_due_date').value
+
+ # Passed start date: due date should default to today
fill_in 'Start date', :with => '2012-04-01'
fill_in 'Due date', :with => ''
page.first('p#due_date_area img').click
page.first("td.ui-datepicker-days-cell-over a").click
- assert_equal '2012-04-01', page.find('input#issue_due_date').value
+ assert_equal Date.today.to_s, page.find('input#issue_due_date').value
+ end
+
+ def test_default_start_date_proposed_in_date_picker
+ log_user('jsmith', 'jsmith')
+ visit '/projects/ecookbook/issues/new'
+ # Passed due date: start date should default to due date
fill_in 'Start date', :with => ''
fill_in 'Due date', :with => '2012-04-01'
page.first('p#start_date_area img').click
diff --git a/test/ui/sudo_mode_test_ui.rb b/test/ui/sudo_mode_test_ui.rb
index 2fbaa31..f5e6f20 100644
--- a/test/ui/sudo_mode_test_ui.rb
+++ b/test/ui/sudo_mode_test_ui.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/ui/timelog_test_ui.rb b/test/ui/timelog_test_ui.rb
index fc07b29..e0da8b0 100644
--- a/test/ui/timelog_test_ui.rb
+++ b/test/ui/timelog_test_ui.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/activity_test.rb b/test/unit/activity_test.rb
index 5df2699..eaf4a77 100644
--- a/test/unit/activity_test.rb
+++ b/test/unit/activity_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/attachment_test.rb b/test/unit/attachment_test.rb
index db274db..e754641 100644
--- a/test/unit/attachment_test.rb
+++ b/test/unit/attachment_test.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
#
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/auth_source_ldap_test.rb b/test/unit/auth_source_ldap_test.rb
index fcfab36..41b3c4b 100644
--- a/test/unit/auth_source_ldap_test.rb
+++ b/test/unit/auth_source_ldap_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/board_test.rb b/test/unit/board_test.rb
index 1fc066a..5d61c81 100644
--- a/test/unit/board_test.rb
+++ b/test/unit/board_test.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
#
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/changeset_test.rb b/test/unit/changeset_test.rb
index 7d44996..179c515 100644
--- a/test/unit/changeset_test.rb
+++ b/test/unit/changeset_test.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
#
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/comment_test.rb b/test/unit/comment_test.rb
index 9ffc213..d622d10 100644
--- a/test/unit/comment_test.rb
+++ b/test/unit/comment_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/custom_field_test.rb b/test/unit/custom_field_test.rb
index f408751..c805e17 100644
--- a/test/unit/custom_field_test.rb
+++ b/test/unit/custom_field_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/custom_field_user_format_test.rb b/test/unit/custom_field_user_format_test.rb
index 17755ec..f5d4e66 100644
--- a/test/unit/custom_field_user_format_test.rb
+++ b/test/unit/custom_field_user_format_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/custom_field_version_format_test.rb b/test/unit/custom_field_version_format_test.rb
index 85729b6..f8a9517 100644
--- a/test/unit/custom_field_version_format_test.rb
+++ b/test/unit/custom_field_version_format_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/custom_value_test.rb b/test/unit/custom_value_test.rb
index 954c3ae..8a87956 100644
--- a/test/unit/custom_value_test.rb
+++ b/test/unit/custom_value_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/default_data_test.rb b/test/unit/default_data_test.rb
index be6b00a..60dee7a 100644
--- a/test/unit/default_data_test.rb
+++ b/test/unit/default_data_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/document_category_test.rb b/test/unit/document_category_test.rb
index 1a65627..8ae0ab2 100644
--- a/test/unit/document_category_test.rb
+++ b/test/unit/document_category_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/document_test.rb b/test/unit/document_test.rb
index 52500a8..b576cf4 100644
--- a/test/unit/document_test.rb
+++ b/test/unit/document_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/enabled_module_test.rb b/test/unit/enabled_module_test.rb
index 8c02adf..f50fbba 100644
--- a/test/unit/enabled_module_test.rb
+++ b/test/unit/enabled_module_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/enumeration_test.rb b/test/unit/enumeration_test.rb
index ac5e15c..3695e14 100644
--- a/test/unit/enumeration_test.rb
+++ b/test/unit/enumeration_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/group_test.rb b/test/unit/group_test.rb
index 9383cc7..b7302ad 100644
--- a/test/unit/group_test.rb
+++ b/test/unit/group_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/helpers/activities_helper_test.rb b/test/unit/helpers/activities_helper_test.rb
index 2211135..57c93fa 100644
--- a/test/unit/helpers/activities_helper_test.rb
+++ b/test/unit/helpers/activities_helper_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/helpers/application_helper_test.rb b/test/unit/helpers/application_helper_test.rb
index 6b0d1c7..63af4cc 100644
--- a/test/unit/helpers/application_helper_test.rb
+++ b/test/unit/helpers/application_helper_test.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
#
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -1242,14 +1242,14 @@ RAW
result = textilizable(raw, :edit_section_links => {:controller => 'wiki', :action => 'edit', :project_id => '1', :id => 'Test'}).gsub("\n", "")
# heading that contains inline code
- assert_match Regexp.new('<div class="contextual" title="Edit this section" id="section-4">' +
+ assert_match Regexp.new('<div class="contextual heading-2" title="Edit this section" id="section-4">' +
'<a href="/projects/1/wiki/Test/edit\?section=4"><img src="/images/edit.png(\?\d+)?" alt="Edit" /></a></div>' +
'<a name="Subtitle-with-inline-code"></a>' +
'<h2 >Subtitle with <code>inline code</code><a href="#Subtitle-with-inline-code" class="wiki-anchor">¶</a></h2>'),
result
# last heading
- assert_match Regexp.new('<div class="contextual" title="Edit this section" id="section-5">' +
+ assert_match Regexp.new('<div class="contextual heading-2" title="Edit this section" id="section-5">' +
'<a href="/projects/1/wiki/Test/edit\?section=5"><img src="/images/edit.png(\?\d+)?" alt="Edit" /></a></div>' +
'<a name="Subtitle-after-pre-tag"></a>' +
'<h2 >Subtitle after pre tag<a href="#Subtitle-after-pre-tag" class="wiki-anchor">¶</a></h2>'),
diff --git a/test/unit/helpers/custom_fields_helper_test.rb b/test/unit/helpers/custom_fields_helper_test.rb
index 7b3a6fe..5ee500f 100644
--- a/test/unit/helpers/custom_fields_helper_test.rb
+++ b/test/unit/helpers/custom_fields_helper_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/helpers/groups_helper_test.rb b/test/unit/helpers/groups_helper_test.rb
index 3492a0d..dc30470 100644
--- a/test/unit/helpers/groups_helper_test.rb
+++ b/test/unit/helpers/groups_helper_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/helpers/issues_helper_test.rb b/test/unit/helpers/issues_helper_test.rb
index 7e9ec0e..63f8be0 100644
--- a/test/unit/helpers/issues_helper_test.rb
+++ b/test/unit/helpers/issues_helper_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/helpers/journals_helper_test.rb b/test/unit/helpers/journals_helper_test.rb
index eb3b222..c33a108 100644
--- a/test/unit/helpers/journals_helper_test.rb
+++ b/test/unit/helpers/journals_helper_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/helpers/members_helper_test.rb b/test/unit/helpers/members_helper_test.rb
index 61089bd..c9d7b09 100644
--- a/test/unit/helpers/members_helper_test.rb
+++ b/test/unit/helpers/members_helper_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/helpers/my_helper_test.rb b/test/unit/helpers/my_helper_test.rb
index e8528d0..2b7fa32 100644
--- a/test/unit/helpers/my_helper_test.rb
+++ b/test/unit/helpers/my_helper_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/helpers/projects_helper_test.rb b/test/unit/helpers/projects_helper_test.rb
index 5b77805..8a06a24 100644
--- a/test/unit/helpers/projects_helper_test.rb
+++ b/test/unit/helpers/projects_helper_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/helpers/queries_helper_test.rb b/test/unit/helpers/queries_helper_test.rb
index 74c4c29..c7c264a 100644
--- a/test/unit/helpers/queries_helper_test.rb
+++ b/test/unit/helpers/queries_helper_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/helpers/routes_helper_test.rb b/test/unit/helpers/routes_helper_test.rb
index 74ec4f1..dd92ea6 100644
--- a/test/unit/helpers/routes_helper_test.rb
+++ b/test/unit/helpers/routes_helper_test.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
#
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/helpers/search_helper_test.rb b/test/unit/helpers/search_helper_test.rb
index 6f71bd8..07b58ac 100644
--- a/test/unit/helpers/search_helper_test.rb
+++ b/test/unit/helpers/search_helper_test.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
#
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/helpers/settings_helper_test.rb b/test/unit/helpers/settings_helper_test.rb
index 1d3afdf..be37fb7 100644
--- a/test/unit/helpers/settings_helper_test.rb
+++ b/test/unit/helpers/settings_helper_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/helpers/sort_helper_test.rb b/test/unit/helpers/sort_helper_test.rb
index 4f4ae3d..c9e561d 100644
--- a/test/unit/helpers/sort_helper_test.rb
+++ b/test/unit/helpers/sort_helper_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/helpers/timelog_helper_test.rb b/test/unit/helpers/timelog_helper_test.rb
index d5255e6..044981a 100644
--- a/test/unit/helpers/timelog_helper_test.rb
+++ b/test/unit/helpers/timelog_helper_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/helpers/version_helper_test.rb b/test/unit/helpers/version_helper_test.rb
index 65aca3f..6530bb2 100644
--- a/test/unit/helpers/version_helper_test.rb
+++ b/test/unit/helpers/version_helper_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/helpers/watchers_helper_test.rb b/test/unit/helpers/watchers_helper_test.rb
index 97a0a00..1e567ab 100644
--- a/test/unit/helpers/watchers_helper_test.rb
+++ b/test/unit/helpers/watchers_helper_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/helpers/wiki_helper_test.rb b/test/unit/helpers/wiki_helper_test.rb
index 7e3bc09..74dda89 100644
--- a/test/unit/helpers/wiki_helper_test.rb
+++ b/test/unit/helpers/wiki_helper_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/initializers/patches_test.rb b/test/unit/initializers/patches_test.rb
index 570a455..85d6234 100644
--- a/test/unit/initializers/patches_test.rb
+++ b/test/unit/initializers/patches_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/issue_category_test.rb b/test/unit/issue_category_test.rb
index 5510e7f..85f2e64 100644
--- a/test/unit/issue_category_test.rb
+++ b/test/unit/issue_category_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/issue_custom_field_test.rb b/test/unit/issue_custom_field_test.rb
index 0f70b7e..382cd3f 100644
--- a/test/unit/issue_custom_field_test.rb
+++ b/test/unit/issue_custom_field_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/issue_import_test.rb b/test/unit/issue_import_test.rb
index 1cc8a5e..61e1007 100644
--- a/test/unit/issue_import_test.rb
+++ b/test/unit/issue_import_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/issue_nested_set_concurrency_test.rb b/test/unit/issue_nested_set_concurrency_test.rb
index 7467ae2..a1bdbda 100644
--- a/test/unit/issue_nested_set_concurrency_test.rb
+++ b/test/unit/issue_nested_set_concurrency_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/issue_nested_set_test.rb b/test/unit/issue_nested_set_test.rb
index 0c2631a..88f65d3 100644
--- a/test/unit/issue_nested_set_test.rb
+++ b/test/unit/issue_nested_set_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/issue_priority_test.rb b/test/unit/issue_priority_test.rb
index e9d44b6..b4aa085 100644
--- a/test/unit/issue_priority_test.rb
+++ b/test/unit/issue_priority_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -99,6 +99,20 @@ class IssuePriorityTest < ActiveSupport::TestCase
assert_equal %w(lowest default high4 high3 high2 highest), IssuePriority.active.to_a.sort.map(&:position_name)
end
+ def test_moving_a_priority_should_update_position_names
+ prio = IssuePriority.first
+ prio.move_to = 'lowest'
+ prio.reload
+ assert_equal 'highest', prio.position_name
+ end
+
+ def test_deactivating_a_priority_should_update_position_names
+ prio = IssuePriority.active.order(:position).last
+ prio.active = false
+ prio.save
+ assert_equal 'highest', IssuePriority.active.order(:position).last.position_name
+ end
+
def test_destroying_a_priority_should_update_position_names
IssuePriority.find_by_position_name('highest').destroy
assert_equal %w(lowest default high2 highest), IssuePriority.active.to_a.sort.map(&:position_name)
diff --git a/test/unit/issue_relation_test.rb b/test/unit/issue_relation_test.rb
index ee56529..f46a29c 100644
--- a/test/unit/issue_relation_test.rb
+++ b/test/unit/issue_relation_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/issue_scopes_test.rb b/test/unit/issue_scopes_test.rb
index 8d6baf4..744ccee 100644
--- a/test/unit/issue_scopes_test.rb
+++ b/test/unit/issue_scopes_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/issue_status_test.rb b/test/unit/issue_status_test.rb
index 9828264..77f3580 100644
--- a/test/unit/issue_status_test.rb
+++ b/test/unit/issue_status_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/issue_subtasking_test.rb b/test/unit/issue_subtasking_test.rb
index cadfe66..a839892 100644
--- a/test/unit/issue_subtasking_test.rb
+++ b/test/unit/issue_subtasking_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/issue_test.rb b/test/unit/issue_test.rb
index 1dea102..510b0eb 100644
--- a/test/unit/issue_test.rb
+++ b/test/unit/issue_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -790,6 +790,40 @@ class IssueTest < ActiveSupport::TestCase
assert_nil issue.custom_field_value(cf2)
end
+ def test_safe_attributes_should_ignore_unassignable_assignee
+ issue = Issue.new(:project_id => 1, :tracker_id => 1, :author_id => 3,
+ :status_id => 1, :priority => IssuePriority.all.first,
+ :subject => 'test_create')
+ assert issue.valid?
+
+ # locked user, not allowed
+ issue.safe_attributes=({'assigned_to_id' => '5'})
+ assert_nil issue.assigned_to_id
+ # no member
+ issue.safe_attributes=({'assigned_to_id' => '1'})
+ assert_nil issue.assigned_to_id
+ # user 2 is ok
+ issue.safe_attributes=({'assigned_to_id' => '2'})
+ assert_equal 2, issue.assigned_to_id
+ assert issue.save
+
+ issue.reload
+ assert_equal 2, issue.assigned_to_id
+ issue.safe_attributes=({'assigned_to_id' => '5'})
+ assert_equal 2, issue.assigned_to_id
+ issue.safe_attributes=({'assigned_to_id' => '1'})
+ assert_equal 2, issue.assigned_to_id
+ # user 3 is also ok
+ issue.safe_attributes=({'assigned_to_id' => '3'})
+ assert_equal 3, issue.assigned_to_id
+ assert issue.save
+
+ # removal of assignee
+ issue.safe_attributes=({'assigned_to_id' => ''})
+ assert_nil issue.assigned_to_id
+ assert issue.save
+ end
+
def test_editable_custom_field_values_should_return_non_readonly_custom_values
cf1 = IssueCustomField.create!(:name => 'Writable field', :field_format => 'string',
:is_for_all => true, :tracker_ids => [1, 2])
@@ -1274,6 +1308,24 @@ class IssueTest < ActiveSupport::TestCase
assert issue3.reload.closed?
end
+ def test_should_close_duplicates_with_private_notes
+ issue = Issue.generate!
+ duplicate = Issue.generate!
+ IssueRelation.create!(:issue_from => duplicate, :issue_to => issue,
+ :relation_type => IssueRelation::TYPE_DUPLICATES)
+ assert issue.reload.duplicates.include?(duplicate)
+
+ # Closing issue with private notes
+ issue.init_journal(User.first, "Private notes")
+ issue.private_notes = true
+ issue.status = IssueStatus.where(:is_closed => true).first
+ assert_save issue
+
+ duplicate.reload
+ assert journal = duplicate.journals.detect {|journal| journal.notes == "Private notes"}
+ assert_equal true, journal.private_notes
+ end
+
def test_should_not_close_duplicated_issue
issue1 = Issue.generate!
issue2 = Issue.generate!
@@ -1929,6 +1981,20 @@ class IssueTest < ActiveSupport::TestCase
assert issue.assignable_users.include?(non_project_member)
end
+ def test_assignable_users_should_not_include_anonymous_user
+ issue = Issue.generate!(:author => User.anonymous)
+
+ assert !issue.assignable_users.include?(User.anonymous)
+ end
+
+ def test_assignable_users_should_not_include_locked_user
+ user = User.generate!
+ issue = Issue.generate!(:author => user)
+ user.lock!
+
+ assert !issue.assignable_users.include?(user)
+ end
+
test "#assignable_users should include the current assignee" do
user = User.generate!
issue = Issue.generate!(:assigned_to => user)
diff --git a/test/unit/issue_transaction_test.rb b/test/unit/issue_transaction_test.rb
index 8d61c53..816c60d 100644
--- a/test/unit/issue_transaction_test.rb
+++ b/test/unit/issue_transaction_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/journal_observer_test.rb b/test/unit/journal_observer_test.rb
index 37c0261..ff17722 100644
--- a/test/unit/journal_observer_test.rb
+++ b/test/unit/journal_observer_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/journal_test.rb b/test/unit/journal_test.rb
index 9dc2d40..f26b284 100644
--- a/test/unit/journal_test.rb
+++ b/test/unit/journal_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/lib/redmine/access_control_test.rb b/test/unit/lib/redmine/access_control_test.rb
index e6c4518..6a6f1b7 100644
--- a/test/unit/lib/redmine/access_control_test.rb
+++ b/test/unit/lib/redmine/access_control_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/lib/redmine/ciphering_test.rb b/test/unit/lib/redmine/ciphering_test.rb
index a9f06cc..ad3654b 100644
--- a/test/unit/lib/redmine/ciphering_test.rb
+++ b/test/unit/lib/redmine/ciphering_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/lib/redmine/codeset_util_test.rb b/test/unit/lib/redmine/codeset_util_test.rb
index 75d8864..f5a6d63 100644
--- a/test/unit/lib/redmine/codeset_util_test.rb
+++ b/test/unit/lib/redmine/codeset_util_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/lib/redmine/configuration_test.rb b/test/unit/lib/redmine/configuration_test.rb
index 3f1a4bf..7ca8410 100644
--- a/test/unit/lib/redmine/configuration_test.rb
+++ b/test/unit/lib/redmine/configuration_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/lib/redmine/export/csv_test.rb b/test/unit/lib/redmine/export/csv_test.rb
index df200c1..e92dd94 100644
--- a/test/unit/lib/redmine/export/csv_test.rb
+++ b/test/unit/lib/redmine/export/csv_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/lib/redmine/export/pdf_test.rb b/test/unit/lib/redmine/export/pdf_test.rb
index cfc507f..d19bdeb 100644
--- a/test/unit/lib/redmine/export/pdf_test.rb
+++ b/test/unit/lib/redmine/export/pdf_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/lib/redmine/field_format/bool_format_test.rb b/test/unit/lib/redmine/field_format/bool_format_test.rb
index 3a93eb3..2bd0371 100644
--- a/test/unit/lib/redmine/field_format/bool_format_test.rb
+++ b/test/unit/lib/redmine/field_format/bool_format_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/lib/redmine/field_format/enumeration_format_test.rb b/test/unit/lib/redmine/field_format/enumeration_format_test.rb
index bdc7e2c..a78bdf1 100644
--- a/test/unit/lib/redmine/field_format/enumeration_format_test.rb
+++ b/test/unit/lib/redmine/field_format/enumeration_format_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/lib/redmine/field_format/field_format_test.rb b/test/unit/lib/redmine/field_format/field_format_test.rb
index 8dee0b4..9864d0c 100644
--- a/test/unit/lib/redmine/field_format/field_format_test.rb
+++ b/test/unit/lib/redmine/field_format/field_format_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/lib/redmine/field_format/link_format_test.rb b/test/unit/lib/redmine/field_format/link_format_test.rb
index 767a3de..9e8a460 100644
--- a/test/unit/lib/redmine/field_format/link_format_test.rb
+++ b/test/unit/lib/redmine/field_format/link_format_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/lib/redmine/field_format/list_format_test.rb b/test/unit/lib/redmine/field_format/list_format_test.rb
index 1b62873..af44cc5 100644
--- a/test/unit/lib/redmine/field_format/list_format_test.rb
+++ b/test/unit/lib/redmine/field_format/list_format_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/lib/redmine/field_format/numeric_format_test.rb b/test/unit/lib/redmine/field_format/numeric_format_test.rb
index 07b5618..eaf2a66 100644
--- a/test/unit/lib/redmine/field_format/numeric_format_test.rb
+++ b/test/unit/lib/redmine/field_format/numeric_format_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/lib/redmine/field_format/user_field_format_test.rb b/test/unit/lib/redmine/field_format/user_field_format_test.rb
index 6d0132f..6aa751b 100644
--- a/test/unit/lib/redmine/field_format/user_field_format_test.rb
+++ b/test/unit/lib/redmine/field_format/user_field_format_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/lib/redmine/field_format/version_field_format_test.rb b/test/unit/lib/redmine/field_format/version_field_format_test.rb
index fb4a5db..1918951 100644
--- a/test/unit/lib/redmine/field_format/version_field_format_test.rb
+++ b/test/unit/lib/redmine/field_format/version_field_format_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/lib/redmine/helpers/calendar_test.rb b/test/unit/lib/redmine/helpers/calendar_test.rb
index c1d26ed..ee7c4b0 100644
--- a/test/unit/lib/redmine/helpers/calendar_test.rb
+++ b/test/unit/lib/redmine/helpers/calendar_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/lib/redmine/helpers/diff_test.rb b/test/unit/lib/redmine/helpers/diff_test.rb
index a5f7afe..c6654ce 100644
--- a/test/unit/lib/redmine/helpers/diff_test.rb
+++ b/test/unit/lib/redmine/helpers/diff_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/lib/redmine/helpers/gantt_test.rb b/test/unit/lib/redmine/helpers/gantt_test.rb
index 49ecaeb..fcfed88 100644
--- a/test/unit/lib/redmine/helpers/gantt_test.rb
+++ b/test/unit/lib/redmine/helpers/gantt_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/lib/redmine/hook_test.rb b/test/unit/lib/redmine/hook_test.rb
index 109abc8..505d085 100644
--- a/test/unit/lib/redmine/hook_test.rb
+++ b/test/unit/lib/redmine/hook_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/lib/redmine/i18n_test.rb b/test/unit/lib/redmine/i18n_test.rb
index 4e3d8fc..660612c 100644
--- a/test/unit/lib/redmine/i18n_test.rb
+++ b/test/unit/lib/redmine/i18n_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/lib/redmine/info_test.rb b/test/unit/lib/redmine/info_test.rb
index c0c1ec6..9b88e5a 100644
--- a/test/unit/lib/redmine/info_test.rb
+++ b/test/unit/lib/redmine/info_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/lib/redmine/menu_manager/mapper_test.rb b/test/unit/lib/redmine/menu_manager/mapper_test.rb
index bf68368..fbffc5d 100644
--- a/test/unit/lib/redmine/menu_manager/mapper_test.rb
+++ b/test/unit/lib/redmine/menu_manager/mapper_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
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 dd5e785..975991e 100644
--- a/test/unit/lib/redmine/menu_manager/menu_helper_test.rb
+++ b/test/unit/lib/redmine/menu_manager/menu_helper_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
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 03c7ca4..5259234 100644
--- a/test/unit/lib/redmine/menu_manager/menu_item_test.rb
+++ b/test/unit/lib/redmine/menu_manager/menu_item_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2009 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/lib/redmine/menu_manager_test.rb b/test/unit/lib/redmine/menu_manager_test.rb
index fd99a3a..c4e3354 100644
--- a/test/unit/lib/redmine/menu_manager_test.rb
+++ b/test/unit/lib/redmine/menu_manager_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/lib/redmine/mime_type_test.rb b/test/unit/lib/redmine/mime_type_test.rb
index 7f76314..3e3d6c6 100644
--- a/test/unit/lib/redmine/mime_type_test.rb
+++ b/test/unit/lib/redmine/mime_type_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/lib/redmine/notifiable_test.rb b/test/unit/lib/redmine/notifiable_test.rb
index 5f7b2b1..21a484b 100644
--- a/test/unit/lib/redmine/notifiable_test.rb
+++ b/test/unit/lib/redmine/notifiable_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/lib/redmine/pagination_helper_test.rb b/test/unit/lib/redmine/pagination_helper_test.rb
index 5185416..82d537b 100644
--- a/test/unit/lib/redmine/pagination_helper_test.rb
+++ b/test/unit/lib/redmine/pagination_helper_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/lib/redmine/pagination_test.rb b/test/unit/lib/redmine/pagination_test.rb
index a5efa8f..aa54309 100644
--- a/test/unit/lib/redmine/pagination_test.rb
+++ b/test/unit/lib/redmine/pagination_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/lib/redmine/plugin_test.rb b/test/unit/lib/redmine/plugin_test.rb
index f922ab5..0bb6bd4 100644
--- a/test/unit/lib/redmine/plugin_test.rb
+++ b/test/unit/lib/redmine/plugin_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/lib/redmine/safe_attributes_test.rb b/test/unit/lib/redmine/safe_attributes_test.rb
index b4c64f6..8b1eebc 100644
--- a/test/unit/lib/redmine/safe_attributes_test.rb
+++ b/test/unit/lib/redmine/safe_attributes_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
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 b6eeb93..0f815b5 100644
--- a/test/unit/lib/redmine/scm/adapters/bazaar_adapter_test.rb
+++ b/test/unit/lib/redmine/scm/adapters/bazaar_adapter_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
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 8af15f4..4f0e552 100644
--- a/test/unit/lib/redmine/scm/adapters/cvs_adapter_test.rb
+++ b/test/unit/lib/redmine/scm/adapters/cvs_adapter_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
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 67f0c72..c5cc746 100644
--- a/test/unit/lib/redmine/scm/adapters/darcs_adapter_test.rb
+++ b/test/unit/lib/redmine/scm/adapters/darcs_adapter_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
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 816d11f..b82fc1c 100644
--- a/test/unit/lib/redmine/scm/adapters/filesystem_adapter_test.rb
+++ b/test/unit/lib/redmine/scm/adapters/filesystem_adapter_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
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 1a7d428..6757d5b 100644
--- a/test/unit/lib/redmine/scm/adapters/git_adapter_test.rb
+++ b/test/unit/lib/redmine/scm/adapters/git_adapter_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
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 0342135..b093e31 100644
--- a/test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb
+++ b/test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
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 e23b816..b212fcf 100644
--- a/test/unit/lib/redmine/scm/adapters/subversion_adapter_test.rb
+++ b/test/unit/lib/redmine/scm/adapters/subversion_adapter_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/lib/redmine/themes_test.rb b/test/unit/lib/redmine/themes_test.rb
index de9b2e9..4ea2eaa 100644
--- a/test/unit/lib/redmine/themes_test.rb
+++ b/test/unit/lib/redmine/themes_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/lib/redmine/unified_diff_test.rb b/test/unit/lib/redmine/unified_diff_test.rb
index 1aa4f64..f0f3ba1 100644
--- a/test/unit/lib/redmine/unified_diff_test.rb
+++ b/test/unit/lib/redmine/unified_diff_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/lib/redmine/utils/date_calculation.rb b/test/unit/lib/redmine/utils/date_calculation.rb
index 7aa3570..e1e2c85 100644
--- a/test/unit/lib/redmine/utils/date_calculation.rb
+++ b/test/unit/lib/redmine/utils/date_calculation.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/lib/redmine/views/builders/json_test.rb b/test/unit/lib/redmine/views/builders/json_test.rb
index 3bd1d59..0cb75c9 100644
--- a/test/unit/lib/redmine/views/builders/json_test.rb
+++ b/test/unit/lib/redmine/views/builders/json_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/lib/redmine/views/builders/xml_test.rb b/test/unit/lib/redmine/views/builders/xml_test.rb
index 36a96c3..bdbc15a 100644
--- a/test/unit/lib/redmine/views/builders/xml_test.rb
+++ b/test/unit/lib/redmine/views/builders/xml_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/lib/redmine/views/labelled_form_builder_test.rb b/test/unit/lib/redmine/views/labelled_form_builder_test.rb
index f344fa7..ad3c35c 100644
--- a/test/unit/lib/redmine/views/labelled_form_builder_test.rb
+++ b/test/unit/lib/redmine/views/labelled_form_builder_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/lib/redmine/wiki_formatting/html_parser_test.rb b/test/unit/lib/redmine/wiki_formatting/html_parser_test.rb
index 8f6ff5a..aab20d8 100644
--- a/test/unit/lib/redmine/wiki_formatting/html_parser_test.rb
+++ b/test/unit/lib/redmine/wiki_formatting/html_parser_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/lib/redmine/wiki_formatting/macros_test.rb b/test/unit/lib/redmine/wiki_formatting/macros_test.rb
index 71d22ee..e47446d 100644
--- a/test/unit/lib/redmine/wiki_formatting/macros_test.rb
+++ b/test/unit/lib/redmine/wiki_formatting/macros_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/lib/redmine/wiki_formatting/markdown_formatter_test.rb b/test/unit/lib/redmine/wiki_formatting/markdown_formatter_test.rb
index 9b5c600..6222c21 100644
--- a/test/unit/lib/redmine/wiki_formatting/markdown_formatter_test.rb
+++ b/test/unit/lib/redmine/wiki_formatting/markdown_formatter_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/lib/redmine/wiki_formatting/markdown_html_parser_test.rb b/test/unit/lib/redmine/wiki_formatting/markdown_html_parser_test.rb
index 01e2480..aa1fa8e 100644
--- a/test/unit/lib/redmine/wiki_formatting/markdown_html_parser_test.rb
+++ b/test/unit/lib/redmine/wiki_formatting/markdown_html_parser_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
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 574d384..03d4ef5 100644
--- a/test/unit/lib/redmine/wiki_formatting/textile_formatter_test.rb
+++ b/test/unit/lib/redmine/wiki_formatting/textile_formatter_test.rb
@@ -1,7 +1,7 @@
#encoding: utf-8
#
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/lib/redmine/wiki_formatting/textile_html_parser_test.rb b/test/unit/lib/redmine/wiki_formatting/textile_html_parser_test.rb
index cc838bb..d4a27f1 100644
--- a/test/unit/lib/redmine/wiki_formatting/textile_html_parser_test.rb
+++ b/test/unit/lib/redmine/wiki_formatting/textile_html_parser_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/lib/redmine/wiki_formatting_test.rb b/test/unit/lib/redmine/wiki_formatting_test.rb
index cd7f40e..09074b9 100644
--- a/test/unit/lib/redmine/wiki_formatting_test.rb
+++ b/test/unit/lib/redmine/wiki_formatting_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/lib/redmine_test.rb b/test/unit/lib/redmine_test.rb
index a711bf9..4329871 100644
--- a/test/unit/lib/redmine_test.rb
+++ b/test/unit/lib/redmine_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/mail_handler_test.rb b/test/unit/mail_handler_test.rb
index e2522db..271586f 100644
--- a/test/unit/mail_handler_test.rb
+++ b/test/unit/mail_handler_test.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
#
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/mailer_test.rb b/test/unit/mailer_test.rb
index f3742c2..93b7a81 100644
--- a/test/unit/mailer_test.rb
+++ b/test/unit/mailer_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/member_test.rb b/test/unit/member_test.rb
index ea88164..d0e2ea0 100644
--- a/test/unit/member_test.rb
+++ b/test/unit/member_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/message_test.rb b/test/unit/message_test.rb
index 3ee01ed..80c6bb6 100644
--- a/test/unit/message_test.rb
+++ b/test/unit/message_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/news_test.rb b/test/unit/news_test.rb
index 6104808..d97233b 100644
--- a/test/unit/news_test.rb
+++ b/test/unit/news_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/principal_test.rb b/test/unit/principal_test.rb
index b05f895..e3366e3 100644
--- a/test/unit/principal_test.rb
+++ b/test/unit/principal_test.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
#
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/project_copy_test.rb b/test/unit/project_copy_test.rb
index 537e393..9370beb 100644
--- a/test/unit/project_copy_test.rb
+++ b/test/unit/project_copy_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/project_members_inheritance_test.rb b/test/unit/project_members_inheritance_test.rb
index 905af04..43f52d8 100644
--- a/test/unit/project_members_inheritance_test.rb
+++ b/test/unit/project_members_inheritance_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/project_nested_set_concurrency_test.rb b/test/unit/project_nested_set_concurrency_test.rb
index 0feb32b..89b217b 100644
--- a/test/unit/project_nested_set_concurrency_test.rb
+++ b/test/unit/project_nested_set_concurrency_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/project_nested_set_test.rb b/test/unit/project_nested_set_test.rb
index de810e2..6c856f7 100644
--- a/test/unit/project_nested_set_test.rb
+++ b/test/unit/project_nested_set_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/project_test.rb b/test/unit/project_test.rb
index b6b578a..5c305f7 100644
--- a/test/unit/project_test.rb
+++ b/test/unit/project_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/query_test.rb b/test/unit/query_test.rb
index f7480e2..4336918 100644
--- a/test/unit/query_test.rb
+++ b/test/unit/query_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/repository_bazaar_test.rb b/test/unit/repository_bazaar_test.rb
index f31f6be..b000c7a 100644
--- a/test/unit/repository_bazaar_test.rb
+++ b/test/unit/repository_bazaar_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/repository_cvs_test.rb b/test/unit/repository_cvs_test.rb
index ef29d5b..71f3569 100644
--- a/test/unit/repository_cvs_test.rb
+++ b/test/unit/repository_cvs_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/repository_darcs_test.rb b/test/unit/repository_darcs_test.rb
index f8ec168..323d654 100644
--- a/test/unit/repository_darcs_test.rb
+++ b/test/unit/repository_darcs_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/repository_filesystem_test.rb b/test/unit/repository_filesystem_test.rb
index aff3f15..5e5c310 100644
--- a/test/unit/repository_filesystem_test.rb
+++ b/test/unit/repository_filesystem_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/repository_git_test.rb b/test/unit/repository_git_test.rb
index 20b72d0..15b7ea5 100644
--- a/test/unit/repository_git_test.rb
+++ b/test/unit/repository_git_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/repository_mercurial_test.rb b/test/unit/repository_mercurial_test.rb
index 91f9d0a..e52641b 100644
--- a/test/unit/repository_mercurial_test.rb
+++ b/test/unit/repository_mercurial_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/repository_subversion_test.rb b/test/unit/repository_subversion_test.rb
index 5dfb198..220aebc 100644
--- a/test/unit/repository_subversion_test.rb
+++ b/test/unit/repository_subversion_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/repository_test.rb b/test/unit/repository_test.rb
index daa859b..238c29d 100644
--- a/test/unit/repository_test.rb
+++ b/test/unit/repository_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/role_test.rb b/test/unit/role_test.rb
index 2dc9986..a043982 100644
--- a/test/unit/role_test.rb
+++ b/test/unit/role_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/search_test.rb b/test/unit/search_test.rb
index b640202..7395811 100644
--- a/test/unit/search_test.rb
+++ b/test/unit/search_test.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
#
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/setting_test.rb b/test/unit/setting_test.rb
index 95cd5e9..45a4b92 100644
--- a/test/unit/setting_test.rb
+++ b/test/unit/setting_test.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
#
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/time_entry_activity_test.rb b/test/unit/time_entry_activity_test.rb
index 645f747..9bc4760 100644
--- a/test/unit/time_entry_activity_test.rb
+++ b/test/unit/time_entry_activity_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/time_entry_query_test.rb b/test/unit/time_entry_query_test.rb
index f02b4e7..9ca864f 100644
--- a/test/unit/time_entry_query_test.rb
+++ b/test/unit/time_entry_query_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/time_entry_test.rb b/test/unit/time_entry_test.rb
index c9386cc..59f416c 100644
--- a/test/unit/time_entry_test.rb
+++ b/test/unit/time_entry_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/token_test.rb b/test/unit/token_test.rb
index 95559c5..fc0a5bd 100644
--- a/test/unit/token_test.rb
+++ b/test/unit/token_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/tracker_test.rb b/test/unit/tracker_test.rb
index f766a3a..658dbb7 100644
--- a/test/unit/tracker_test.rb
+++ b/test/unit/tracker_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2008 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/user_preference_test.rb b/test/unit/user_preference_test.rb
index c768624..a2f3c7f 100644
--- a/test/unit/user_preference_test.rb
+++ b/test/unit/user_preference_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -25,6 +25,13 @@ class UserPreferenceTest < ActiveSupport::TestCase
assert_equal true, preference.hide_mail
end
+ def test_hide_mail_should_default_to_false_with_setting
+ with_settings :default_users_hide_mail => '0' do
+ preference = UserPreference.new
+ assert_equal false, preference.hide_mail
+ end
+ end
+
def test_create
user = User.new(:firstname => "new", :lastname => "user", :mail => "newuser at somenet.foo")
user.login = "newuser"
diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb
index bc625c4..fd796fa 100644
--- a/test/unit/user_test.rb
+++ b/test/unit/user_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/version_test.rb b/test/unit/version_test.rb
index b61061b..3e060d2 100644
--- a/test/unit/version_test.rb
+++ b/test/unit/version_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/watcher_test.rb b/test/unit/watcher_test.rb
index e741733..f4d9179 100644
--- a/test/unit/watcher_test.rb
+++ b/test/unit/watcher_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/wiki_content_test.rb b/test/unit/wiki_content_test.rb
index 2563dfb..a20325a 100644
--- a/test/unit/wiki_content_test.rb
+++ b/test/unit/wiki_content_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/wiki_content_version_test.rb b/test/unit/wiki_content_version_test.rb
index 5a9a9ee..79e2166 100644
--- a/test/unit/wiki_content_version_test.rb
+++ b/test/unit/wiki_content_version_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/wiki_page_test.rb b/test/unit/wiki_page_test.rb
index 5fb1841..a0819e5 100644
--- a/test/unit/wiki_page_test.rb
+++ b/test/unit/wiki_page_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -121,6 +121,24 @@ class WikiPageTest < ActiveSupport::TestCase
assert_equal parent, child.parent
end
+ def test_move_parent_with_child_with_duplicate_name_should_not_move_child
+ parent = WikiPage.create!(:wiki_id => 1, :title => 'Parent')
+ child = WikiPage.create!(:wiki_id => 1, :title => 'Child', :parent_id => parent.id)
+ parent.reload
+ # page with the same name as the child in the target wiki
+ WikiPage.create!(:wiki_id => 2, :title => 'Child')
+
+ parent.wiki_id = 2
+ parent.save!
+
+ parent.reload
+ assert_equal 2, parent.wiki_id
+
+ child.reload
+ assert_equal 1, child.wiki_id
+ assert_nil child.parent_id
+ end
+
def test_destroy
page = WikiPage.find(1)
page.destroy
diff --git a/test/unit/wiki_redirect_test.rb b/test/unit/wiki_redirect_test.rb
index 4e99471..edc37de 100644
--- a/test/unit/wiki_redirect_test.rb
+++ b/test/unit/wiki_redirect_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/wiki_test.rb b/test/unit/wiki_test.rb
index 6c82e4b..98d94f6 100644
--- a/test/unit/wiki_test.rb
+++ b/test/unit/wiki_test.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
#
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/workflow_test.rb b/test/unit/workflow_test.rb
index 72ebbb7..85aa4bd 100644
--- a/test/unit/workflow_test.rb
+++ b/test/unit/workflow_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/test/unit/workflow_transition_test.rb b/test/unit/workflow_transition_test.rb
index 54381b8..8335c5a 100644
--- a/test/unit/workflow_transition_test.rb
+++ b/test/unit/workflow_transition_test.rb
@@ -1,5 +1,5 @@
# Redmine - project management software
-# Copyright (C) 2006-2015 Jean-Philippe Lang
+# Copyright (C) 2006-2016 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/redmine.git
More information about the Pkg-ruby-extras-commits
mailing list