dinislage/redmine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,092 Commits 20 Branches 82 Tags
eb3e79b70ddeae1e0ba168f7eb616e36e1e476d6
Commit Graph
4137 Commits
Author SHA1 Message Date
Jean-Philippe Lang eb3e79b70d Merged r10148 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@10295 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-09-06 17:07:49 +00:00
Toshi MARUYAMA 14dcefaa97 set default category_id instead of the object (#11665) 
Rails 2.3 still has issues with synchronizing the association_id
and association attributes of an object. That means, if you set the
association with an object first and then just set the id afterwards,
the object wins and the setting of the id gets lost.

This is not an issue in Rails >= 3.1 anymore.

Contributed by Holger Just.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@10226 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-08-21 17:15:59 +00:00
Toshi MARUYAMA f4a7d6ca8c Merged r10221 from trunk to 1.4-stable (#11665) 
force set default document category if it is not set on database.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@10225 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-08-21 17:15:38 +00:00
Jean-Philippe Lang dbc02e66dc Backported r9982 and r9984 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@10000 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-07-15 16:00:58 +00:00
Jean-Philippe Lang 75e350f4e6 Merged r9924 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9960 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-07-08 12:38:57 +00:00
Jean-Philippe Lang 81553d396e Merged r9908 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9955 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-07-08 12:32:38 +00:00
Jean-Philippe Lang 77e03b508b Merged r9875 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9951 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-07-08 12:26:49 +00:00
Jean-Philippe Lang 1881706df4 Backported r9858 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9860 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-06-18 18:29:15 +00:00
Jean-Philippe Lang 10711fda6d Merged r9837 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9847 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-06-17 09:01:17 +00:00
Jean-Philippe Lang ba3828b49f Backported r9797 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9810 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-06-10 20:30:58 +00:00
Jean-Philippe Lang fe1a152e02 Merged r9798 to r9801 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9803 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-06-10 13:40:02 +00:00
Jean-Philippe Lang 7b7bca0b59 Merged r9783 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9790 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-06-09 13:53:37 +00:00
Jean-Philippe Lang bca6c447cb Merged r9740 and r9741 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9754 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-06-03 08:13:58 +00:00
Jean-Philippe Lang e62a40a719 Merged r9689 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9690 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-05-13 11:27:09 +00:00
Jean-Philippe Lang 5a1be1d8df Backported r9687 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9688 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-05-13 10:47:10 +00:00
Jean-Philippe Lang 81c207b193 Restored rescue statement removed in r9684. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9685 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-05-13 09:46:36 +00:00
Jean-Philippe Lang 60cdcd5522 Redirect to referer when deleting a user (#10865). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9684 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-05-13 09:17:56 +00:00
Jean-Philippe Lang 9cfb7e1c87 Merged r9671 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9672 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-05-12 12:42:30 +00:00
Jean-Philippe Lang eb53d600c9 Fixed that REST Uploads fail with fastcgi in 1.4-stable (#10832). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9653 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-05-08 10:39:42 +00:00
Jean-Philippe Lang e9ac98b249 Merged r9619 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9620 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-05-04 16:58:08 +00:00
Jean-Philippe Lang e5802895ce Merged r9417 from trunk (#10664). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9455 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-20 07:45:33 +00:00
Jean-Philippe Lang da1a3449ce Merged r9449 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9454 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-20 06:14:32 +00:00
Jean-Philippe Lang 2b2f721ef4 Merged r9452 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9453 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-20 06:13:37 +00:00
Jean-Philippe Lang d6d064f875 Merged r9420 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9436 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-18 17:42:50 +00:00
Jean-Philippe Lang 6d8649b9d3 Merged r9419 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9435 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-18 17:42:09 +00:00
Jean-Philippe Lang fd450fd2da Merged r9404, r9405 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9411 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-14 06:54:02 +00:00
Jean-Philippe Lang 8fefb7c05b Merged r9390 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9400 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-14 04:52:49 +00:00
Jean-Philippe Lang 1feb373c89 Merged r9378 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9399 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-14 04:51:49 +00:00
Jean-Philippe Lang 32fd503cbb Merged r9381 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9398 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-14 04:50:58 +00:00
Jean-Philippe Lang cf31aeaf81 Merged r9380 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9397 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-14 04:45:44 +00:00
Jean-Philippe Lang 83ea66fd2c Merged r9379 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9395 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-14 04:43:41 +00:00
Jean-Philippe Lang ef2c5cab2d Merged r9392 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9393 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-13 19:41:05 +00:00
Jean-Philippe Lang a4c0c18e3d Merged r9384, r9385 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9386 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-11 17:27:44 +00:00
Jean-Philippe Lang 68ded50edc Merged r9372 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9377 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-09 06:28:04 +00:00
Jean-Philippe Lang 72ecb80dc7 Merged r9358 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9376 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-09 06:27:07 +00:00
Jean-Philippe Lang 86ee285eb4 Merged r9367 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9375 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-09 06:22:31 +00:00
Jean-Philippe Lang 687fca170e Merged r9359 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9360 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-06 13:51:55 +00:00
Jean-Philippe Lang 34016c38bd Merged r9349 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9354 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-06 12:39:51 +00:00
Jean-Philippe Lang 15ff361894 Merged r9350 and r9351 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9352 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-06 12:23:07 +00:00
Jean-Philippe Lang b4975862d6 Uploading of attachments which filename contains non-ASCII chars fails with Ruby 1.9 on issue update (#10575). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9334 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-06 09:31:29 +00:00
Jean-Philippe Lang 331cf23345 Do not display the magnifier for added files in email notifications (#4774). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9333 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-06 09:20:40 +00:00
Jean-Philippe Lang f05f84a2ea Moved the magnifier just after the filename. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9332 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-06 08:49:04 +00:00
Jean-Philippe Lang bac7dff5bb Force encoding of custom field possible values (#10593). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9330 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-06 07:39:50 +00:00
Jean-Philippe Lang f1cae4f7af WikiContent::Version#text may return ascii-8bit encoded string (#10590). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9329 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-06 07:21:51 +00:00
Toshi MARUYAMA e964135b62 delete :only_path option from link_to options at application_helper link_to_attachment (#10602) 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9328 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-06 06:07:13 +00:00
Toshi MARUYAMA 8828c0f13e fix attachment link has get parameter :class (#10602) 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9327 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-06 05:45:04 +00:00
Toshi MARUYAMA f277f127c6 add a view link to note attachment file (#4774) 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9326 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-06 05:44:48 +00:00
Toshi MARUYAMA b88586b56d code layout cleanup app/helpers/issues_helper.rb 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9325 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-06 05:44:30 +00:00
Toshi MARUYAMA c1dd88b015 replace tabs to spaces at app/views/attachments/_links.html.erb 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9324 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-06 05:44:14 +00:00
Etienne Massip d36d64f664 Fixed Internal Error in watchers XHR search (#10600). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9323 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-05 18:10:54 +00:00