summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Merged r10216 from trunkToshi MARUYAMA2012-08-211-1/+3
| | | | | | add missing fixtures to test/functional/documents_controller_test.rb git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@10218 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r10213 from trunkToshi MARUYAMA2012-08-211-1/+4
| | | | | | add missing fixtures to test/unit/document_test.rb git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@10215 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r10169 from trunk to 1.4-stable (#11600)Toshi MARUYAMA2012-08-082-4/+5
| | | | | | | | fix plural form of the abbreviation for hours in Brazilian Portuguese. Contributed by Mauricio Piacentini. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@10173 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r10167 from trunk to 1.4-stableToshi MARUYAMA2012-08-081-1/+1
| | | | | | Gemfile: mocha version up 0.12.3. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@10172 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r10155 from trunk to 1.4-stableToshi MARUYAMA2012-08-071-1/+1
| | | | | | Gemfile: pin mocha version 0.12.1. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@10168 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r10137 from trunk to 1.4-stable (#10320, #10818)Toshi MARUYAMA2012-07-312-0/+3
| | | | | | Gemfile: prevent "rake db:migrate RAILS_ENV=test" causes exception on Ruby 1.9.3. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@10139 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r10055 from trunk to 1.4-stable (#11448)Toshi MARUYAMA2012-07-202-34/+35
| | | | | | Russian translation for 1.4-stable and 2.0-stable updated by Александр Закревский. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@10057 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Backported r10005 from trunk to 1.4-stable (#11406, #11404)Toshi MARUYAMA2012-07-161-5/+5
| | | | | | German translation for configurable session lifetime and timeout updated by Hannes Meier. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@10008 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Backported r9982 and r9984 from trunk.Jean-Philippe Lang2012-07-155-1/+10
| | | | 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-083-7/+12
| | | | 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-083-2/+31
| | | | 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-083-2/+12
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9951 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r9911 from trunk to 1.4-stable (#11328)Toshi MARUYAMA2012-07-052-1/+5
| | | | | | | | Fix Japanese mistranslation for 'label_language_based'. Contributed by Go MAEDA. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9918 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Backport r9890 from trunk to 1.4-stableToshi MARUYAMA2012-06-261-2/+2
| | | | | | Simplified Chinese translation updated by Steven Wong (#11261). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9893 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merge r9870 from trunkToshi MARUYAMA2012-06-191-10/+10
| | | | | | 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/1.4-stable@9874 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Updates for 1.4.4 release.Jean-Philippe Lang2012-06-182-3/+4
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9866 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r9861 from trunk.Jean-Philippe Lang2012-06-182-20/+20
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9863 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Backported r9858 from trunk.Jean-Philippe Lang2012-06-183-0/+58
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9860 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Backport r9856 from trunk (#11186)Toshi MARUYAMA2012-06-181-5/+5
| | | | | | Traditional Chinese translation updated by ChunChang Lo. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9857 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r9853 from trunk (#10688)Toshi MARUYAMA2012-06-172-21/+29
| | | | | | | | fix PDF export tables problems. Contributed by Jun NAITOH. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9855 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merge r9750 from trunkToshi MARUYAMA2012-06-173-8/+32
| | | | | | | | | | | 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/1.4-stable@9852 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Fix for Rails vulnerabilities CVE-2012-2694 and CVE-2012-2695.Jean-Philippe Lang2012-06-172-3/+44
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9849 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r9837 from trunk.Jean-Philippe Lang2012-06-173-1/+16
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9847 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r9831 from trunk.Jean-Philippe Lang2012-06-173-3/+14
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9844 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r9822 from trunk.Jean-Philippe Lang2012-06-173-1/+27
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9842 e93f8b46-1217-0410-a6f0-8f06a7374b81
* CHANGELOG updated.Jean-Philippe Lang2012-06-171-0/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9841 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r9832 fro trunk.Etienne Massip2012-06-141-1/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9833 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Backported r9817 from trunk (#11130)Toshi MARUYAMA2012-06-111-5/+5
| | | | | | Simplified Chinese translation updated. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9821 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Backported r9816 from trunk (#11129)Toshi MARUYAMA2012-06-111-5/+5
| | | | | | Bulgarian translation updated by Ivan Cenov. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9820 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Backported r9815 from trunk (#11128)Toshi MARUYAMA2012-06-111-7/+7
| | | | | | Japanese translation updated by Go MAEDA. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9819 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Backported r9797 from trunk.Jean-Philippe Lang2012-06-1052-6/+556
| | | | 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
* CHANGELOG update.Jean-Philippe Lang2012-06-091-0/+5
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9791 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r9783 from trunk.Jean-Philippe Lang2012-06-092-1/+16
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9790 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r9777 from trunk (#11113)Toshi MARUYAMA2012-06-081-1/+1
| | | | | | fix German "field_multiple" translation glitch by Andreas Deininger. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9779 e93f8b46-1217-0410-a6f0-8f06a7374b81
* 1.4-stable: scm: git: backport creating and updating test from trunk r9616 ↵Toshi MARUYAMA2012-06-061-0/+29
| | | | | | (#10830) git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9775 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Updates for 1.4.3 release.Jean-Philippe Lang2012-06-052-1/+8
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9772 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Rails CVE-2012-2660.Jean-Philippe Lang2012-06-031-0/+26
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9767 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r9755 from trunk.Jean-Philippe Lang2012-06-031-2/+9
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9757 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r9740 and r9741 from trunk.Jean-Philippe Lang2012-06-033-11/+33
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9754 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r9742 from trunk.Jean-Philippe Lang2012-06-031-0/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9752 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Updates for 1.4.2 release.Jean-Philippe Lang2012-05-132-1/+21
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9692 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-132-1/+3
| | | | 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 #10837.Jean-Philippe Lang2012-05-122-220/+143
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9676 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r9671 from trunk.Jean-Philippe Lang2012-05-123-2/+21
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9672 e93f8b46-1217-0410-a6f0-8f06a7374b81
* set svn:eol-style native to Albanian translation files (#10875)Toshi MARUYAMA2012-05-110-0/+0
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9669 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r9666 from trunk (#10875)Toshi MARUYAMA2012-05-113-0/+1171
| | | | | | Albanian translation added by Dimitri Toslluku. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9668 e93f8b46-1217-0410-a6f0-8f06a7374b81