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,271 Commits 32 Branches 194 Tags
Commit Graph

4211 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
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
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
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
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
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
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
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
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
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
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
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
46400e355e Use content_tag helper. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9680 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-05-13 08:42:19 +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
7c97832002 Redirect to referer when deleting a user (#10865). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9678 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-05-13 08:33:55 +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
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
Toshi MARUYAMA
0bb937152b change mailer model method comments to Rails3 style 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9663 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-05-09 15:14:45 +00:00
Toshi MARUYAMA
804864beca replace Mailer deliver syntax to Rails3 style at reminders method of mailer model 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9662 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-05-09 15:14:30 +00:00
Toshi MARUYAMA
2ed78d95f6 code layout cleanup app/views/wiki/edit.html.erb 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9661 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-05-09 14:18:53 +00:00
Jean-Philippe Lang
1ad003dcc7 Fixed that REST Uploads fail with fastcgi (#10832). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9652 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-05-08 10:11:09 +00:00
Toshi MARUYAMA
31d2d1284a remove redundant code from app/models/mail_handler.rb 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9646 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-05-06 13:50:30 +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
Jean-Philippe Lang
19e56045dd Fixed deprecated render calls in Mailer. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9640 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-05-05 13:21:58 +00:00
Jean-Philippe Lang
6fc909a402 Adds a deprecation warning to Mailer.deliver_*. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9639 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-05-05 13:17:18 +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
Jean-Philippe Lang
e876d1bfc0 Changes RedMine to Redmine in copyright notices. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9637 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-05-05 13:02:45 +00:00
Jean-Philippe Lang
ba5a052c8c Copyright update. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9636 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-05-05 12:56:53 +00:00