meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-25 18:01:14 +00:00
Code Issues Releases Wiki Activity
8,254 Commits 32 Branches 194 Tags
Commit Graph

2862 Commits

Author SHA1 Message Date
Toshi MARUYAMA
48e4facc3c Merged r10083 from trunk to 2.0-stable (#11511) 
fix confirmation page has broken HTML when a project folding sub project is deleted.

Contributed by Haruka Yoshihara.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.0-stable@10084 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-07-27 00:40:57 +00:00
Jean-Philippe Lang
7dde34460c Merged r9984 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.0-stable@9999 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-07-15 15:56:23 +00:00
Jean-Philippe Lang
873a5cda4f Merged r9982 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.0-stable@9998 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-07-15 15:55:15 +00:00
Jean-Philippe Lang
d006e357c0 Merged r9924 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.0-stable@9959 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-07-08 12:37:47 +00:00
Jean-Philippe Lang
004bc127b2 Merged r9925 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.0-stable@9958 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-07-08 12:36:31 +00:00
Jean-Philippe Lang
70d2f30e9f Merged r9909 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.0-stable@9957 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-07-08 12:35:11 +00:00
Jean-Philippe Lang
6488210ec1 Merged r9895 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.0-stable@9956 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-07-08 12:34:09 +00:00
Jean-Philippe Lang
3cc0730f54 Merged r9908 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.0-stable@9954 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-07-08 12:30:57 +00:00
Jean-Philippe Lang
4491d483f4 Merged r9896 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.0-stable@9953 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-07-08 12:29:27 +00:00
Jean-Philippe Lang
a6252e6c6f Merged r9894 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.0-stable@9952 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-07-08 12:27:56 +00:00
Jean-Philippe Lang
ba074d776b Merged r9875 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.0-stable@9950 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-07-08 12:24:49 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
69e55fb1ef Fixed that enumerations option tags are escaped. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9681 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-05-13 08:45:15 +00:00
Jean-Philippe Lang
dc7569ecae Fixed that group filter is escaped on users index. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9679 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-05-13 08:38:35 +00:00
Jean-Philippe Lang
a99c61b471 Adds all/none operators to text custom field filters (#9790). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9671 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-05-12 12:23:20 +00:00
Jean-Philippe Lang
1831861eac Tests for Setting.per_page_options_array. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9665 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-05-10 18:53:32 +00:00
Jean-Philippe Lang
5bd90548b0 Adaptive display of "Per page" links (#7720). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9664 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-05-10 18:51:11 +00:00
Jean-Philippe Lang
f6882cd69e Stub Mailer with mocha. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9645 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-05-06 08:43:44 +00:00
Jean-Philippe Lang
18852b765a Trackers should be sorted by position not by name. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9644 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-05-05 16:21:22 +00:00
Jean-Philippe Lang
ee8dcab9db Fixed that activities option tags on the time entry bulk edit form are escaped. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9643 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-05-05 16:09:27 +00:00
Toshi MARUYAMA
02f704bb01 add Copyright statement to test/integration/repositories_git_test.rb 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9642 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-05-05 14:48:45 +00:00
Toshi MARUYAMA
f08b648cce fix error of AdminControllerTest test_test_email_failure_should_display_the_error 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9641 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-05-05 14:34:16 +00:00
Toshi MARUYAMA
7af8d7caf0 replace Mailer deliver syntax to Rails3 style 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9638 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-05-05 13:07:12 +00:00