[DRE-commits] [redmine] 01/04: Merge tag 'upstream/2.3.3' into master-experimental
Jérémy Lal
kapouer at alioth.debian.org
Fri Sep 27 23:47:13 UTC 2013
This is an automated email from the git hooks/post-receive script.
kapouer pushed a commit to branch master-experimental
in repository redmine.
commit 21aa58e0714677a846de809b0da4d730f72a80b2
Merge: 5bf08a8 2a53f62
Author: Jérémy Lal <kapouer at melix.org>
Date: Sat Sep 28 01:41:36 2013 +0200
Merge tag 'upstream/2.3.3' into master-experimental
Upstream version 2.3.3
# gpg: Signature faite le sam. 28 sept. 2013 01:41:31 CEST avec la clef RSA d'identifiant DD39F374
# gpg: Bonne signature de « Jérémy Lal <kapouer at melix.org> »
# gpg: alias « Jérémy Lal <jerry at edagames.com> »
Gemfile | 5 +-
app/controllers/enumerations_controller.rb | 12 +-
app/controllers/my_controller.rb | 1 -
app/controllers/timelog_controller.rb | 16 +-
app/controllers/users_controller.rb | 2 -
app/helpers/issues_helper.rb | 22 +++
app/helpers/reports_helper.rb | 2 +-
app/models/enumeration.rb | 1 +
app/models/issue.rb | 110 +++++++++++--
app/models/issue_query.rb | 5 +-
app/models/mailer.rb | 2 +-
app/models/project.rb | 5 +-
app/models/query.rb | 7 +-
app/models/time_entry_activity.rb | 8 +-
app/models/time_entry_query.rb | 9 ++
app/models/user_preference.rb | 7 +-
app/models/version.rb | 3 +-
app/views/documents/show.html.erb | 2 +-
app/views/enumerations/destroy.html.erb | 2 +-
app/views/mailer/_issue.html.erb | 12 +-
app/views/mailer/_issue.text.erb | 9 +-
app/views/mailer/issue_edit.html.erb | 3 +
app/views/mailer/issue_edit.text.erb | 2 +-
app/views/queries/_filters.html.erb | 2 +-
app/views/users/_mail_notifications.html.erb | 9 +-
config/locales/ar.yml | 4 +-
config/locales/az.yml | 4 +-
config/locales/bg.yml | 4 +-
config/locales/bs.yml | 4 +-
config/locales/ca.yml | 4 +-
config/locales/cs.yml | 4 +-
config/locales/da.yml | 4 +-
config/locales/de.yml | 4 +-
config/locales/el.yml | 4 +-
config/locales/es.yml | 12 +-
config/locales/et.yml | 4 +-
config/locales/eu.yml | 4 +-
config/locales/fa.yml | 4 +-
config/locales/fi.yml | 4 +-
config/locales/gl.yml | 4 +-
config/locales/he.yml | 4 +-
config/locales/hr.yml | 4 +-
config/locales/hu.yml | 4 +-
config/locales/id.yml | 4 +-
config/locales/it.yml | 139 ++++++++---------
config/locales/ko.yml | 4 +-
config/locales/lt.yml | 1 -
config/locales/lv.yml | 6 +-
config/locales/mk.yml | 4 +-
config/locales/mn.yml | 4 +-
config/locales/nl.yml | 2 +-
config/locales/no.yml | 4 +-
config/locales/pl.yml | 6 +-
config/locales/pt-BR.yml | 2 +-
config/locales/pt.yml | 2 +-
config/locales/ro.yml | 4 +-
config/locales/ru.yml | 20 +--
config/locales/sk.yml | 4 +-
config/locales/sl.yml | 4 +-
config/locales/sq.yml | 4 +-
config/locales/sr-YU.yml | 4 +-
config/locales/sr.yml | 4 +-
config/locales/sv.yml | 10 +-
config/locales/tr.yml | 4 +-
config/locales/zh-TW.yml | 6 +-
config/routes.rb | 26 ++--
doc/CHANGELOG | 49 ++++++
lib/SVG/Graph/Graph.rb | 5 +-
lib/redmine/export/pdf.rb | 9 +-
lib/redmine/helpers/gantt.rb | 2 +-
lib/redmine/imap.rb | 22 +--
lib/redmine/info.rb | 6 +-
lib/redmine/scm/adapters/cvs_adapter.rb | 2 +-
lib/redmine/syntax_highlighting.rb | 1 -
lib/redmine/unified_diff.rb | 14 +-
lib/redmine/version.rb | 2 +-
lib/tasks/load_default_data.rake | 1 +
public/stylesheets/application.css | 2 +-
test/fixtures/diffs/issue-13644-3.diff | 7 +
test/fixtures/diffs/issue-13644-4.diff | 7 +
test/fixtures/diffs/issue-13644-5.diff | 7 +
test/functional/admin_controller_test.rb | 2 +-
test/functional/enumerations_controller_test.rb | 7 +
test/functional/projects_controller_test.rb | 6 +-
test/functional/reports_controller_test.rb | 18 +++
test/functional/timelog_controller_test.rb | 40 +++++
test/functional/users_controller_test.rb | 12 ++
test/integration/api_test/versions_test.rb | 23 +++
test/object_helpers.rb | 14 +-
test/unit/attachment_test.rb | 2 +-
test/unit/helpers/application_helper_test.rb | 10 ++
test/unit/issue_nested_set_test.rb | 15 +-
test/unit/issue_relation_test.rb | 4 +-
test/unit/issue_test.rb | 164 +++++++++++++++++++-
.../lib/redmine/scm/adapters/cvs_adapter_test.rb | 16 ++
test/unit/lib/redmine/unified_diff_test.rb | 48 ++++++
test/unit/mailer_test.rb | 40 ++++-
test/unit/project_copy_test.rb | 13 ++
test/unit/query_test.rb | 29 ++++
test/unit/time_entry_activity_test.rb | 30 +++-
test/unit/user_preference_test.rb | 5 +
test/unit/user_test.rb | 2 +-
102 files changed, 946 insertions(+), 296 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