Commit Graph

729 Commits

Author SHA1 Message Date
Jean-Philippe Lang 90c6a8579b Merged r8876 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.3-stable@9110 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-03-05 12:43:41 +00:00
Jean-Philippe Lang e0b4f151a2 Merged r8682 and r8800 from trunk for 1.3.1 release.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.3-stable@8801 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-06 11:16:39 +00:00
Jean-Philippe Lang c8a6b01e9f Backported r8168 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.3-stable@8173 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-12-10 14:39:26 +00:00
Jean-Philippe Lang 166c3c15dd Merged r8112 from trunk (#9748).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.3-stable@8160 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-12-10 12:08:55 +00:00
Toshi MARUYAMA 011d9587a5 Merged r8099 from trunk
pdf: move note number to the head of line for single issue's PDF.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.3-stable@8100 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-12-06 03:49:39 +00:00
Toshi MARUYAMA 08784f551e Merged r8090 from trunk
pdf: add note number for single issue's PDF.

Contributed by Akiko T.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.3-stable@8091 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-12-05 07:39:55 +00:00
Jean-Philippe Lang 80f5d3d041 Set version to 1.3.0.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.3-stable@7994 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-11-29 21:05:08 +00:00
Jean-Philippe Lang fd24250be0 Fixed: crypting blank passwords raises an error (#9137).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7985 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-11-29 19:47:51 +00:00
Jean-Philippe Lang d66c8faa9b Fixed: Wiki section edit escapes pre tags inside pre blocks (#9673).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7976 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-11-28 22:08:15 +00:00
Jean-Philippe Lang c5cabfe106 Fixed: Wiki section edit escapes code tags inside pre blocks (#9673).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7975 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-11-28 21:45:02 +00:00
Jean-Philippe Lang 9f15517095 Fixed: Angle brackets within 'pre' blocks are silently replaced by HTML entities during wiki section-edit (#9673).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7969 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-11-28 17:56:50 +00:00
Toshi MARUYAMA 9dfaa562fc pdf: expand relational issues status column width of issue pdf (#5634)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7965 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-11-28 05:58:32 +00:00
Toshi MARUYAMA b200fcfdae pdf: add the new feature to include attachment images (#3261)
Contributed by Jun NAITOH.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7915 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-11-24 11:12:00 +00:00
Toshi MARUYAMA 81bbb8f9b8 pdf: lib: prepare to use rfpdf plug-in rmagick feature (#3261)
Contributed by Jun NAITOH.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7914 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-11-24 11:11:36 +00:00
Toshi MARUYAMA 1b4fc4aee8 pdf: lib: add "attachments" parameter at RDMwriteHTMLCell method (#3261)
Contributed by Jun NAITOH.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7913 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-11-24 11:11:01 +00:00
Toshi MARUYAMA f936b7b5a4 pdf: lib: add the method to return attachment from filename and encoding (#3261)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7912 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-11-24 09:43:01 +00:00
Jean-Philippe Lang a756103b10 Use controller instead of instance variable.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7896 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-11-23 18:28:11 +00:00
Jean-Philippe Lang 4f907d5c9e Initialize @childrenHash.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7895 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-11-23 18:25:30 +00:00
Toshi MARUYAMA 1a576be384 pdf: lib: remove unused "include Redmine::I18n" from RDMPdfEncoding class
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7893 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-11-23 16:38:27 +00:00
Jean-Philippe Lang 886310055b Omit subtasks/related issues sections when empty on PDF export (#5634).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7845 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-11-19 13:36:30 +00:00
Jean-Philippe Lang 1e8a9da131 Handle the case of a text formatter that doesn't support section edit (#2222).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7831 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-11-18 16:41:54 +00:00
Jean-Philippe Lang 6fc245327c Wiki: allows single section edit (#2222).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7829 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-11-18 16:25:00 +00:00
Toshi MARUYAMA c8bbcfbe47 pdf: lib: set image scale at issue_to_pdf method (#3261)
wiki_to_pdf method has already done.

Contributed by Jun NAITOH.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7827 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-11-18 14:57:20 +00:00
Toshi MARUYAMA 88f8daf8b7 move repositories helper to_utf8 logic to lib/redmine/codeset_util.rb for common use (#2371)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7825 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-11-17 11:53:15 +00:00
Toshi MARUYAMA 8433bbab69 move iconv from utf8 logic from pdf to lib/redmine/codeset_util.rb for common use (#8549)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7818 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-11-16 05:07:16 +00:00
Toshi MARUYAMA b58d029294 code layout clean up lib/redmine/export/pdf.rb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7816 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-11-16 03:58:02 +00:00
Toshi MARUYAMA 9a93bd1484 move Changeset#to_utf8 logic to lib/redmine/codeset_util.rb for common use (#3261)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7810 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-11-14 23:04:45 +00:00
Toshi MARUYAMA 19fc985daa pdf: add subtasks and related issues at issue pdf (#5634)
Contributed by Bernhard Furtmueller and Jun NAITOH.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7788 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-11-12 11:18:02 +00:00
Toshi MARUYAMA c57a0842d6 pdf: add ancestor issues at head of issue pdf (#5634)
Contributed by Bernhard Furtmueller and Jun NAITOH.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7787 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-11-12 11:17:35 +00:00
Toshi MARUYAMA c4d9c29de9 pdf: remove unused "require 'rfpdf/fpdf'" (#8312)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7785 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-11-12 11:16:26 +00:00
Toshi MARUYAMA c63ab52201 Rails3: replace deprecated RAILS_DEFAULT_LOGGER at lib/redmine/ciphering.rb (#9552)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7781 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-11-11 14:40:49 +00:00
Jean-Philippe Lang e9f9927534 Fixed: Error when reading ciphered text from the database without cipher key configured (#9552).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7780 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-11-11 14:04:33 +00:00
Jean-Philippe Lang 55b2ca8170 Updates for 1.2.2 release.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7776 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-11-11 12:52:55 +00:00
Toshi MARUYAMA 9334d29520 pdf: indent subject of subtask ticket in exported issues PDF (#8617)
Contributed by Hayato Ito.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7761 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-11-10 10:10:24 +00:00
Toshi MARUYAMA 1713432ab0 pdf: lib: add a method to export wiki (#401)
Contributed by Jun NAITOH.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7740 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-11-06 10:48:28 +00:00
Toshi MARUYAMA c71208d18d scm: mercurial: lib: return array of Branch class instead of array of strings at branches method (#5501)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7673 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-28 05:19:13 +00:00
Toshi MARUYAMA cec6f5c3b0 scm: git: lib: return array of Branch class instead of array of strings at branches method (#5501)
Contributed by Jan Topiński.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7671 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-28 05:17:46 +00:00
Toshi MARUYAMA 033214578f scm: lib: add Branch class to abstract adapter (#5501)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7670 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-28 05:17:13 +00:00
Toshi MARUYAMA 36f51878a3 scm: git: lib: add parents to Revision class (#5501)
Contributed by Jan Topiński.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7668 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-28 04:58:26 +00:00
Toshi MARUYAMA 031b5bf4eb scm: mercurial: lib: add parents to Revision class (#5501)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7666 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-28 04:56:41 +00:00
Toshi MARUYAMA 0ff17efb4d scm: lib: add parents attribute to Revision class of abstract adapter (#5501)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7665 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-28 04:55:54 +00:00
Toshi MARUYAMA 887893601e scm: mercurial: remove unused "tags" from xml log templete
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7664 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-28 03:38:02 +00:00
Toshi MARUYAMA 918eac2cbd scm: mercurial: add parents to xml log template (#5501)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7663 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-28 02:46:38 +00:00
Toshi MARUYAMA 81ef038587 scm: mercurial: drop supporting below Mercurial 1.1 (#9465)
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/trunk@7650 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-25 06:10:12 +00:00
Toshi MARUYAMA ed87fc4e66 scm: mercurial: switch rev parameter of extension rhlog() if above Mercurial 1.6 or not (#9465)
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/trunk@7641 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-24 09:32:06 +00:00
Toshi MARUYAMA a6d3409a5a scm: mercurial: fix extension cmdtable on Mercurial 1.5 (#9465)
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/trunk@7640 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-24 09:31:36 +00:00
Etienne Massip d1efb4f148 Update CodeRay version to 1.0 final (#4264).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7618 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-08 13:34:30 +00:00
Toshi MARUYAMA e2f57b5874 Rails3: lib: helper: use html_safe for Gantt
Contributed by Sylvain Utard.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7557 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-01 01:13:03 +00:00
Toshi MARUYAMA 8e7b0a7bac fix typos in lib/redmine/hook.rb (#9291)
Contributed by Igor Zubkov.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7432 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-09-21 09:47:31 +00:00
Toshi MARUYAMA 569e768cdb remove trailing white-spaces from lib/redmine/search.rb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7419 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-09-20 02:48:40 +00:00