summaryrefslogtreecommitdiffstats
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Reverts r10896 (#12472).Jean-Philippe Lang2012-11-301-1/+0
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@10898 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r10893 into 1.4-stable (#12472).Jean-Philippe Lang2012-11-301-0/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@10896 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r10856 and r10857 from trunk to 1.4-stable (#12409)Toshi MARUYAMA2012-11-212-0/+15
| | | | | | scm: git: fix changesets aren't read after clear_changesets call. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@10859 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r10709 from trunk to 1.4-stable (#12196)Toshi MARUYAMA2012-10-241-1/+2
| | | | | | fix "Page not found" on OK button in SCM "View all revisions" page. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@10711 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r10490 from trunk to 1.4-stable (#11966)Toshi MARUYAMA2012-09-281-2/+3
| | | | | | explicitly define route at scm diff view. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@10506 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r10294 from trunk.Jean-Philippe Lang2012-09-061-1/+3
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@10297 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r10148 from trunk.Jean-Philippe Lang2012-09-062-0/+2
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@10295 e93f8b46-1217-0410-a6f0-8f06a7374b81
* set default category_id instead of the object (#11665)Toshi MARUYAMA2012-08-211-1/+3
| | | | | | | | | | | | | 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
* Merged r10221 from trunk to 1.4-stable (#11665)Toshi MARUYAMA2012-08-211-0/+8
| | | | | | 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
* Backported r9982 and r9984 from trunk.Jean-Philippe Lang2012-07-152-1/+2
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@10000 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r9924 from trunk.Jean-Philippe Lang2012-07-081-6/+9
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9960 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r9908 from trunk.Jean-Philippe Lang2012-07-081-2/+2
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9955 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r9875 from trunk.Jean-Philippe Lang2012-07-081-2/+2
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9951 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Backported r9858 from trunk.Jean-Philippe Lang2012-06-181-0/+22
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9860 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r9837 from trunk.Jean-Philippe Lang2012-06-171-1/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9847 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Backported r9797 from trunk.Jean-Philippe Lang2012-06-102-6/+58
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9810 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r9798 to r9801 from trunk.Jean-Philippe Lang2012-06-102-6/+9
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9803 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r9783 from trunk.Jean-Philippe Lang2012-06-091-1/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9790 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r9740 and r9741 from trunk.Jean-Philippe Lang2012-06-032-8/+17
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9754 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r9689 from trunk.Jean-Philippe Lang2012-05-131-11/+0
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9690 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Backported r9687 from trunk.Jean-Philippe Lang2012-05-131-1/+2
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9688 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Restored rescue statement removed in r9684.Jean-Philippe Lang2012-05-131-0/+2
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9685 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Redirect to referer when deleting a user (#10865).Jean-Philippe Lang2012-05-131-3/+3
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9684 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r9671 from trunk.Jean-Philippe Lang2012-05-121-2/+2
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9672 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Fixed that REST Uploads fail with fastcgi in 1.4-stable (#10832).Jean-Philippe Lang2012-05-082-5/+10
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9653 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r9619 from trunk.Jean-Philippe Lang2012-05-041-1/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9620 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r9417 from trunk (#10664).Jean-Philippe Lang2012-04-207-8/+49
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9455 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r9449 from trunk.Jean-Philippe Lang2012-04-201-1/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9454 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r9452 from trunk.Jean-Philippe Lang2012-04-201-1/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9453 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r9420 from trunk.Jean-Philippe Lang2012-04-181-1/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9436 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r9419 from trunk.Jean-Philippe Lang2012-04-181-4/+8
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9435 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r9404, r9405 from trunk.Jean-Philippe Lang2012-04-143-21/+39
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9411 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r9390 from trunk.Jean-Philippe Lang2012-04-141-5/+14
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9400 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r9378 from trunk.Jean-Philippe Lang2012-04-142-6/+14
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9399 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r9381 from trunk.Jean-Philippe Lang2012-04-141-1/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9398 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r9380 from trunk.Jean-Philippe Lang2012-04-141-1/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9397 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r9379 from trunk.Jean-Philippe Lang2012-04-142-3/+6
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9395 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r9392 from trunk.Jean-Philippe Lang2012-04-131-12/+0
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9393 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r9384, r9385 from trunk.Jean-Philippe Lang2012-04-111-1/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9386 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r9372 from trunk.Jean-Philippe Lang2012-04-091-0/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9377 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r9358 from trunk.Jean-Philippe Lang2012-04-091-0/+7
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9376 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r9367 from trunk.Jean-Philippe Lang2012-04-091-0/+11
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9375 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r9359 from trunk.Jean-Philippe Lang2012-04-061-1/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9360 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r9349 from trunk.Jean-Philippe Lang2012-04-062-1/+11
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9354 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r9350 and r9351 from trunk.Jean-Philippe Lang2012-04-062-4/+7
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9352 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Uploading of attachments which filename contains non-ASCII chars fails with ↵Jean-Philippe Lang2012-04-061-0/+1
| | | | | | Ruby 1.9 on issue update (#10575). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9334 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Do not display the magnifier for added files in email notifications (#4774).Jean-Philippe Lang2012-04-061-1/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9333 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Moved the magnifier just after the filename.Jean-Philippe Lang2012-04-061-2/+2
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9332 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Force encoding of custom field possible values (#10593).Jean-Philippe Lang2012-04-061-2/+12
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9330 e93f8b46-1217-0410-a6f0-8f06a7374b81
* WikiContent::Version#text may return ascii-8bit encoded string (#10590).Jean-Philippe Lang2012-04-061-6/+8
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9329 e93f8b46-1217-0410-a6f0-8f06a7374b81