]> source.dussan.org Git - redmine.git/log
redmine.git
12 years agoMerged r7956 from trunk.
Jean-Philippe Lang [Tue, 29 Nov 2011 21:08:06 +0000 (21:08 +0000)]
Merged r7956 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7995 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r7837 from trunk (#9597).
Etienne Massip [Fri, 18 Nov 2011 22:30:32 +0000 (22:30 +0000)]
Merged r7837 from trunk (#9597).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7838 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerge r7797 from trunk
Toshi MARUYAMA [Sun, 13 Nov 2011 06:38:41 +0000 (06:38 +0000)]
Merge r7797 from trunk

Simplified Chinese "text_git_repository_note" translation updated by Steven Wong.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7801 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerge r7796 from trunk
Toshi MARUYAMA [Sun, 13 Nov 2011 06:38:08 +0000 (06:38 +0000)]
Merge r7796 from trunk

Simplified Chinese translation for 1.2.2 updated by Steven Wong.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7800 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerge r7795 from trunk
Toshi MARUYAMA [Sun, 13 Nov 2011 06:37:33 +0000 (06:37 +0000)]
Merge r7795 from trunk

Simplified Chinese translation changed by Steven Wong.

* field_due_date
* permission_rename_wiki_pages
* button_rename

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7799 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerge r6699 from trunk
Toshi MARUYAMA [Sun, 13 Nov 2011 03:46:53 +0000 (03:46 +0000)]
Merge r6699 from trunk

remove trailing white-spaces from config/locales/zh.yml

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7793 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerge r6698 from trunk
Toshi MARUYAMA [Sun, 13 Nov 2011 03:46:05 +0000 (03:46 +0000)]
Merge r6698 from trunk

Ruby 1.9: fix parsing error of zh.yml with psych yaml library

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7792 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r7776 from trunk.
Jean-Philippe Lang [Fri, 11 Nov 2011 12:53:35 +0000 (12:53 +0000)]
Merged r7776 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7777 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r7774 from trunk (#8615).
Jean-Philippe Lang [Fri, 11 Nov 2011 12:44:13 +0000 (12:44 +0000)]
Merged r7774 from trunk (#8615).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7775 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r7772 from trunk (#8615).
Jean-Philippe Lang [Fri, 11 Nov 2011 12:33:15 +0000 (12:33 +0000)]
Merged r7772 from trunk (#8615).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7773 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r6308 from trunk (#8884).
Jean-Philippe Lang [Fri, 11 Nov 2011 11:44:10 +0000 (11:44 +0000)]
Merged r6308 from trunk (#8884).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7770 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r6311 from trunk (#8880).
Jean-Philippe Lang [Fri, 11 Nov 2011 11:40:56 +0000 (11:40 +0000)]
Merged r6311 from trunk (#8880).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7769 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r6298 from trunk (#8865).
Jean-Philippe Lang [Fri, 11 Nov 2011 11:37:55 +0000 (11:37 +0000)]
Merged r6298 from trunk (#8865).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7768 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r6300 and r6302 from trunk (#8836).
Jean-Philippe Lang [Fri, 11 Nov 2011 11:36:52 +0000 (11:36 +0000)]
Merged r6300 and r6302 from trunk (#8836).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7767 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r6324 and r6325 from trunk (#8651).
Jean-Philippe Lang [Fri, 11 Nov 2011 11:35:03 +0000 (11:35 +0000)]
Merged r6324 and r6325 from trunk (#8651).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7766 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r6314 from trunk (#8633).
Jean-Philippe Lang [Fri, 11 Nov 2011 11:31:49 +0000 (11:31 +0000)]
Merged r6314 from trunk (#8633).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7765 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r7731 from trunk
Toshi MARUYAMA [Sat, 5 Nov 2011 06:57:52 +0000 (06:57 +0000)]
Merged r7731 from trunk

Spanish translation updated by Ismael G Marin C.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7732 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agomerge r7707 from trunk
Toshi MARUYAMA [Wed, 2 Nov 2011 07:41:12 +0000 (07:41 +0000)]
merge r7707 from trunk

add unit test of escaping image urls

Contributed by Holger Just.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7709 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agomerge r6759 from trunk
Toshi MARUYAMA [Wed, 2 Nov 2011 07:40:49 +0000 (07:40 +0000)]
merge r6759 from trunk

remove trailing white-spaces from test/unit/lib/redmine/wiki_formatting/textile_formatter_test.rb

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7708 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agobacked out previous 1.2-stable dummy commit
Toshi MARUYAMA [Sun, 30 Oct 2011 03:29:14 +0000 (03:29 +0000)]
backed out previous 1.2-stable dummy commit

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7703 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agodummy commit to run test on CI server
Toshi MARUYAMA [Sun, 30 Oct 2011 03:28:46 +0000 (03:28 +0000)]
dummy commit to run test on CI server

Tests fail on CI Server, but I don't know the reason.
http://www.redmine.org/builds/build_1.2-stable-1.8.7-sqlite3_82.html

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7702 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r7699 from trunk
Toshi MARUYAMA [Sun, 30 Oct 2011 00:05:29 +0000 (00:05 +0000)]
Merged r7699 from trunk

Dutch translation updated by Pieter Nicolai

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7700 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r7660 from trunk
Toshi MARUYAMA [Thu, 27 Oct 2011 01:37:09 +0000 (01:37 +0000)]
Merged r7660 from trunk

scm: git: fix typo of comments about fetching revisions

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7661 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r7658 from trunk
Toshi MARUYAMA [Thu, 27 Oct 2011 00:41:37 +0000 (00:41 +0000)]
Merged r7658 from trunk

scm: git: recovery and improve comments of fetching from 1.1
about harmful influence that git does not have the revision number.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7659 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r7650 from trunk
Toshi MARUYAMA [Tue, 25 Oct 2011 07:20:14 +0000 (07:20 +0000)]
Merged r7650 from trunk

scm: mercurial: drop supporting below Mercurial 1.1

On November 1st 2011, Mercurial 2.0 will be released.

On Mercurial 1.1.2, unit lib test fails with following error.

<pre>
Traceback (most recent call last):
  File "/WEB-DOWN/hg-repo/hg-crew/hg", line 20, in <module>
    mercurial.dispatch.run()
  File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 20, in run
    sys.exit(dispatch(sys.argv[1:]))
  File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 29, in dispatch
    return _runcatch(u, args)
  File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 45, in _runcatch
    return _dispatch(ui, args)
  File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 367, in _dispatch
    ret = _runcommand(ui, options, cmd, d)
  File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 416, in _runcommand
    return checkargs()
  File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 376, in checkargs
    return cmdfunc()
  File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 361, in <lambda>
    d = lambda: util.checksignature(func)(ui, *args, **cmdoptions)
  File "/WEB-DOWN/hg-repo/hg-crew/mercurial/util.py", line 715, in check
    return func(*args, **kwargs)
  File "/REDMINE-1/hg-workdir/redmine-bb-all/lib/redmine/scm/adapters/mercurial/redminehelper.py", line 149, in rhlog
    if hg.util.version() >= '1.6':
AttributeError: 'module' object has no attribute 'version'

  1) Error:
test_nodes_in_branch(MercurialAdapterTest):
Redmine::Scm::Adapters::MercurialAdapter::HgCommandAborted: hg exited with non-zero status: 1
    lib/redmine/scm/adapters/mercurial_adapter.rb:306:in `hg'
    lib/redmine/scm/adapters/mercurial_adapter.rb:234:in `nodes_in_branch'
    test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb:311:in `test_nodes_in_branch'
    test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb:304:in `each'
    test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb:304:in `test_nodes_in_branch'
</pre>

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7651 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r7643 from trunk
Toshi MARUYAMA [Mon, 24 Oct 2011 11:29:38 +0000 (11:29 +0000)]
Merged r7643 from trunk

scm: mercurial: skip failing unit model tests on below Mercurial 1.5

Tests of non ASCII nor alphabetic nor numeric *named branch* fails on below Mercurial 1.5.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7647 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r7642 from trunk
Toshi MARUYAMA [Mon, 24 Oct 2011 11:28:51 +0000 (11:28 +0000)]
Merged r7642 from trunk

scm: mercurial: skip failing unit lib tests on below Mercurial 1.5

Tests of non ASCII nor alphabetic nor numeric *named branch* fails on below Mercurial 1.5.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7646 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r7641 from trunk
Toshi MARUYAMA [Mon, 24 Oct 2011 11:28:19 +0000 (11:28 +0000)]
Merged r7641 from trunk

scm: mercurial: switch rev parameter of extension rhlog() if above Mercurial 1.6 or not

On Mercurial 1.5, following error raises.

<pre>
hg --config extensions.redminehelper=lib/redmine/scm/adapters/mercurial/redminehelper.py \
  --rhbranch default --from default --to 0

abort: unknown revision '"default"'!
</pre>

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7645 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r7640 from trunk
Toshi MARUYAMA [Mon, 24 Oct 2011 11:27:38 +0000 (11:27 +0000)]
Merged r7640 from trunk

scm: mercurial: fix extension cmdtable on Mercurial 1.5

Before Mercurial revision "40c06bbf58be":http://www.selenic.com/repo/hg-stable/rev/40c06bbf58be ,
following error raises.

<pre>
Traceback (most recent call last):
  File "/WEB-DOWN/hg-repo/hg-crew/hg", line 27, in <module>
    mercurial.dispatch.run()
  File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 16, in run
    sys.exit(dispatch(sys.argv[1:]))
  File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 30, in dispatch
    return _runcatch(u, args)
  File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 47, in _runcatch
    return _dispatch(ui, args)
  File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 398, in _dispatch
    cmd, func, args, options, cmdoptions = _parse(lui, args)
  File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 277, in _parse
    args = fancyopts.fancyopts(args, c, cmdoptions, True)
  File "/WEB-DOWN/hg-repo/hg-crew/mercurial/fancyopts.py", line 62, in fancyopts
    for short, name, default, comment in options:
ValueError: too many values to unpack

  1) Error:
test_nodes_in_branch(MercurialAdapterTest):
Redmine::Scm::Adapters::MercurialAdapter::HgCommandAborted: hg exited with non-zero status: 1
    lib/redmine/scm/adapters/mercurial_adapter.rb:306:in `hg'
    lib/redmine/scm/adapters/mercurial_adapter.rb:234:in `nodes_in_branch'
    test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb:311:in `test_nodes_in_branch'
    test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb:304:in `each'
    test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb:304:in `test_nodes_in_branch'
</pre>

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7644 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r7579 from trunk.
Toshi MARUYAMA [Tue, 4 Oct 2011 21:52:08 +0000 (21:52 +0000)]
Merged r7579 from trunk.

Restrict anonymous read access with Redmine.pm

Redmine.pm now also checks for public projects whether the anonymous
user has the browse_repository right for a read operation.

Contributed by Holger Just.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7580 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r7570 from trunk (#9245).
Etienne Massip [Tue, 4 Oct 2011 19:29:00 +0000 (19:29 +0000)]
Merged r7570 from trunk (#9245).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7578 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r7571 from trunk.
Toshi MARUYAMA [Tue, 4 Oct 2011 10:55:32 +0000 (10:55 +0000)]
Merged r7571 from trunk.

Fix typo of fix_issue() at Changeset model.

Contributed by Sylvain Utard.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7572 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r7568 from trunk (#9308).
Etienne Massip [Mon, 3 Oct 2011 20:19:44 +0000 (20:19 +0000)]
Merged r7568 from trunk (#9308).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7569 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged #7563 from trunk (#7215).
Etienne Massip [Sun, 2 Oct 2011 17:28:33 +0000 (17:28 +0000)]
Merged #7563 from trunk (#7215).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7564 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged #7560 from trunk.
Etienne Massip [Sun, 2 Oct 2011 15:35:39 +0000 (15:35 +0000)]
Merged #7560 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7561 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r7558 from trunk (#3276).
Etienne Massip [Sun, 2 Oct 2011 14:52:43 +0000 (14:52 +0000)]
Merged r7558 from trunk (#3276).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7559 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r7538 from trunk (#8411).
Etienne Massip [Mon, 26 Sep 2011 17:47:50 +0000 (17:47 +0000)]
Merged r7538 from trunk (#8411).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7539 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r7458 from trunk (#7613).
Etienne Massip [Fri, 23 Sep 2011 17:23:22 +0000 (17:23 +0000)]
Merged r7458 from trunk (#7613).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7482 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r7468 from trunk.
Toshi MARUYAMA [Fri, 23 Sep 2011 10:45:28 +0000 (10:45 +0000)]
Merged r7468 from trunk.

Norwegian translation of trunk r5957 and 1.2-stable r7455 updated.

Contributed by Lars Erik Gullerud.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7471 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r7451 and r7454 from trunk.
Toshi MARUYAMA [Thu, 22 Sep 2011 14:06:18 +0000 (14:06 +0000)]
Merged r7451 and r7454 from trunk.

Slovenian translation updated.

Contributed by Nejc Vidmar.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7455 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoBacked out r7442.
Toshi MARUYAMA [Thu, 22 Sep 2011 12:28:30 +0000 (12:28 +0000)]
Backed out r7442.

Merged r7439 from trunk.

Slovenian translation of trunk r5957 and 1.2-stable r7434 updated.

Contributed by Nejc Vidmar.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7449 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r7439 from trunk.
Toshi MARUYAMA [Thu, 22 Sep 2011 01:52:04 +0000 (01:52 +0000)]
Merged r7439 from trunk.

Slovenian translation of trunk r5957 and 1.2-stable r7434 updated.

Contributed by Nejc Vidmar.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7442 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r7432 from trunk.
Toshi MARUYAMA [Wed, 21 Sep 2011 09:57:26 +0000 (09:57 +0000)]
Merged r7432 from trunk.

fix typos in lib/redmine/hook.rb.

Contributed by Igor Zubkov.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7434 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r7407 from trunk.
Toshi MARUYAMA [Wed, 21 Sep 2011 09:56:52 +0000 (09:56 +0000)]
Merged r7407 from trunk.

remove trailing white-spaces from lib/redmine/hook.rb

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7433 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r7068 from trunk.
Toshi MARUYAMA [Wed, 7 Sep 2011 01:07:43 +0000 (01:07 +0000)]
Merged r7068 from trunk.

fix typo in imap examples at lib/tasks/email.rake.

Contributed by Nathan L Smith.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7069 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r7060 from trunk.
Toshi MARUYAMA [Mon, 5 Sep 2011 11:45:16 +0000 (11:45 +0000)]
Merged r7060 from trunk.

add "ruby test/unit/issue_test.rb" for an each test at doc/RUNNING_TESTS.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7061 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerge r7033 from trunk.
Toshi MARUYAMA [Fri, 2 Sep 2011 01:30:33 +0000 (01:30 +0000)]
Merge r7033 from trunk.

remove duplicate "test_index_should_not_list_issues_when_module_disabled" from functional issues controller test.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7038 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoback out r7036.
Toshi MARUYAMA [Fri, 2 Sep 2011 01:29:54 +0000 (01:29 +0000)]
back out r7036.

I mistook merged revision of the revision comment.
r7035 is wrong. r7033 is correct.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7037 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerge r7035 from trunk.
Toshi MARUYAMA [Fri, 2 Sep 2011 01:15:12 +0000 (01:15 +0000)]
Merge r7035 from trunk.

remove duplicate "test_index_should_not_list_issues_when_module_disabled" from functional issues controller test.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7036 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerge r6915 from trunk.
Toshi MARUYAMA [Wed, 31 Aug 2011 14:59:35 +0000 (14:59 +0000)]
Merge r6915 from trunk.

fix grammatical error of field_warn_on_leaving_unsaved in pt-BR.yml.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@6916 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerge r6600 from trunk.
Toshi MARUYAMA [Wed, 24 Aug 2011 12:56:36 +0000 (12:56 +0000)]
Merge r6600 from trunk.

Hungarian translation for 1.2.1 updated by Csaba Molnár.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@6601 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerge r6021 from trunk (#8825).
Toshi MARUYAMA [Wed, 17 Aug 2011 11:14:03 +0000 (11:14 +0000)]
Merge r6021 from trunk (#8825).

scm: fix JRuby tests fail in unit changeset following test.

* test_invalid_utf8_sequences_in_paths_should_be_replaced

Following Subversion functional tests fail on Japanese Windows + JRuby 1.6.2 (ruby-1.8.7-p330).

* test_directory_diff
* test_revision_diff

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@6453 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r6005 from trunk.
Toshi MARUYAMA [Wed, 17 Aug 2011 08:16:23 +0000 (08:16 +0000)]
Merged r6005 from trunk.

scm: git: skip non UTF-8 path encoding test of unit model test in JRuby.

Git, Mercurial and CVS path encodings are binary.
Subversion supports URL encoding for path.
Redmine Mercurial adapter and extension use URL encoding.
Git accepts only binary path in command line parameter.
So, there is no way to use binary command line parameter in JRuby.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@6452 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r6004 from trunk.
Toshi MARUYAMA [Wed, 17 Aug 2011 08:16:02 +0000 (08:16 +0000)]
Merged r6004 from trunk.

scm: git: skip non UTF-8 path encoding test of unit adapter test in JRuby.

Git, Mercurial and CVS path encodings are binary.
Subversion supports URL encoding for path.
Redmine Mercurial adapter and extension use URL encoding.
Git accepts only binary path in command line parameter.
So, there is no way to use binary command line parameter in JRuby.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@6451 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r6003 from trunk.
Toshi MARUYAMA [Wed, 17 Aug 2011 08:15:37 +0000 (08:15 +0000)]
Merged r6003 from trunk.

scm: git: skip non UTF-8 path encoding test of functional test in JRuby.

Git, Mercurial and CVS path encodings are binary.
Subversion supports URL encoding for path.
Redmine Mercurial adapter and extension use URL encoding.
Git accepts only binary path in command line parameter.
So, there is no way to use binary command line parameter in JRuby.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@6450 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r6447 from trunk.
Toshi MARUYAMA [Tue, 16 Aug 2011 00:18:14 +0000 (00:18 +0000)]
Merged r6447 from trunk.

scm: add comment that configuration of SCM executable command does not work if contains spaces path to configuration.yml.example.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@6449 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r6418 from trunk.
Toshi MARUYAMA [Tue, 16 Aug 2011 00:17:56 +0000 (00:17 +0000)]
Merged r6418 from trunk.

remove trailing white-spaces from config/configuration.yml.example.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@6448 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r6441 from trunk.
Toshi MARUYAMA [Fri, 12 Aug 2011 09:57:07 +0000 (09:57 +0000)]
Merged r6441 from trunk.

PDF: remove unused vendor/plugins/rfpdf/lib/barcode/*.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@6443 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r6435 from trunk.
Toshi MARUYAMA [Fri, 12 Aug 2011 08:29:47 +0000 (08:29 +0000)]
Merged r6435 from trunk.

PDF: remove unused sjis.rb.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@6442 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r6434 from trunk.
Toshi MARUYAMA [Fri, 12 Aug 2011 07:25:48 +0000 (07:25 +0000)]
Merged r6434 from trunk.

PDF: remove unused zapfdingbats.rb.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@6440 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r6433 from trunk.
Toshi MARUYAMA [Fri, 12 Aug 2011 07:25:06 +0000 (07:25 +0000)]
Merged r6433 from trunk.

PDF: remove unused symbol.rb.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@6439 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r6432 from trunk.
Toshi MARUYAMA [Fri, 12 Aug 2011 07:24:27 +0000 (07:24 +0000)]
Merged r6432 from trunk.

PDF: remove unused courier.rb.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@6438 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r6431 from trunk.
Toshi MARUYAMA [Fri, 12 Aug 2011 07:23:43 +0000 (07:23 +0000)]
Merged r6431 from trunk.

PDF: remove unused times*.rb.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@6437 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r6430 from trunk.
Toshi MARUYAMA [Fri, 12 Aug 2011 07:23:00 +0000 (07:23 +0000)]
Merged r6430 from trunk.

PDF: remove unused vera*.rb.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@6436 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r6427 from trunk.
Toshi MARUYAMA [Fri, 12 Aug 2011 05:27:03 +0000 (05:27 +0000)]
Merged r6427 from trunk.

PDF: remove unused vera fonts.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@6429 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r6426 from trunk.
Toshi MARUYAMA [Fri, 12 Aug 2011 05:26:17 +0000 (05:26 +0000)]
Merged r6426 from trunk.

PDF: remove unused FreeMono fonts.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@6428 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r6402 from trunk.
Toshi MARUYAMA [Sat, 6 Aug 2011 00:02:17 +0000 (00:02 +0000)]
Merged r6402 from trunk.

PDF: remove unused DejaVu fonts except DejaVuSans-BoldOblique.

FreeSans has freesansbi.rb. But there is no dejavusansbi.rb.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@6408 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r6401 from trunk.
Toshi MARUYAMA [Sat, 6 Aug 2011 00:01:47 +0000 (00:01 +0000)]
Merged r6401 from trunk.

PDF: remove unused DejaVuSans-ExtraLight font.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@6407 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r6403 from trunk.
Toshi MARUYAMA [Fri, 5 Aug 2011 11:24:32 +0000 (11:24 +0000)]
Merged r6403 from trunk.

Italian translation for 1.2 updated.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@6405 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r6282 from trunk.
Toshi MARUYAMA [Fri, 15 Jul 2011 23:48:38 +0000 (23:48 +0000)]
Merged r6282 from trunk.

scm: bazaar: use "shell_quote_command" method at adapter for JRuby + Windows command name.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@6294 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r6281 from trunk.
Toshi MARUYAMA [Fri, 15 Jul 2011 23:48:06 +0000 (23:48 +0000)]
Merged r6281 from trunk.

scm: git: use self.class.sq_bin for command name at adpter scm_cmd().

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@6293 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r6280 from trunk.
Toshi MARUYAMA [Fri, 15 Jul 2011 23:47:34 +0000 (23:47 +0000)]
Merged r6280 from trunk.

scm: git: use "shell_quote_command" method at adapter for JRuby + Windows command name.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@6292 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r6279 from trunk.
Toshi MARUYAMA [Fri, 15 Jul 2011 23:47:08 +0000 (23:47 +0000)]
Merged r6279 from trunk.

scm: mercurial: use self.class.sq_bin for command name at adpter scm_cmd().

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@6291 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r6278 from trunk.
Toshi MARUYAMA [Fri, 15 Jul 2011 23:46:35 +0000 (23:46 +0000)]
Merged r6278 from trunk.

scm: mercurial: use "shell_quote_command" method at adapter for JRuby + Windows command name.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@6290 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r6277 from trunk.
Toshi MARUYAMA [Fri, 15 Jul 2011 23:46:01 +0000 (23:46 +0000)]
Merged r6277 from trunk.

scm: cvs: use self.class.sq_bin for command name at adpter scm_cmd().

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@6289 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r6276 from trunk.
Toshi MARUYAMA [Fri, 15 Jul 2011 23:45:26 +0000 (23:45 +0000)]
Merged r6276 from trunk.

scm: cvs: use "shell_quote_command" method at adapter for JRuby + Windows command name.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@6288 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r6275 from trunk.
Toshi MARUYAMA [Fri, 15 Jul 2011 23:44:44 +0000 (23:44 +0000)]
Merged r6275 from trunk.

scm: darcs: use "shell_quote_command" method at adapter for JRuby + Windows command name.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@6287 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r6274 from trunk.
Toshi MARUYAMA [Fri, 15 Jul 2011 23:44:07 +0000 (23:44 +0000)]
Merged r6274 from trunk.

scm: subversion: use "shell_quote_command" method at adapter for JRuby + Windows command name.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@6286 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r6272 from trunk.
Toshi MARUYAMA [Fri, 15 Jul 2011 23:43:22 +0000 (23:43 +0000)]
Merged r6272 from trunk.

scm: add new method "shell_quote_command" at abstract adapter.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@6285 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerge(backport) r6230 from trunk (#8825).
Toshi MARUYAMA [Fri, 15 Jul 2011 11:53:39 +0000 (11:53 +0000)]
Merge(backport) r6230 from trunk (#8825).

scm: catch all exceptions at adapter shellout() to fork scm command.

If scm command does not exist,
Linux JRuby 1.6.2 (ruby-1.8.7-p330) raises java.io.IOException in production environment.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@6273 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoUpdates for 1.2.1 release.
Jean-Philippe Lang [Mon, 11 Jul 2011 11:45:14 +0000 (11:45 +0000)]
Updates for 1.2.1 release.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@6261 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r6247 from trunk.
Toshi MARUYAMA [Mon, 11 Jul 2011 02:08:47 +0000 (02:08 +0000)]
Merged r6247 from trunk.

scm: mercurial: add functional test of destroying invalid repository.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@6255 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r6246 from trunk.
Toshi MARUYAMA [Mon, 11 Jul 2011 02:08:23 +0000 (02:08 +0000)]
Merged r6246 from trunk.

scm: mercurial: do nothing in fetching if info is nil.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@6254 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r6245 from trunk.
Toshi MARUYAMA [Mon, 11 Jul 2011 02:08:03 +0000 (02:08 +0000)]
Merged r6245 from trunk.

scm: mercurial: catch exception and return nil during getting info.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@6253 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r6243 from trunk.
Toshi MARUYAMA [Mon, 11 Jul 2011 02:07:44 +0000 (02:07 +0000)]
Merged r6243 from trunk.

scm: mercurial: add functional test of destroying valid repository.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@6252 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r6242 from trunk.
Toshi MARUYAMA [Mon, 11 Jul 2011 02:07:19 +0000 (02:07 +0000)]
Merged r6242 from trunk.

scm: mercurial: add instance variable @project at functional test.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@6251 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerge(backport) r6130 from trunk (#8777).
Toshi MARUYAMA [Mon, 11 Jul 2011 00:24:22 +0000 (00:24 +0000)]
Merge(backport) r6130 from trunk (#8777).

scm: return nil at model default_branch and override at git model.

Redmine Git and Mercurial adapter support *branches*.
Mercurial default branch is *dafault*.
But, it is popular to show all revisions on the top page for Mercurial GUI.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@6244 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r6208 from trunk.
Jean-Philippe Lang [Sat, 9 Jul 2011 18:49:13 +0000 (18:49 +0000)]
Merged r6208 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@6209 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r6206 from trunk.
Jean-Philippe Lang [Sat, 9 Jul 2011 12:01:56 +0000 (12:01 +0000)]
Merged r6206 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@6207 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r6203 and r6204 from trunk.
Jean-Philippe Lang [Sat, 9 Jul 2011 11:42:12 +0000 (11:42 +0000)]
Merged r6203 and r6204 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@6205 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r6201 from trunk.
Jean-Philippe Lang [Sat, 9 Jul 2011 11:26:35 +0000 (11:26 +0000)]
Merged r6201 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@6202 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r6199 from trunk.
Jean-Philippe Lang [Sat, 9 Jul 2011 10:51:57 +0000 (10:51 +0000)]
Merged r6199 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@6200 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoBackported r6197 from trunk.
Jean-Philippe Lang [Sat, 9 Jul 2011 09:11:13 +0000 (09:11 +0000)]
Backported r6197 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@6198 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r6187 from trunk.
Jean-Philippe Lang [Wed, 6 Jul 2011 19:06:03 +0000 (19:06 +0000)]
Merged r6187 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@6188 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r6163, r6171, r6172, r6174 from trunk.
Jean-Philippe Lang [Sun, 3 Jul 2011 15:58:02 +0000 (15:58 +0000)]
Merged r6163, r6171, r6172, r6174 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@6175 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r6170 from trunk.
Jean-Philippe Lang [Sun, 3 Jul 2011 15:37:01 +0000 (15:37 +0000)]
Merged r6170 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@6173 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r6073 from trunk.
Jean-Philippe Lang [Sun, 3 Jul 2011 10:18:18 +0000 (10:18 +0000)]
Merged r6073 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@6162 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r6126 from trunk.
Jean-Philippe Lang [Sat, 2 Jul 2011 17:43:08 +0000 (17:43 +0000)]
Merged r6126 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@6161 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r6147 and r6149 from trunk.
Jean-Philippe Lang [Sat, 2 Jul 2011 17:29:54 +0000 (17:29 +0000)]
Merged r6147 and r6149 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@6160 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r6148 from trunk.
Jean-Philippe Lang [Sat, 2 Jul 2011 17:28:33 +0000 (17:28 +0000)]
Merged r6148 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@6159 e93f8b46-1217-0410-a6f0-8f06a7374b81