]> source.dussan.org Git - redmine.git/log
redmine.git
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

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

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

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

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

13 years agoPDF: add dummy 'fill' parameter at rfpdf CJK Write method (#8737).
Toshi MARUYAMA [Sat, 2 Jul 2011 15:44:02 +0000 (15:44 +0000)]
PDF: add dummy 'fill' parameter at rfpdf CJK Write method (#8737).

'fill' parameter is already added in trunk by r6131, r6132, r6133.

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

13 years agoPDF: fix ArgumentError MultiCell() in CJK (#8737).
Toshi MARUYAMA [Sat, 2 Jul 2011 14:59:30 +0000 (14:59 +0000)]
PDF: fix ArgumentError MultiCell() in CJK (#8737).

add dummy ln parameter at rfpdf CJK MultiCell method.
ln parameter has already added in trunk by r6131, r6132, r6133.

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

13 years agoMerged r6146 from trunk.
Toshi MARUYAMA [Sat, 2 Jul 2011 13:15:54 +0000 (13:15 +0000)]
Merged r6146 from trunk.

PDF: add revision number/id of associated revisions on issue PDF.

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

13 years agoMerge(backport) r6136 from trunk (#8737).
Toshi MARUYAMA [Sat, 2 Jul 2011 04:48:07 +0000 (04:48 +0000)]
Merge(backport) r6136 from trunk (#8737).

PDF: use RDMMultiCell for drawing lines of issue description.

Contributed by Jun NAITOH.

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

13 years agoMerge(backport) r6135 from trunk (#8737).
Toshi MARUYAMA [Sat, 2 Jul 2011 04:47:27 +0000 (04:47 +0000)]
Merge(backport) r6135 from trunk (#8737).

PDF: add 'ln' parameter for drawing lines at RDMMultiCell().

Contributed by Jun NAITOH.

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

13 years agoMerged r6138 from trunk.
Toshi MARUYAMA [Sat, 2 Jul 2011 04:46:47 +0000 (04:46 +0000)]
Merged r6138 from trunk.

PDF: code clean up lib/redmine/export/pdf.rb.

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

13 years agoMerged r6139 from trunk.
Toshi MARUYAMA [Fri, 1 Jul 2011 09:02:37 +0000 (09:02 +0000)]
Merged r6139 from trunk.

Swedish translation updated by Nicklas Holm.

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

13 years agoMerged r6127 from trunk.
Toshi MARUYAMA [Mon, 27 Jun 2011 23:19:41 +0000 (23:19 +0000)]
Merged r6127 from trunk.

Escape AuthSources in the list.

Contributed by MAEDA, Go

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

13 years agoMerged r6124 from trunk.
Jean-Baptiste Barth [Sun, 26 Jun 2011 12:51:09 +0000 (12:51 +0000)]
Merged r6124 from trunk.

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

13 years agoMerged r6098 from trunk.
Jean-Baptiste Barth [Tue, 21 Jun 2011 03:35:36 +0000 (03:35 +0000)]
Merged r6098 from trunk.

Added Project#enable_module! and Project#disable_module!

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

13 years agoRevert r6104 "Merged r6098 from trunk."
Jean-Baptiste Barth [Tue, 21 Jun 2011 03:16:49 +0000 (03:16 +0000)]
Revert r6104 "Merged r6098 from trunk."

I messed things up with a cherry-pick on master, I'll re-apply it after.

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

13 years agoMerged r6098 from trunk.
Jean-Baptiste Barth [Mon, 20 Jun 2011 19:39:59 +0000 (19:39 +0000)]
Merged r6098 from trunk.

Added Project#enable_module! and Project#disable_module!

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

13 years agoMerged r6101 from trunk.
Toshi MARUYAMA [Mon, 20 Jun 2011 08:54:23 +0000 (08:54 +0000)]
Merged r6101 from trunk.

Russian translation update by SERGEY ERSHOV.

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

13 years agoMerged r6099 from trunk.
Jean-Baptiste Barth [Mon, 20 Jun 2011 01:32:18 +0000 (01:32 +0000)]
Merged r6099 from trunk.

Added a test to ensure 'Project' column can be removed on issues list

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

13 years agoMerged r6096 from trunk.
Toshi MARUYAMA [Sat, 18 Jun 2011 10:17:16 +0000 (10:17 +0000)]
Merged r6096 from trunk.

pt-BR translation update by Enderson Maia.

Better translation to keep a pattern in translations.

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

13 years agoMerged r6094 from trunk.
Toshi MARUYAMA [Fri, 17 Jun 2011 07:13:51 +0000 (07:13 +0000)]
Merged r6094 from trunk.

German translation updated by Jens Martsch.

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

13 years agoMerged r6068 from trunk.
Toshi MARUYAMA [Sat, 11 Jun 2011 21:15:05 +0000 (21:15 +0000)]
Merged r6068 from trunk.

pt-BR translation update by Rodrigo Rosenfeld Rosas.

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

13 years agoMerged r6064 from trunk.
Toshi MARUYAMA [Sat, 11 Jun 2011 01:34:32 +0000 (01:34 +0000)]
Merged r6064 from trunk.

translate field_path_to_repository in pt-BR.yml.

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

13 years agoMerged r6063 from trunk.
Toshi MARUYAMA [Sat, 11 Jun 2011 01:33:51 +0000 (01:33 +0000)]
Merged r6063 from trunk.

pt-BR translation update by Rodrigo Rosenfeld Rosas.

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

13 years agoMerged r6062 from trunk.
Toshi MARUYAMA [Sat, 11 Jun 2011 01:33:07 +0000 (01:33 +0000)]
Merged r6062 from trunk.

pt-BR translation update by Enderson Maia.

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

13 years agoMerged r6042 from trunk.
Toshi MARUYAMA [Fri, 10 Jun 2011 08:33:23 +0000 (08:33 +0000)]
Merged r6042 from trunk.

scm: mercurial: fix unit adapter annotate test fails on Windows Mercurial 1.8.4+29-e597ef52a7c2.

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

13 years agoMerged r6041 from trunk.
Toshi MARUYAMA [Fri, 10 Jun 2011 08:32:42 +0000 (08:32 +0000)]
Merged r6041 from trunk.

scm: mercurial: add functional test of annotate file which does not exist in *tip* is not found.

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

13 years agoMerged r6035 from trunk.
Toshi MARUYAMA [Fri, 10 Jun 2011 02:15:47 +0000 (02:15 +0000)]
Merged r6035 from trunk.

PDF: use DejaVuSans fonts in Vietnamese.

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

13 years agoMerged r6034 from trunk.
Toshi MARUYAMA [Fri, 10 Jun 2011 02:15:30 +0000 (02:15 +0000)]
Merged r6034 from trunk.

PDF: back out r6018.

change Vietnamese vi.yml general_pdf_encoding from CP1258 to UTF-8.

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

13 years agoMerged r6031 from trunk.
Toshi MARUYAMA [Thu, 9 Jun 2011 23:51:42 +0000 (23:51 +0000)]
Merged r6031 from trunk.

PDF: fix font name in vendor/plugins/rfpdf/lib/fonts/dejavusansi.rb.

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

13 years agoMerged r6030 from trunk.
Toshi MARUYAMA [Thu, 9 Jun 2011 23:44:34 +0000 (23:44 +0000)]
Merged r6030 from trunk.

PDF: Import DejaVu fonts.

http://rfpdf.googlecode.com/files/DejaVu.zip
Sep. 2007
fils size 3,685,721
md5sum: 54274d105b74f817d649035fc1541d8a

rename files.
* DejaVuSans.rb  to dejavusans.rb
* DejaVuSansb.rb to dejavusansb.rb
* DejaVuSansi.rb to dejavusansi.rb

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

13 years agoMerged r6028 from trunk.
Toshi MARUYAMA [Thu, 9 Jun 2011 08:06:24 +0000 (08:06 +0000)]
Merged r6028 from trunk.

Spanish translation updated by Jorge López.

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

13 years agoMerged r6024 from trunk.
Toshi MARUYAMA [Thu, 9 Jun 2011 05:29:23 +0000 (05:29 +0000)]
Merged r6024 from trunk.

PDF: replace all non ASCII characters to '?' if Iconv error raise in JRuby.

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

13 years agoMerged r6023 from trunk.
Toshi MARUYAMA [Thu, 9 Jun 2011 03:51:23 +0000 (03:51 +0000)]
Merged r6023 from trunk.

PDF: use SJIS instead of CP932 at unit pdf test test_rdm_pdf_iconv_invalid_utf8_should_be_replaced_ja in JRuby.

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

13 years agoMerged r6022 from trunk.
Toshi MARUYAMA [Thu, 9 Jun 2011 03:50:35 +0000 (03:50 +0000)]
Merged r6022 from trunk.

PDF: use SJIS instead of CP932 at unit pdf test test_rdm_pdf_iconv_cannot_convert_ja_cp932 in JRuby.

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

13 years agoMerged r6018 from trunk.
Toshi MARUYAMA [Thu, 9 Jun 2011 00:04:11 +0000 (00:04 +0000)]
Merged r6018 from trunk.

PDF: change Vietnamese vi.yml general_pdf_encoding from UTF-8 to CP1258.

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

13 years agoMerged r6013 from trunk.
Toshi MARUYAMA [Wed, 8 Jun 2011 23:53:42 +0000 (23:53 +0000)]
Merged r6013 from trunk.

PDF: use SJIS instead of CP932 at unit pdf test_fix_text_encoding_nil in JRuby.

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

13 years agoMerged r6012 from trunk.
Toshi MARUYAMA [Wed, 8 Jun 2011 23:53:24 +0000 (23:53 +0000)]
Merged r6012 from trunk.

PDF: change Shift_JIS to SHIFT_JIS in lib/redmine/export/pdf.rb for Japanese ja.yml general_pdf_encoding.

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

13 years agoMerged r6011 from trunk.
Toshi MARUYAMA [Wed, 8 Jun 2011 23:53:03 +0000 (23:53 +0000)]
Merged r6011 from trunk.

PDF: add Japanese comment of ja.yml general_pdf_encoding *CP932* and *SJIS* in JRuby and CRuby (#8565, #61).

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

13 years agoMerged r6010 from trunk.
Toshi MARUYAMA [Wed, 8 Jun 2011 23:52:43 +0000 (23:52 +0000)]
Merged r6010 from trunk.

PDF: add *SJIS* and *Shift_JIS* in lib/redmine/export/pdf.rb for Japanese ja.yml general_pdf_encoding.

JRuby 1.6.2 (ruby-1.8.7-p330) does not support CP932.

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

13 years agoMerged r6007 from trunk.
Toshi MARUYAMA [Wed, 8 Jun 2011 13:24:38 +0000 (13:24 +0000)]
Merged r6007 from trunk.

scm: add log message of config/configuration.yml if scm command raise Errno::ENOENT exception.

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

13 years agoMerged r6006 from trunk.
Toshi MARUYAMA [Wed, 8 Jun 2011 13:23:56 +0000 (13:23 +0000)]
Merged r6006 from trunk.

scm: code clean up abstract adapter.

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

13 years agoMerged r5999 from trunk.
Toshi MARUYAMA [Fri, 3 Jun 2011 11:41:34 +0000 (11:41 +0000)]
Merged r5999 from trunk.

scm: catch all exceptions to get scm command version in repository model.

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@6000 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoMerged r5992 and r5997 from trunk.
Toshi MARUYAMA [Thu, 2 Jun 2011 08:26:02 +0000 (08:26 +0000)]
Merged r5992 and r5997 from trunk.

Turkish translation updated by Burak Yiğit Kaya.

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

13 years agoBackout r5994 Turkish translations.
Toshi MARUYAMA [Thu, 2 Jun 2011 06:29:15 +0000 (06:29 +0000)]
Backout r5994 Turkish translations.

Tests on CI server fails.

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

13 years agoMerged r5993 from trunk.
Toshi MARUYAMA [Wed, 1 Jun 2011 22:55:23 +0000 (22:55 +0000)]
Merged r5993 from trunk.

change Turkish general_csv_encoding from ISO-8859-1 to ISO-8859-9 by Burak Yiğit Kaya.

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

13 years agoMerged r5992 from trunk.
Toshi MARUYAMA [Wed, 1 Jun 2011 22:54:58 +0000 (22:54 +0000)]
Merged r5992 from trunk.

Turkish translation updated by Burak Yiğit Kaya.

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

13 years agoMerged r5986 from trunk.
Toshi MARUYAMA [Wed, 1 Jun 2011 08:09:23 +0000 (08:09 +0000)]
Merged r5986 from trunk.

German translation updated by Jens Martsch.

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

13 years agoMerged r5970 from trunk.
Toshi MARUYAMA [Tue, 31 May 2011 03:48:27 +0000 (03:48 +0000)]
Merged r5970 from trunk.

Traditional Chinese translation updated by ChunChang Lo.

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

13 years agoMerged r5965 from trunk.
Jean-Philippe Lang [Mon, 30 May 2011 16:40:52 +0000 (16:40 +0000)]
Merged r5965 from trunk.

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

13 years agoMerged r5964 from trunk.
Jean-Philippe Lang [Mon, 30 May 2011 16:40:17 +0000 (16:40 +0000)]
Merged r5964 from trunk.

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

13 years agoMerged r5962 from trunk.
Toshi MARUYAMA [Sun, 29 May 2011 14:54:06 +0000 (14:54 +0000)]
Merged r5962 from trunk.

Bulgarian translation updated by Ivan Cenov.

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

13 years agoMerged r5950 to r5960 from trunk.
Jean-Philippe Lang [Sun, 29 May 2011 12:06:05 +0000 (12:06 +0000)]
Merged r5950 to r5960 from trunk.

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

13 years agoMerged r5887 from trunk.
Toshi MARUYAMA [Sun, 29 May 2011 11:32:16 +0000 (11:32 +0000)]
Merged r5887 from trunk.

scm: replace a tab to two spaces in app/views/settings/_repositories.rhtml.

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

13 years agoMerged r5886 from trunk.
Toshi MARUYAMA [Sun, 29 May 2011 11:31:48 +0000 (11:31 +0000)]
Merged r5886 from trunk.

scm: remove trailing white-spaces from app/views/settings/_repositories.rhtml.

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

13 years agoMerged r5948 from trunk.
Jean-Philippe Lang [Sun, 29 May 2011 08:15:18 +0000 (08:15 +0000)]
Merged r5948 from trunk.

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

13 years agoMerged r5944 from trunk.
Jean-Philippe Lang [Sun, 29 May 2011 07:47:25 +0000 (07:47 +0000)]
Merged r5944 from trunk.

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

13 years agoMerged r5881 from trunk.
Jean-Philippe Lang [Sun, 29 May 2011 07:24:15 +0000 (07:24 +0000)]
Merged r5881 from trunk.

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

13 years agoMerged r5880 from trunk.
Jean-Philippe Lang [Sun, 29 May 2011 07:18:05 +0000 (07:18 +0000)]
Merged r5880 from trunk.

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

13 years agoMerged r5940 from trunk.
Toshi MARUYAMA [Sat, 28 May 2011 03:34:47 +0000 (03:34 +0000)]
Merged r5940 from trunk.

remove trailing white-spaces from rake redmine:email:test task source.

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

13 years agoMerged r5939 from trunk.
Toshi MARUYAMA [Sat, 28 May 2011 03:34:23 +0000 (03:34 +0000)]
Merged r5939 from trunk.

handle a nil user in rake redmine:email:test task.

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

13 years agoMerged r5938 from trunk.
Toshi MARUYAMA [Sat, 28 May 2011 03:33:55 +0000 (03:33 +0000)]
Merged r5938 from trunk.

use rake task parameter style message if redmine:email:test parameter is blank.

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

13 years agoSet version to stable.
Jean-Philippe Lang [Sun, 22 May 2011 09:20:14 +0000 (09:20 +0000)]
Set version to stable.

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

13 years ago1.2-stable branch added.
Jean-Philippe Lang [Sun, 22 May 2011 09:17:45 +0000 (09:17 +0000)]
1.2-stable branch added.

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

13 years agoSet version to 1.2.0.
Jean-Philippe Lang [Sun, 22 May 2011 09:17:05 +0000 (09:17 +0000)]
Set version to 1.2.0.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5877 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoDo not propose users that can't view an issue as watchers (#7412).
Jean-Philippe Lang [Sun, 22 May 2011 09:14:36 +0000 (09:14 +0000)]
Do not propose users that can't view an issue as watchers (#7412).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5876 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoscm: code clean up repositories controller.
Toshi MARUYAMA [Sat, 21 May 2011 06:16:19 +0000 (06:16 +0000)]
scm: code clean up repositories controller.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5875 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoscm: remove trailing white-spaces from repositories controller.
Toshi MARUYAMA [Sat, 21 May 2011 06:15:34 +0000 (06:15 +0000)]
scm: remove trailing white-spaces from repositories controller.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5874 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoset svn:eol-style=native app/views/projects/settings/_activities.rhtml.
Toshi MARUYAMA [Sat, 21 May 2011 04:33:11 +0000 (04:33 +0000)]
set svn:eol-style=native app/views/projects/settings/_activities.rhtml.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5873 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoset svn:eol-style=native app/views/common/error.html.erb.
Toshi MARUYAMA [Sat, 21 May 2011 04:26:15 +0000 (04:26 +0000)]
set svn:eol-style=native app/views/common/error.html.erb.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5872 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoscm: git: add unit adapter test of default path_encoding is UTF-8 (#5251).
Toshi MARUYAMA [Sat, 21 May 2011 02:40:19 +0000 (02:40 +0000)]
scm: git: add unit adapter test of default path_encoding is UTF-8 (#5251).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5871 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoscm: git: override "path_encoding" method in adapter (#5251).
Toshi MARUYAMA [Sat, 21 May 2011 02:39:42 +0000 (02:39 +0000)]
scm: git: override "path_encoding" method in adapter (#5251).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5870 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoscm: mercurial: add unit adapter test of default path_encoding is UTF-8 (#2664).
Toshi MARUYAMA [Sat, 21 May 2011 02:38:56 +0000 (02:38 +0000)]
scm: mercurial: add unit adapter test of default path_encoding is UTF-8 (#2664).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5869 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoscm: mercurial: override "path_encoding" method in adapter (#2664).
Toshi MARUYAMA [Sat, 21 May 2011 02:38:04 +0000 (02:38 +0000)]
scm: mercurial: override "path_encoding" method in adapter (#2664).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5868 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoscm: cvs: add unit adapter test of default path_encoding is UTF-8 (#3462).
Toshi MARUYAMA [Sat, 21 May 2011 02:19:38 +0000 (02:19 +0000)]
scm: cvs: add unit adapter test of default path_encoding is UTF-8 (#3462).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5867 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoscm: cvs: override "path_encoding" method in adapter (#3462).
Toshi MARUYAMA [Sat, 21 May 2011 02:18:53 +0000 (02:18 +0000)]
scm: cvs: override "path_encoding" method in adapter (#3462).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5866 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoscm: filesystem: add unit adapter test of default path_encoding is UTF-8 (#2274).
Toshi MARUYAMA [Sat, 21 May 2011 02:18:07 +0000 (02:18 +0000)]
scm: filesystem: add unit adapter test of default path_encoding is UTF-8 (#2274).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5865 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoscm: filesystem: override "path_encoding" method in adapter (#2274).
Toshi MARUYAMA [Sat, 21 May 2011 02:17:34 +0000 (02:17 +0000)]
scm: filesystem: override "path_encoding" method in adapter (#2274).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5864 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoscm: add "path_encoding" method in abstract adapter (#2274, #3462, #2664, #5251).
Toshi MARUYAMA [Sat, 21 May 2011 02:16:51 +0000 (02:16 +0000)]
scm: add "path_encoding" method in abstract adapter (#2274, #3462, #2664, #5251).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5863 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoscm: filesystem: code clean up unit model test.
Toshi MARUYAMA [Sat, 21 May 2011 01:10:47 +0000 (01:10 +0000)]
scm: filesystem: code clean up unit model test.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5862 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoscm: filesystem: code clean up functional test.
Toshi MARUYAMA [Sat, 21 May 2011 01:00:24 +0000 (01:00 +0000)]
scm: filesystem: code clean up functional test.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5861 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoscm: code clean up app/views/repositories/revisions.rhtml.
Toshi MARUYAMA [Sat, 21 May 2011 00:59:40 +0000 (00:59 +0000)]
scm: code clean up app/views/repositories/revisions.rhtml.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5860 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoscm: code clean up app/views/repositories/revision.rhtml.
Toshi MARUYAMA [Sat, 21 May 2011 00:58:47 +0000 (00:58 +0000)]
scm: code clean up app/views/repositories/revision.rhtml.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5859 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoscm: git: brush up model fetch_changesets() comment.
Toshi MARUYAMA [Thu, 19 May 2011 22:58:38 +0000 (22:58 +0000)]
scm: git: brush up model fetch_changesets() comment.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5858 e93f8b46-1217-0410-a6f0-8f06a7374b81

13 years agoTraditional Chinese translation updated by ChunChang Lo (#8400).
Toshi MARUYAMA [Thu, 19 May 2011 03:57:01 +0000 (03:57 +0000)]
Traditional Chinese translation updated by ChunChang Lo (#8400).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5857 e93f8b46-1217-0410-a6f0-8f06a7374b81