meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-24 09:21:12 +00:00
Code Issues Releases Wiki Activity
8,241 Commits 32 Branches 194 Tags
Commit Graph

8241 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Toshi MARUYAMA
7fe9dac8c5 Merge r9871 from trunk 
fix test_global_index of functional activities controller test fails around UTC 00:00.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.0-stable@9873 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-06-19 02:11:16 +00:00
Toshi MARUYAMA
711328d172 Merge r9870 from trunk 
scm: git: fix unable to run unit lib test if git binary is not available on Windows.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.0-stable@9872 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-06-19 02:10:55 +00:00
Jean-Philippe Lang
342b3302cf Merged r9864 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.0-stable@9865 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-06-18 18:45:14 +00:00
Jean-Philippe Lang
32e3d6e1b1 Merged r9861 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.0-stable@9862 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-06-18 18:34:01 +00:00
Jean-Philippe Lang
8d2d46bd8e Merged r9858 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.0-stable@9859 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-06-18 18:17:49 +00:00
Toshi MARUYAMA
7f03576b8d Merged r9853 from trunk (#10688) 
fix PDF export tables problems.

Contributed by Jun NAITOH.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.0-stable@9854 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-06-17 13:10:48 +00:00
Toshi MARUYAMA
e757600b39 Merge r9750 from trunk 
scm: git: skip Latin-1 path tests on Git for Windows above 1.7.10

Git for Windows (msysGit) changed internal API from ANSI to Unicode in 1.7.10.
http://code.google.com/p/msysgit/issues/detail?id=80

So, Latin-1 path tests fail on Japanese Windows.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.0-stable@9851 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-06-17 10:52:18 +00:00
Jean-Philippe Lang
68560c13fe Merged r9830 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.0-stable@9848 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-06-17 09:02:24 +00:00
Jean-Philippe Lang
309f7b75fd Merged r9837 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.0-stable@9846 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-06-17 08:59:42 +00:00
Jean-Philippe Lang
dbb93692ff Merged r9836 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.0-stable@9845 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-06-17 08:58:20 +00:00
Jean-Philippe Lang
5f6289d6be Merged r9831 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.0-stable@9843 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-06-17 08:56:11 +00:00
Jean-Philippe Lang
081ee54bee Merged r9822 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.0-stable@9840 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-06-17 08:52:40 +00:00
Jean-Philippe Lang
1d0fb85179 Merged r9796 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.0-stable@9839 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-06-17 08:51:04 +00:00
Etienne Massip
887e7f8647 Merged r9832 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.0-stable@9834 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-06-14 21:09:56 +00:00
Toshi MARUYAMA
df05edff3d Merged r9814 from trunk 
fix test_user_index of activities controller test fails at Japanese morning and afternoon.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.0-stable@9818 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-06-11 06:56:11 +00:00
Jean-Philippe Lang
67057ea3e9 Merged r9798 to r9801 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.0-stable@9802 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-06-10 13:39:42 +00:00
Jean-Philippe Lang
381e7156c2 Merged r9782, r9784, r9794 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.0-stable@9795 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-06-09 14:19:13 +00:00
Jean-Philippe Lang
f9ee57f2c1 Merged r9781 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.0-stable@9793 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-06-09 13:58:40 +00:00
Jean-Philippe Lang
fc13aef5bb Merged r9785 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.0-stable@9792 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-06-09 13:56:56 +00:00
Jean-Philippe Lang
4973350243 Merged r9783 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.0-stable@9789 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-06-09 13:45:55 +00:00
Jean-Philippe Lang
fcbb8acdb7 Merged r9786 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.0-stable@9788 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-06-09 13:44:32 +00:00
Toshi MARUYAMA
d79258f17f Merged r9777 from trunk (#11113) 
fix German "field_multiple" translation glitch by Andreas Deininger.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.0-stable@9778 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-06-08 07:49:16 +00:00
Jean-Philippe Lang
c4736ed42b Merged r9770 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.0-stable@9771 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-06-05 17:19:37 +00:00
Jean-Philippe Lang
47fb2eb998 Merged r9768 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.0-stable@9769 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-06-05 17:11:06 +00:00
Jean-Philippe Lang
e9813791cb Merged r9759 to r9764. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.0-stable@9766 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-06-03 16:32:21 +00:00
Jean-Philippe Lang
5f23ebc31c Merged r9755 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.0-stable@9756 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-06-03 08:50:26 +00:00
Jean-Philippe Lang
b88c95b0fb Merged r9740 and r9741 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.0-stable@9753 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-06-03 08:10:00 +00:00
Jean-Philippe Lang
93d8f99884 Merged r9742 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.0-stable@9751 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-06-03 08:07:07 +00:00
Toshi MARUYAMA
07edb10518 Merged r9734 from trunk (#11032) 
fix project list is not shown on Email notifications.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.0-stable@9739 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-05-28 10:31:19 +00:00
Jean-Philippe Lang
0512a30368 Updates for 2.0.1 release. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.0-stable@9732 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-05-28 07:24:38 +00:00
Jean-Philippe Lang
bc945d78a6 Merged r9719, r9726, r9727 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.0-stable@9729 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-05-27 19:39:26 +00:00
Jean-Philippe Lang
8cd0626075 Merged r9701 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.0-stable@9728 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-05-27 19:25:30 +00:00
Jean-Philippe Lang
035bd65a5a Merged r9710 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.0-stable@9725 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-05-26 09:50:51 +00:00
Jean-Philippe Lang
955d2b134d Merged r9711 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.0-stable@9724 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-05-26 09:50:01 +00:00
Jean-Philippe Lang
743b55a3f9 Merged r9718 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.0-stable@9723 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-05-26 09:49:19 +00:00
Jean-Philippe Lang
881595f7f0 Merged r9712 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.0-stable@9722 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-05-26 09:48:37 +00:00
Jean-Philippe Lang
7f51bab0fc Merged r9709 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.0-stable@9721 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-05-26 09:47:48 +00:00
Jean-Philippe Lang
84d5092508 Merged r9699 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.0-stable@9720 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-05-26 09:40:31 +00:00
Jean-Philippe Lang
352d177f7e Merged r9703 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.0-stable@9706 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-05-21 19:00:26 +00:00
Jean-Philippe Lang
821ea2a757 Merged r9702 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.0-stable@9705 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-05-21 18:59:31 +00:00
Jean-Philippe Lang
7cd7b1bd8b Merged r9700 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.0-stable@9704 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-05-21 18:58:29 +00:00
Jean-Philippe Lang
cf139e25a7 Merged r9696 from trunk. Updates for 2.0.0 release. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.0-stable@9697 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-05-14 22:19:13 +00:00
Jean-Philippe Lang
8b09f5d27d Set version to stable. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.0-stable@9695 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-05-14 17:02:27 +00:00
Jean-Philippe Lang
d138df5241 Added 2.0-stable branch. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.0-stable@9694 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-05-14 16:48:29 +00:00
Jean-Philippe Lang
034539c988 CHANGELOG updated. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9691 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-05-13 19:08:25 +00:00
Jean-Philippe Lang
48c28f717d Removed delete_broken_cookies filter. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9689 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-05-13 11:26:21 +00:00
Jean-Philippe Lang
23a06ec022 Restored List-Id header in email notifications (#10888). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9687 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-05-13 10:44:41 +00:00
Jean-Philippe Lang
4f0aa2432c Fixes custom_field_tag helper broken by r9682. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9686 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-05-13 10:21:24 +00:00
Jean-Philippe Lang
426b1d6fcd Fixed that option tags are escaped. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9683 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-05-13 09:00:26 +00:00
Jean-Philippe Lang
478a549356 Use content_tag helper. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9682 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-05-13 08:47:54 +00:00