Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-02-13 18:17:51 +01:00
Code Issues Packages Projects Releases Activity
8,079 Commits 35 Branches 225 Tags
aedd5c5e35eb8fbac64b9c1dbf0e754ec4fbe31a
Commit Graph

8079 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Toshi MARUYAMA
aedd5c5e35 Merged r10220 from trunk to 1.4-stable (#11665) 
add unit test to get default document category defined on database.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@10224 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-08-21 17:15:16 +00:00
Toshi MARUYAMA
554d6bcba2 Merged r10222 from trunk to 1.4-stable (#11665) 
add position to DocumentCategory in enumerations fixture.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@10223 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-08-21 17:14:53 +00:00
Toshi MARUYAMA
4fcec69a40 Merged r10216 from trunk 
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
 2012-08-21 04:53:10 +00:00
Toshi MARUYAMA
7e6cc2f583 Merged r10213 from trunk 
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
 2012-08-21 02:25:58 +00:00
Toshi MARUYAMA
16383ed386 Merged r10169 from trunk to 1.4-stable (#11600) 
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
 2012-08-08 01:39:09 +00:00
Toshi MARUYAMA
27127e1a3b Merged r10167 from trunk to 1.4-stable 
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
 2012-08-08 01:38:54 +00:00
Toshi MARUYAMA
a92ef237d3 Merged r10155 from trunk to 1.4-stable 
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
 2012-08-07 23:21:45 +00:00
Toshi MARUYAMA
a82a16378f Merged r10137 from trunk to 1.4-stable (#10320, #10818) 
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
 2012-07-31 08:47:21 +00:00
Toshi MARUYAMA
886daba641 Merged r10055 from trunk to 1.4-stable (#11448) 
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
 2012-07-20 10:12:18 +00:00
Toshi MARUYAMA
ab8dd5aa6e Backported r10005 from trunk to 1.4-stable (#11406, #11404) 
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
 2012-07-16 14:17:35 +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
Toshi MARUYAMA
1b0e717902 Merged r9911 from trunk to 1.4-stable (#11328) 
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
 2012-07-05 13:10:27 +00:00
Toshi MARUYAMA
53b8de5e39 Backport r9890 from trunk to 1.4-stable 
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
 2012-06-26 11:44:38 +00:00
Toshi MARUYAMA
34df573ec2 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/1.4-stable@9874 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-06-19 02:12:59 +00:00
Jean-Philippe Lang
e2f00792a8 Updates for 1.4.4 release. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9866 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-06-18 18:46:53 +00:00
Jean-Philippe Lang
9ed998af9b Merged r9861 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9863 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-06-18 18:35:50 +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
Toshi MARUYAMA
a3bf12ab9f Backport r9856 from trunk (#11186) 
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
 2012-06-18 03:49:29 +00:00
Toshi MARUYAMA
668981b8cd Merged r9853 from trunk (#10688) 
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
 2012-06-17 13:23:57 +00:00
Toshi MARUYAMA
b303dddbe3 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/1.4-stable@9852 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-06-17 10:53:30 +00:00
Jean-Philippe Lang
933e96116e Fix for Rails vulnerabilities CVE-2012-2694 and CVE-2012-2695. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9849 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-06-17 09:21:16 +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
b3b829c025 Merged r9831 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9844 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-06-17 08:57:15 +00:00
Jean-Philippe Lang
8cd0baf773 Merged r9822 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9842 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-06-17 08:54:12 +00:00
Jean-Philippe Lang
033aa68427 CHANGELOG updated. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9841 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-06-17 08:52:59 +00:00
Etienne Massip
1eb20d42bd Merged r9832 fro trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9833 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-06-14 21:09:00 +00:00
Toshi MARUYAMA
a9dbecd5a5 Backported r9817 from trunk (#11130) 
Simplified Chinese translation updated.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9821 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-06-11 07:30:25 +00:00
Toshi MARUYAMA
a13218e9f4 Backported r9816 from trunk (#11129) 
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
 2012-06-11 07:30:00 +00:00
Toshi MARUYAMA
57b0faf128 Backported r9815 from trunk (#11128) 
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
 2012-06-11 07:29:31 +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
69709a2513 CHANGELOG update. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9791 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-06-09 13:54:33 +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
Toshi MARUYAMA
64b0cb336d Merged r9777 from trunk (#11113) 
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
 2012-06-08 07:50:40 +00:00
Toshi MARUYAMA
79b7b32980 1.4-stable: scm: git: backport creating and updating test from trunk r9616 (#10830) 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9775 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-06-06 23:08:29 +00:00
Jean-Philippe Lang
1e1517e6ab Updates for 1.4.3 release. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9772 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-06-05 17:21:42 +00:00
Jean-Philippe Lang
70b0d5722b Rails CVE-2012-2660. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9767 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-06-03 20:08:23 +00:00
Jean-Philippe Lang
3883d5e2db Merged r9755 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9757 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-06-03 08:50:53 +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
b230429a61 Merged r9742 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9752 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-06-03 08:07:37 +00:00
Jean-Philippe Lang
a06462548c Updates for 1.4.2 release. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9692 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-05-13 19:09:35 +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
da293fdfd8 Merged #10837. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9676 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-05-12 12:59:23 +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