[DRE-commits] [redmine] 01/07: Merge tag 'upstream/3.3.1'
Antonio Terceiro
terceiro at moszumanska.debian.org
Sat Nov 12 23:06:50 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 54d3764d5ae96a19e867c5c20ba862c474ffe4df
Merge: 5deb00e b03ddcf
Author: Antonio Terceiro <terceiro at debian.org>
Date: Sat Nov 12 19:12:20 2016 -0200
Merge tag 'upstream/3.3.1'
Upstream version 3.3.1
# gpg: Signature made sáb 12 nov 2016 19:12:18 BRST
# gpg: using RSA key B2DEE66036C40829FCD0F10CFC0DB1BBCD460BDE
# gpg: checking the trustdb
# gpg: marginals needed: 3 completes needed: 1 trust model: pgp
# gpg: depth: 0 valid: 2 signed: 119 trust: 0-, 0q, 0n, 0m, 0f, 2u
# gpg: depth: 1 valid: 119 signed: 46 trust: 119-, 0q, 0n, 0m, 0f, 0u
# gpg: next trustdb check due at 2017-01-11
# gpg: Good signature from "Antonio Terceiro <terceiro at softwarelivre.org>" [ultimate]
# gpg: aka "Antonio Terceiro <terceiro at dcc.ufba.br>" [ultimate]
# gpg: aka "Antonio Terceiro <terceiro at colivre.coop.br>" [ultimate]
# gpg: aka "Antonio Terceiro <terceiro at debian.org>" [ultimate]
# gpg: aka "Antonio Terceiro <antonio.terceiro at linaro.org>" [ultimate]
# gpg: aka "Antonio Terceiro <antonio.terceiro at linaro.org>" [ultimate]
Gemfile | 4 +-
app/controllers/account_controller.rb | 4 +-
app/controllers/activities_controller.rb | 2 +-
app/controllers/application_controller.rb | 20 +-
app/controllers/attachments_controller.rb | 25 +-
app/controllers/boards_controller.rb | 13 +-
app/controllers/calendars_controller.rb | 4 +-
app/controllers/context_menus_controller.rb | 20 +-
app/controllers/custom_fields_controller.rb | 14 +-
app/controllers/enumerations_controller.rb | 14 +-
app/controllers/imports_controller.rb | 6 +-
app/controllers/issue_relations_controller.rb | 6 +-
app/controllers/issue_statuses_controller.rb | 24 +-
app/controllers/issues_controller.rb | 98 +-
app/controllers/journals_controller.rb | 31 +-
app/controllers/my_controller.rb | 1 +
app/controllers/projects_controller.rb | 2 +-
app/controllers/reports_controller.rb | 4 +-
app/controllers/repositories_controller.rb | 39 +-
app/controllers/roles_controller.rb | 18 +-
app/controllers/search_controller.rb | 24 +-
app/controllers/settings_controller.rb | 5 +-
app/controllers/timelog_controller.rb | 9 +-
app/controllers/trackers_controller.rb | 30 +-
app/controllers/users_controller.rb | 2 +-
app/controllers/versions_controller.rb | 6 +-
app/controllers/watchers_controller.rb | 58 +-
app/controllers/wiki_controller.rb | 21 +-
app/helpers/application_helper.rb | 81 +-
app/helpers/email_addresses_helper.rb | 12 +-
app/helpers/imports_helper.rb | 6 +-
app/helpers/issues_helper.rb | 42 +-
app/helpers/journals_helper.rb | 30 +-
app/helpers/my_helper.rb | 6 +-
app/helpers/projects_helper.rb | 13 +
app/helpers/queries_helper.rb | 5 +-
app/helpers/routes_helper.rb | 12 +
app/helpers/settings_helper.rb | 2 +-
app/helpers/watchers_helper.rb | 6 +-
app/models/attachment.rb | 9 +
app/models/auth_source_ldap.rb | 7 +-
app/models/board.rb | 4 +-
app/models/custom_field.rb | 2 +-
app/models/email_address.rb | 57 +-
app/models/enumeration.rb | 41 +-
app/models/group.rb | 2 +
app/models/issue.rb | 256 +--
app/models/issue_import.rb | 40 +-
app/models/issue_query.rb | 16 +
app/models/issue_relation.rb | 43 +-
app/models/issue_status.rb | 2 +-
app/models/mail_handler.rb | 30 +-
app/models/mailer.rb | 44 +
app/models/principal.rb | 12 +
app/models/project.rb | 51 +-
app/models/query.rb | 73 +-
app/models/repository.rb | 12 +-
app/models/role.rb | 64 +-
app/models/setting.rb | 17 +
app/models/time_entry_query.rb | 14 +-
app/models/tracker.rb | 25 +-
app/models/user.rb | 54 +-
app/models/user_preference.rb | 3 +
app/models/version.rb | 15 +-
app/models/wiki_content.rb | 4 +
app/views/account/register.html.erb | 4 +
app/views/activities/index.html.erb | 2 +-
app/views/admin/info.html.erb | 3 +-
app/views/admin/plugins.html.erb | 4 +-
app/views/attachments/_links.html.erb | 28 +-
app/views/attachments/diff.html.erb | 30 +-
app/views/attachments/file.html.erb | 21 +-
app/views/attachments/image.html.erb | 3 +
app/views/attachments/other.html.erb | 3 +
app/views/common/_calendar.html.erb | 2 +-
app/views/common/_image.html.erb | 1 +
app/views/common/_other.html.erb | 1 +
app/views/common/_tabs.html.erb | 5 -
app/views/context_menus/issues.html.erb | 17 +
app/views/custom_field_enumerations/index.html.erb | 2 +-
app/views/custom_fields/_form.html.erb | 3 +-
app/views/custom_fields/_index.html.erb | 5 +-
app/views/custom_fields/formats/_date.html.erb | 2 +-
app/views/custom_fields/index.api.rsb | 1 +
app/views/custom_fields/index.html.erb | 4 +
app/views/enumerations/index.html.erb | 13 +-
app/views/gantts/show.html.erb | 6 +-
app/views/imports/_fields_mapping.html.erb | 16 +-
app/views/imports/mapping.html.erb | 2 +-
app/views/imports/show.html.erb | 22 +-
app/views/issue_statuses/index.html.erb | 11 +-
app/views/issues/_action_menu.html.erb | 2 +-
app/views/issues/_attributes.html.erb | 16 +-
app/views/issues/_changesets.html.erb | 12 +-
app/views/issues/_conflict.html.erb | 4 +-
app/views/issues/_edit.html.erb | 34 +-
app/views/issues/_form.html.erb | 2 +-
app/views/issues/_history.html.erb | 2 +-
app/views/issues/_relations.html.erb | 8 +-
app/views/issues/bulk_edit.html.erb | 4 +-
app/views/issues/index.html.erb | 24 +-
app/views/issues/show.api.rsb | 7 +-
app/views/issues/show.html.erb | 2 +-
app/views/journals/_notes_form.html.erb | 3 +-
.../file.html.erb => layouts/_file.html.erb} | 4 +-
app/views/layouts/base.html.erb | 11 +-
app/views/layouts/mailer.html.erb | 13 +
app/views/mail_handler/new.html.erb | 2 +
app/views/mailer/issue_add.html.erb | 2 +-
app/views/mailer/issue_edit.html.erb | 2 +-
app/views/mailer/security_notification.html.erb | 13 +
app/views/mailer/security_notification.text.erb | 8 +
app/views/mailer/settings_updated.html.erb | 14 +
app/views/mailer/settings_updated.text.erb | 12 +
app/views/messages/show.html.erb | 16 +-
app/views/my/blocks/_calendar.html.erb | 2 +-
app/views/my/blocks/_issuesreportedbyme.html.erb | 2 +-
app/views/my/blocks/_timelog.html.erb | 15 +-
app/views/news/show.html.erb | 8 +-
app/views/projects/settings/_boards.html.erb | 43 +-
app/views/projects/show.html.erb | 14 +-
app/views/queries/_form.html.erb | 4 +-
app/views/queries/edit.html.erb | 2 +-
app/views/queries/new.html.erb | 2 +-
app/views/reports/issue_report.html.erb | 56 +-
app/views/repositories/_changeset.html.erb | 45 +
app/views/repositories/_related_issues.html.erb | 6 +-
app/views/repositories/diff.html.erb | 6 +-
app/views/repositories/entry.html.erb | 8 +-
app/views/repositories/revision.html.erb | 46 +-
app/views/roles/_form.html.erb | 63 +-
app/views/roles/index.html.erb | 17 +-
app/views/roles/permissions.html.erb | 12 +-
app/views/search/index.api.rsb | 12 +
app/views/search/index.html.erb | 1 +
app/views/settings/_authentication.html.erb | 2 +-
app/views/settings/_display.html.erb | 2 +
app/views/settings/_repositories.html.erb | 20 +-
app/views/sudo_mode/new.html.erb | 2 +-
app/views/timelog/_date_range.html.erb | 4 +-
app/views/timelog/_form.html.erb | 2 +-
app/views/timelog/_list.html.erb | 14 +-
app/views/timelog/bulk_edit.html.erb | 2 +-
app/views/trackers/_form.html.erb | 3 +-
app/views/trackers/fields.html.erb | 15 +-
app/views/trackers/index.html.erb | 13 +-
app/views/versions/_form.html.erb | 2 +-
app/views/versions/_overview.html.erb | 3 +
app/views/versions/index.html.erb | 7 +-
app/views/versions/show.html.erb | 2 +-
app/views/watchers/_new.html.erb | 18 +-
app/views/watchers/_watchers.html.erb | 2 +-
app/views/watchers/create.js.erb | 7 +-
app/views/watchers/destroy.js.erb | 4 +-
app/views/watchers/new.js.erb | 2 +-
app/views/wiki/_new_modal.html.erb | 21 +
app/views/wiki/date_index.html.erb | 3 +
app/views/wiki/index.html.erb | 3 +
app/views/wiki/new.html.erb | 17 +
app/views/wiki/new.js.erb | 2 +
app/views/wiki/show.html.erb | 3 +
app/views/workflows/_form.html.erb | 15 +-
app/views/workflows/edit.html.erb | 4 +-
app/views/workflows/index.html.erb | 4 +-
app/views/workflows/permissions.html.erb | 4 +-
config/initializers/10-patches.rb | 15 +-
config/locales/ar.yml | 38 +-
config/locales/az.yml | 38 +-
config/locales/bg.yml | 35 +-
config/locales/bs.yml | 36 +-
config/locales/ca.yml | 1770 ++++++++++----------
config/locales/cs.yml | 106 +-
config/locales/da.yml | 36 +-
config/locales/de.yml | 94 +-
config/locales/el.yml | 36 +-
config/locales/en-GB.yml | 38 +-
config/locales/en.yml | 35 +-
config/locales/es-PA.yml | 40 +-
config/locales/es.yml | 36 +-
config/locales/et.yml | 410 ++---
config/locales/eu.yml | 36 +-
config/locales/fa.yml | 36 +-
config/locales/fi.yml | 36 +-
config/locales/fr.yml | 35 +-
config/locales/gl.yml | 36 +-
config/locales/he.yml | 36 +-
config/locales/hr.yml | 36 +-
config/locales/hu.yml | 36 +-
config/locales/id.yml | 36 +-
config/locales/it.yml | 36 +-
config/locales/ja.yml | 38 +-
config/locales/ko.yml | 58 +-
config/locales/lt.yml | 782 ++++-----
config/locales/lv.yml | 36 +-
config/locales/mk.yml | 36 +-
config/locales/mn.yml | 36 +-
config/locales/nl.yml | 36 +-
config/locales/no.yml | 36 +-
config/locales/pl.yml | 36 +-
config/locales/pt-BR.yml | 35 +-
config/locales/pt.yml | 33 +-
config/locales/ro.yml | 36 +-
config/locales/ru.yml | 51 +-
config/locales/sk.yml | 36 +-
config/locales/sl.yml | 36 +-
config/locales/sq.yml | 36 +-
config/locales/sr-YU.yml | 36 +-
config/locales/sr.yml | 36 +-
config/locales/sv.yml | 36 +-
config/locales/th.yml | 36 +-
config/locales/tr.yml | 45 +-
config/locales/uk.yml | 36 +-
config/locales/vi.yml | 36 +-
config/locales/zh-TW.yml | 36 +-
config/locales/zh.yml | 52 +-
config/routes.rb | 12 +-
config/settings.yml | 20 +-
...0404080304_force_password_reset_during_setup.rb | 9 +
.../20160416072926_remove_position_defaults.rb | 13 +
db/migrate/20160529063352_add_roles_settings.rb | 5 +
doc/CHANGELOG | 157 ++
doc/RUNNING_TESTS | 9 +-
extra/mail_handler/rdm-mailhandler.rb | 5 +-
.../acts_as_attachable/lib/acts_as_attachable.rb | 13 +-
.../acts_as_list/lib/active_record/acts/list.rb | 1 +
.../acts_as_watchable/lib/acts_as_watchable.rb | 4 +
lib/plugins/gravatar/lib/gravatar.rb | 14 +-
lib/redmine.rb | 56 +-
lib/redmine/acts/positioned.rb | 118 ++
lib/redmine/export/pdf/issues_pdf_helper.rb | 4 +-
lib/redmine/export/pdf/wiki_pdf_helper.rb | 4 +-
lib/redmine/field_format.rb | 39 +-
lib/redmine/helpers/diff.rb | 8 +-
lib/redmine/helpers/gantt.rb | 14 +-
lib/redmine/helpers/time_report.rb | 6 +-
lib/redmine/helpers/url.rb | 2 +-
lib/redmine/i18n.rb | 6 +-
lib/redmine/menu_manager.rb | 25 +-
lib/redmine/mime_type.rb | 2 +-
lib/redmine/pagination.rb | 33 +-
lib/redmine/sudo_mode.rb | 2 +-
lib/redmine/version.rb | 4 +-
lib/redmine/views/builders/json.rb | 2 +-
lib/tasks/email.rake | 1 +
public/help/cs/wiki_syntax_detailed_markdown.html | 8 +-
public/help/cs/wiki_syntax_detailed_textile.html | 8 +-
public/help/ja/wiki_syntax_detailed_textile.html | 32 +-
.../help/zh-tw/wiki_syntax_detailed_markdown.html | 216 +--
.../help/zh-tw/wiki_syntax_detailed_textile.html | 84 +-
public/help/zh-tw/wiki_syntax_markdown.html | 54 +-
public/help/zh-tw/wiki_syntax_textile.html | 20 +-
public/images/jstoolbar/bt_precode.png | Bin 0 -> 389 bytes
public/images/reorder.png | Bin 0 -> 472 bytes
public/javascripts/application.js | 131 +-
public/javascripts/context_menu.js | 20 +-
.../javascripts/jstoolbar/jstoolbar-textile.min.js | 3 +-
public/javascripts/jstoolbar/jstoolbar.js | 21 +
public/javascripts/jstoolbar/lang/jstoolbar-ar.js | 31 +-
public/javascripts/jstoolbar/lang/jstoolbar-az.js | 1 +
public/javascripts/jstoolbar/lang/jstoolbar-bg.js | 1 +
public/javascripts/jstoolbar/lang/jstoolbar-bs.js | 1 +
public/javascripts/jstoolbar/lang/jstoolbar-ca.js | 1 +
public/javascripts/jstoolbar/lang/jstoolbar-cs.js | 1 +
public/javascripts/jstoolbar/lang/jstoolbar-da.js | 1 +
public/javascripts/jstoolbar/lang/jstoolbar-de.js | 1 +
.../javascripts/jstoolbar/lang/jstoolbar-en-gb.js | 1 +
public/javascripts/jstoolbar/lang/jstoolbar-en.js | 1 +
.../javascripts/jstoolbar/lang/jstoolbar-es-pa.js | 1 +
public/javascripts/jstoolbar/lang/jstoolbar-es.js | 1 +
public/javascripts/jstoolbar/lang/jstoolbar-et.js | 1 +
public/javascripts/jstoolbar/lang/jstoolbar-eu.js | 1 +
public/javascripts/jstoolbar/lang/jstoolbar-fa.js | 1 +
public/javascripts/jstoolbar/lang/jstoolbar-fi.js | 1 +
public/javascripts/jstoolbar/lang/jstoolbar-fr.js | 1 +
public/javascripts/jstoolbar/lang/jstoolbar-gl.js | 1 +
public/javascripts/jstoolbar/lang/jstoolbar-he.js | 1 +
public/javascripts/jstoolbar/lang/jstoolbar-hr.js | 1 +
public/javascripts/jstoolbar/lang/jstoolbar-hu.js | 1 +
public/javascripts/jstoolbar/lang/jstoolbar-id.js | 1 +
public/javascripts/jstoolbar/lang/jstoolbar-it.js | 1 +
public/javascripts/jstoolbar/lang/jstoolbar-ja.js | 1 +
public/javascripts/jstoolbar/lang/jstoolbar-ko.js | 1 +
public/javascripts/jstoolbar/lang/jstoolbar-lt.js | 1 +
public/javascripts/jstoolbar/lang/jstoolbar-lv.js | 1 +
public/javascripts/jstoolbar/lang/jstoolbar-mk.js | 1 +
public/javascripts/jstoolbar/lang/jstoolbar-mn.js | 1 +
public/javascripts/jstoolbar/lang/jstoolbar-nl.js | 1 +
public/javascripts/jstoolbar/lang/jstoolbar-no.js | 1 +
public/javascripts/jstoolbar/lang/jstoolbar-pl.js | 1 +
.../javascripts/jstoolbar/lang/jstoolbar-pt-br.js | 1 +
public/javascripts/jstoolbar/lang/jstoolbar-pt.js | 1 +
public/javascripts/jstoolbar/lang/jstoolbar-ro.js | 1 +
public/javascripts/jstoolbar/lang/jstoolbar-ru.js | 1 +
public/javascripts/jstoolbar/lang/jstoolbar-sk.js | 1 +
public/javascripts/jstoolbar/lang/jstoolbar-sl.js | 1 +
public/javascripts/jstoolbar/lang/jstoolbar-sq.js | 1 +
.../javascripts/jstoolbar/lang/jstoolbar-sr-yu.js | 1 +
public/javascripts/jstoolbar/lang/jstoolbar-sr.js | 1 +
public/javascripts/jstoolbar/lang/jstoolbar-sv.js | 1 +
public/javascripts/jstoolbar/lang/jstoolbar-th.js | 1 +
public/javascripts/jstoolbar/lang/jstoolbar-tr.js | 1 +
public/javascripts/jstoolbar/lang/jstoolbar-uk.js | 1 +
public/javascripts/jstoolbar/lang/jstoolbar-vi.js | 1 +
.../javascripts/jstoolbar/lang/jstoolbar-zh-tw.js | 1 +
public/javascripts/jstoolbar/lang/jstoolbar-zh.js | 1 +
public/javascripts/jstoolbar/markdown.js | 14 +
public/javascripts/jstoolbar/textile.js | 14 +
public/stylesheets/application.css | 186 +-
public/stylesheets/context_menu.css | 6 +-
public/stylesheets/jstoolbar.css | 3 +
public/stylesheets/responsive.css | 3 +-
public/stylesheets/scm.css | 2 +
.../themes/alternate/stylesheets/application.css | 9 +
public/themes/classic/stylesheets/application.css | 9 +
test/fixtures/auth_sources.yml | 2 +-
test/fixtures/custom_fields.yml | 1 +
test/fixtures/enumerations.yml | 2 +
test/fixtures/files/import_issues.csv | 8 +-
.../fixtures/mail_handler/issue_update_with_cc.eml | 19 +
.../ticket_with_text_attachment_iso-8859-2.eml | 31 +
test/fixtures/roles.yml | 4 +-
test/fixtures/user_preferences.yml | 12 +-
test/functional/account_controller_test.rb | 41 +-
test/functional/attachments_controller_test.rb | 32 +-
test/functional/boards_controller_test.rb | 2 +-
test/functional/email_addresses_controller_test.rb | 45 +
test/functional/imports_controller_test.rb | 3 +
test/functional/issues_controller_test.rb | 282 +++-
.../issues_custom_fields_visibility_test.rb | 2 +-
test/functional/journals_controller_test.rb | 4 +-
test/functional/messages_controller_test.rb | 2 +-
test/functional/my_controller_test.rb | 31 +
test/functional/projects_controller_test.rb | 24 -
.../repositories_filesystem_controller_test.rb | 5 +-
.../repositories_mercurial_controller_test.rb | 5 +-
.../repositories_subversion_controller_test.rb | 10 +-
test/functional/roles_controller_test.rb | 26 +-
test/functional/settings_controller_test.rb | 44 +-
test/functional/timelog_controller_test.rb | 9 +
test/functional/trackers_controller_test.rb | 2 +-
test/functional/users_controller_test.rb | 144 ++
test/functional/watchers_controller_test.rb | 24 +-
test/functional/wiki_controller_test.rb | 58 +
test/integration/account_test.rb | 15 +
test/integration/api_test/attachments_test.rb | 18 +
test/integration/api_test/custom_fields_test.rb | 15 +
test/integration/api_test/issue_relations_test.rb | 2 +-
test/integration/api_test/issues_test.rb | 83 +-
test/integration/api_test/jsonp_test.rb | 4 +-
test/integration/api_test/search_test.rb | 92 +
test/integration/api_test/wiki_pages_test.rb | 19 +
test/integration/issues_test.rb | 41 +
test/integration/routing/journals_test.rb | 6 +-
test/integration/routing/wiki_test.rb | 3 +
test/object_helpers.rb | 9 +-
test/test_helper.rb | 4 +-
test/ui/issues_test_ui.rb | 20 +
test/unit/attachment_test.rb | 2 +-
test/unit/attachment_transaction_test.rb | 76 +
test/unit/auth_source_ldap_test.rb | 93 +
test/unit/custom_field_version_format_test.rb | 1 +
test/unit/enumeration_test.rb | 3 +-
test/unit/helpers/application_helper_test.rb | 10 +-
test/unit/helpers/queries_helper_test.rb | 4 +-
test/unit/issue_import_test.rb | 48 +-
test/unit/issue_priority_test.rb | 22 +-
test/unit/issue_subtasking_test.rb | 35 +-
test/unit/issue_test.rb | 552 +++---
.../lib/redmine/acts/positioned_with_scope_test.rb | 53 +
.../positioned_without_scope_test.rb} | 80 +-
.../lib/redmine/field_format/field_format_test.rb | 24 +
.../field_format/version_field_format_test.rb | 9 +
test/unit/lib/redmine/helpers/diff_test.rb | 12 +
test/unit/lib/redmine/i18n_test.rb | 2 +-
.../lib/redmine/menu_manager/menu_helper_test.rb | 85 +-
.../wiki_formatting/markdown_formatter_test.rb | 4 +
test/unit/lib/redmine_test.rb | 8 +-
test/unit/mail_handler_test.rb | 58 +-
test/unit/mailer_test.rb | 109 +-
test/unit/query_test.rb | 96 +-
test/unit/repository_test.rb | 14 +
test/unit/setting_test.rb | 1 +
test/unit/time_entry_query_test.rb | 24 +
test/unit/tracker_test.rb | 14 +-
test/unit/user_preference_test.rb | 10 +-
test/unit/user_test.rb | 11 +-
test/unit/version_test.rb | 5 +
test/unit/watcher_test.rb | 9 +
test/unit/wiki_content_version_test.rb | 5 +
389 files changed, 8194 insertions(+), 3437 deletions(-)
--
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