887e7c6781
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
2011-06-08 23:53:03 +00:00
6280d9e9b2
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
2011-06-08 23:52:43 +00:00
3996d5f42e
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
2011-06-08 13:24:38 +00:00
579abc1802
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
2011-06-08 13:23:56 +00:00
dc2efa503a
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
2011-06-03 11:41:34 +00:00
0e6cdeb860
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
2011-06-02 08:26:02 +00:00
3b9ef033bf
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
2011-06-02 06:29:15 +00:00
2ae54a0fc1
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
2011-06-01 22:55:23 +00:00
a87e6e1265
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
2011-06-01 22:54:58 +00:00
61b1146f9d
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
2011-06-01 08:09:23 +00:00
c509c744fd
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
2011-05-31 03:48:27 +00:00
1be21f2413
Merged r5965 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@5967 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-05-30 16:40:52 +00:00
eaf430b630
Merged r5964 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@5966 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-05-30 16:40:17 +00:00
d2789248f7
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
2011-05-29 14:54:06 +00:00
f08f09a9d3
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
2011-05-29 12:06:05 +00:00
2c2760d041
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
2011-05-29 11:32:16 +00:00
218e2f32ee
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
2011-05-29 11:31:48 +00:00
f2b01aeb4d
Merged r5948 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@5949 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-05-29 08:15:18 +00:00
fabf54a368
Merged r5944 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@5947 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-05-29 07:47:25 +00:00
6b07f86883
Merged r5881 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@5946 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-05-29 07:24:15 +00:00
36d2ea9a6c
Merged r5880 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@5945 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-05-29 07:18:05 +00:00
2dca48be53
Merged r5940 from trunk.
...
remove trailing white-spaces from rake redmine📧 test task source.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@5943 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-05-28 03:34:47 +00:00
7678aa9445
Merged r5939 from trunk.
...
handle a nil user in rake redmine📧 test task.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@5942 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-05-28 03:34:23 +00:00
9c355ee6c3
Merged r5938 from trunk.
...
use rake task parameter style message if redmine📧 test parameter is blank.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@5941 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-05-28 03:33:55 +00:00
723030e40a
Set version to stable.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@5879 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-05-22 09:20:14 +00:00
e6ed112d9d
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
2011-05-22 09:17:45 +00:00
1b4a5e5aff
Set version to 1.2.0.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5877 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-05-22 09:17:05 +00:00
7e1f04bdfb
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
2011-05-22 09:14:36 +00:00
5543ec5f5a
scm: code clean up repositories controller.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5875 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-05-21 06:16:19 +00:00
782f7ca3bf
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
2011-05-21 06:15:34 +00:00
331489e8b8
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
2011-05-21 04:33:11 +00:00
760168366e
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
2011-05-21 04:26:15 +00:00
61fb6d6e10
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
2011-05-21 02:40:19 +00:00
61c5740a86
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
2011-05-21 02:39:42 +00:00
c9a3d925ca
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
2011-05-21 02:38:56 +00:00
a1e3cf8218
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
2011-05-21 02:38:04 +00:00
c8309589b6
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
2011-05-21 02:19:38 +00:00
0840ad69ea
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
2011-05-21 02:18:53 +00:00
2c817160ab
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
2011-05-21 02:18:07 +00:00
cbd1715109
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
2011-05-21 02:17:34 +00:00
3d4a3315f6
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
2011-05-21 02:16:51 +00:00
7296315c95
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
2011-05-21 01:10:47 +00:00
eb65817ff9
scm: filesystem: code clean up functional test.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5861 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-05-21 01:00:24 +00:00
f36d8cacba
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
2011-05-21 00:59:40 +00:00
e4d726bde3
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
2011-05-21 00:58:47 +00:00
f1f4362b50
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
2011-05-19 22:58:38 +00:00
27a491766f
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
2011-05-19 03:57:01 +00:00
fe7e8fa590
scm: git: use hash#dup for extra_info in model fetch_changesets().
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5856 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-05-19 02:38:14 +00:00
24d58543be
scm: git: add unit model test that revisions ordering is inconsistent in existing database ( #5357 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5855 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-05-19 02:17:19 +00:00
9376f6e2c3
scm: git: add unit model test that revisions ordering is consistent in new database ( #5357 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5854 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-05-19 02:16:56 +00:00
Toshi MARUYAMA
Jean-Philippe Lang