Commit Graph

1336 Commits

Author SHA1 Message Date
Toshi MARUYAMA 6dcd50047d Merged r11389 from trunk to 2.2-stable.
add "tmp:clear" to "ci:setup" rake task for translation.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11435 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-02-18 13:22:25 +00:00
Toshi MARUYAMA 252df8dfc0 Merged r11399 from trunk to 2.2-stable (#13138)
not use htmlentities gem in rfpdf plugin.

Contributed by Jun NAITOH.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11400 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-02-15 14:32:45 +00:00
Jean-Philippe Lang d094dea0ec Merged r11366 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11367 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-02-12 18:08:38 +00:00
Toshi MARUYAMA ebed927de5 2.2-stable: svn propset svn:eol-style native SVG source files (#12971)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11357 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-02-12 03:52:41 +00:00
Toshi MARUYAMA 0a8e0a3bed Merged r11306 from trunk to 2.2-stable (#11987)
pdf: fix broken new line in table.

Contributed by Jun NAITOH.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11308 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-02-03 06:53:18 +00:00
Jean-Philippe Lang 56b12b289f Merged r11239 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11240 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-01-20 18:24:43 +00:00
Jean-Philippe Lang ed891e2733 Merged r11227 from trunk (#9842).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11235 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-01-20 17:06:46 +00:00
Jean-Philippe Lang 5a1a2f5855 Merged r11159 from trunk (#12799).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11230 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-01-20 16:56:50 +00:00
Jean-Philippe Lang f26654b29f Merged r11146 from trunk: Changes for 2.2.1 release.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11147 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-01-09 13:33:24 +00:00
Jean-Philippe Lang 5c62c1cf95 Merged r11126 from trunk (#12744).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11145 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-01-09 13:31:05 +00:00
Jean-Philippe Lang b0ccaffe1b Merged r11064 from trunk (#12652).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11143 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-01-09 13:29:08 +00:00
Toshi MARUYAMA a8fcf9389e Merged r11091 from trunk (#12711, #11290)
fix incorrect min_x_value of lib/SVG/Graph/TimeSeries.rb by r10439.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11093 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-01-03 00:15:32 +00:00
Jean-Philippe Lang d22f782d3f Merged r10956 from trunk (#12513).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11004 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-12-15 07:51:12 +00:00
Jean-Philippe Lang 3a379ce4b9 Merged r10948 into 2.2-stable (#3447).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@10952 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-12-08 08:41:59 +00:00
Jean-Philippe Lang bf02b76ca3 Sets stable branch.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@10908 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-12-02 18:01:48 +00:00
Jean-Philippe Lang ee3d6dbdbb Set version to 2.2.0.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10906 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-12-02 17:57:30 +00:00
Toshi MARUYAMA c7ee26b144 add configuration of RMagcik font for CJK (Chinese, Japanese and Korean) (#4787)
Contributed by Jun NAITOH.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10890 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-28 10:11:33 +00:00
Jean-Philippe Lang 14e56006a1 Fixed that #extract_macro_options should not be greedy (#12451).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10885 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-27 19:59:33 +00:00
Jean-Philippe Lang fb9a2901e9 Fixed that autolinks and textile links ending with cyrilic characters are broken (#12397).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10879 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-24 14:20:01 +00:00
Jean-Philippe Lang 845d7bc645 Updates for 2.1.4 release.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10874 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-24 09:34:42 +00:00
Jean-Philippe Lang 13f5301c09 Fixed that Project.rebuild! sorts projects by id instead of name (#12431).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10866 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-23 17:39:38 +00:00
Jean-Philippe Lang f232f56d97 Adds copyright.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10847 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-18 18:21:16 +00:00
Jean-Philippe Lang 26b3e48545 Symbols can not be sorted with ruby1.8.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10846 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-18 18:19:48 +00:00
Jean-Philippe Lang a49de1c39d Cache languages names to avoid loading all translations files.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10844 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-18 18:01:24 +00:00
Jean-Philippe Lang 3739810afa Adds a custom i18n backend that lazily loads translations files.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10843 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-18 17:41:31 +00:00
Jean-Philippe Lang 98f225f6cd Updates for 2.1.3 release.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10831 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-17 12:49:08 +00:00
Jean-Philippe Lang 1c14dd35cf Fixes #requires_redmine comments (#12299).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10828 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-17 11:05:27 +00:00
Jean-Philippe Lang 4bd1e887d9 Makes Plugin#requires_redmine accept a range of versions (#12299).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10827 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-17 10:55:38 +00:00
Jean-Philippe Lang b3cf67cad4 Makes Plugin#requires_redmine accept only major and minor version (#12299).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10826 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-17 10:07:21 +00:00
Jean-Philippe Lang a17f4c8375 Make sure that attachments are created in the same order they were selected (#12310).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10793 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-07 18:45:56 +00:00
Jean-Philippe Lang 00927f58af Make sure that #attachments returns attachments with same timestamp in the order they were created (#12310).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10792 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-07 18:06:42 +00:00
Jean-Philippe Lang c8b722456c Fixed that watchers receive notifications for private comments without permission (#12286).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10789 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-05 15:49:07 +00:00
Jean-Baptiste Barth e00b4acf1e Use Rake::TestTask#pattern for plugin tests instead of #test_files (#11534)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10778 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-01 09:40:40 +00:00
Jean-Philippe Lang c00084b80b Display non working days on gantt image according to settings (#2161).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10751 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-29 10:23:59 +00:00
Jean-Philippe Lang 1f55907f83 Display non working days on gantt according to settings (#2161).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10750 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-29 10:21:00 +00:00
Jean-Philippe Lang b71355f10b Ignore non-working days when rescheduling an issue (#2161).
Weekly non-working days can be configured in application settings (set to saturday and sunday by default).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10747 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-29 10:06:30 +00:00
Toshi MARUYAMA 625eebb720 code cleanup scm_iconv (#12228)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10742 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-28 11:39:43 +00:00
Toshi MARUYAMA 123d2b318f fix scm_iconv local variable name (#12228)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10741 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-28 07:12:23 +00:00
Toshi MARUYAMA 5a2c80cb48 use String#encode at scm_iconv on Ruby 1.9 (#12228)
Unit git adapter test fails on JRuby 1.7.

<pre>
Failure:
  <"test-Ü-2.txt">("UTF-8") expected but was
  <"test-\xC3\x9C-2.txt">("ASCII-8BIT").

  diff:
  - test-Ü-2.txt
  ?      ^
  + test-Ü-2.txt
  ?      ^^
test_entries_latin_1_files(GitAdapterTest)
test/unit/lib/redmine/scm/adapters/git_adapter_test.rb:468:in `test_entries_latin_1_files'
     465:         assert entries1
     466:         assert_equal 3, entries1.size
     467:         f1 = entries1[1]
  => 468:         assert_equal "test-#{@char_1}-2.txt", f1.name
     469:         assert_equal "latin-1-dir/test-#{@char_1}-2.txt", f1.path
     470:         assert_equal 'file', f1.kind
     471:       end
</pre>

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10740 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-28 06:19:29 +00:00
Jean-Philippe Lang 6cccdce06e Ability to delete a version from a wiki page history (#10852).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10705 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-23 18:45:14 +00:00
Toshi MARUYAMA 1db6a0f89c gantt: remove unused issues parameter from gantt_issue_compare method
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10698 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-23 00:17:05 +00:00
Jean-Philippe Lang d29fa4735b Adds a macro for inserting collapsed text (#12167).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10680 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-20 14:49:32 +00:00
Jean-Philippe Lang d62b90db73 Makes enumerations available through the REST API.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10664 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-17 17:29:27 +00:00
Jean-Philippe Lang 7af1504672 Fixed that Redmine::VERSION.revision returns nil with svn 1.7 (#12012).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10616 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-12 14:09:58 +00:00
Jean-Philippe Lang b0013d9f68 Do not show parents/subtasks subjects that are not visible.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10586 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-09 21:30:40 +00:00
Jean-Philippe Lang 0178b5a2fe Private issue notes (#1554).
Adds 2 new permissions for viewing/adding private comments to issues.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10547 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-03 21:36:19 +00:00
Jean-Philippe Lang b49abf0c22 Updates for 2.1.2 release.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10535 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-30 10:42:28 +00:00
Jean-Philippe Lang 757073edef Updates for 2.1.1 release.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10531 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-30 08:06:41 +00:00
Toshi MARUYAMA b7c71fe427 add more error message if public/plugin_assets cannot be created (#11945)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10472 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-26 04:11:14 +00:00
Toshi MARUYAMA 29292a3faf fix "can't convert Errno::EACCES into String" in case of no permission of public/plugin_assets on Ruby 1.9.3 (#11945)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10471 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-26 04:11:00 +00:00