Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-01-29 19:00:04 +01:00
Code Issues Packages Projects Releases Activity
12,257 Commits 35 Branches 225 Tags
e2ff2687f83d028682e9d448a1ac35ef800b31cd
Commit Graph

12257 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Toshi MARUYAMA
e2ff2687f8 Merged r16324 from trunk to 3.2-stable. 
Gemfile: pin i18n version 0.7.0.

i18n 0.8.0 causes error.

<pre>
Redmine::I18nTest#test_languages_options_should_ignore_locales_without_general_lang_name_key:
I18n::InvalidLocale: "foo" is not a valid locale
    lib/redmine/i18n.rb:58:in `ll'
    lib/redmine/i18n.rb:122:in `block in languages_options'
    lib/redmine/i18n.rb:122:in `map'
    lib/redmine/i18n.rb:122:in `languages_options'
    test/unit/lib/redmine/i18n_test.rb:203:in `test_languages_options_should_ignore_locales_without_general_lang_name_key'
</pre>

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16326 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-02-02 07:28:56 +00:00
Jean-Philippe Lang
1efe3eb3a1 Backported r16293 (#24875). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16309 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-30 17:54:08 +00:00
Jean-Philippe Lang
0f9966aadf Merged r16292 (#20661). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16308 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-30 17:47:39 +00:00
Jean-Philippe Lang
b67a46302f Test failure introduced in r16295 (#24199). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16305 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-30 17:36:49 +00:00
Jean-Philippe Lang
0807506e18 Merged r16284 (#23803). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16303 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-29 10:46:15 +00:00
Jean-Philippe Lang
a5d45534b8 Merged r16283 (#23793). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16301 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-29 10:44:51 +00:00
Jean-Philippe Lang
a170c3d93c Merged r16287 to r16289 (#24416). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16299 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-29 10:42:58 +00:00
Jean-Philippe Lang
83921f27d4 Merged r16286 (#24307). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16297 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-29 10:41:33 +00:00
Jean-Philippe Lang
2e6d3f447b Backported r16285 (#24199). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16295 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-29 10:39:50 +00:00
Jean-Philippe Lang
c717698803 Merged r16227 (#24869). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16291 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-29 10:25:36 +00:00
Toshi MARUYAMA
c7a280c84d Merged r16277 from trunk to 3.2-stable (#24949, #24923) 
Bulgarian translation for 3.2-stable updated by Ivan Cenov.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16279 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-28 14:33:46 +00:00
Toshi MARUYAMA
dde8d08f18 Merged r16235 from trunk to 3.2-stable (#24751, #24886) 
Japanese translation for 3.2-stable updated by Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16238 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-20 14:01:16 +00:00
Toshi MARUYAMA
1efe02179d Merged r16212 from trunk to 3.2-stable (#24824) 
Traditional Chinese translation for 3.2-stable updated by ChunChang Lo.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16215 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-17 05:30:45 +00:00
Toshi MARUYAMA
1751ad63a7 Merged r16167 from trunk to 3.2-stable. 
Gemfile: pin nokogiri version 1.6.

nokogiri 1.7.0.1 requires Ruby version >= 2.1.0.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16169 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-09 16:42:20 +00:00
Jean-Philippe Lang
fcdb810ebf Merged r16092. 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16146 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-07 08:40:49 +00:00
Jean-Philippe Lang
0e939c5bb1 Updates for 3.2.5 release. 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16144 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-07 08:39:03 +00:00
Jean-Philippe Lang
a84e1a847f Merged r16138 (#14658). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16140 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-07 07:52:30 +00:00
Jean-Philippe Lang
9c32a640c6 Merged r16134 (#24283). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16136 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-04 20:56:28 +00:00
Jean-Philippe Lang
47d2775977 Merged r16118 to r16122 (#24693, #24718, #24722). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16133 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-04 20:50:27 +00:00
Jean-Philippe Lang
66f6d8a633 Merged r16114 (#24646). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16131 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-04 19:52:54 +00:00
Jean-Philippe Lang
5e9e640381 Merged r16116 (#22034). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16129 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-04 19:48:11 +00:00
Jean-Philippe Lang
01ab1edebe Merged r16125. 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16127 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-04 18:00:43 +00:00
Jean-Philippe Lang
c2eb894f67 Merged r16059, r16060, r16064, r16072. 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16107 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-12-20 16:09:28 +00:00
Jean-Philippe Lang
c5697e01e4 Fix test in 3.2-stable (#14817). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16105 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-12-20 15:49:23 +00:00
Jean-Philippe Lang
0453c56b22 Merged r16071 (#24595). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16100 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-12-20 09:05:31 +00:00
Jean-Philippe Lang
e2b3fcabde Merged r16056 (#14817). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16098 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-12-20 09:02:14 +00:00
Jean-Philippe Lang
1da051e1bd Merged r16057 (#13622). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16096 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-12-20 09:01:08 +00:00
Jean-Philippe Lang
61db44c211 Merged r16049 (#24156). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16094 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-12-20 08:59:58 +00:00
Jean-Philippe Lang
98787ce42c Merged r15958 (#24296). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16006 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-11-26 09:05:57 +00:00
Jean-Philippe Lang
4f88881427 Merged r15989 and r15991 (#24283). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16004 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-11-26 09:04:49 +00:00
Jean-Philippe Lang
c97a9488a2 Merged r15950 (#24348). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16002 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-11-26 09:02:52 +00:00
Jean-Philippe Lang
35dff9428f Merged r15955 and r15956 (#24297). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16000 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-11-26 09:01:20 +00:00
Toshi MARUYAMA
df3ed1da95 Gemfile: merge r15915, r15916, r15944, and r15945 from trunk to 3.2-stable (#24092) 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15947 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-11-05 18:10:41 +00:00
Jean-Philippe Lang
f5bcd05c44 Updates for 3.2.4. 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15900 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-10-10 07:46:12 +00:00
Jean-Philippe Lang
512f89c4fc Merged r15849 (#23883). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15874 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-10-02 10:20:19 +00:00
Jean-Philippe Lang
2e9009b820 Merged r15848 (#23764). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15871 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-10-02 10:19:12 +00:00
Jean-Philippe Lang
b5fddf0950 Merged r15846 (#23841). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15868 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-10-02 10:12:56 +00:00
Jean-Philippe Lang
10ac3a9c8b Merged r15852 and r15863 (#23839). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15865 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-10-02 10:10:11 +00:00
Jean-Philippe Lang
9a092547fb Merged r15843 (#23829). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15845 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-10-01 07:16:23 +00:00
Toshi MARUYAMA
73537b8913 Merged r15827 from trunk to 3.2-stable (#23387) 
Traditional Chinese "issue" translation change.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15834 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-09-08 15:15:35 +00:00
Toshi MARUYAMA
47c1e77209 Merged r15826 from trunk to 3.2-stable (#23387) 
Traditional Chinese textile and markdown detailed help translation for 3.2-stable by ChunChang Lo.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15833 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-09-08 15:15:24 +00:00
Toshi MARUYAMA
cf6d2ba3b7 Merged r15825 from trunk to 3.2-stable (#23387) 
Traditional Chinese textile and markdown detailed help translation for 3.1-stable by ChunChang Lo.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15832 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-09-08 15:15:13 +00:00
Jean-Philippe Lang
8b60a4ba06 Merged r15820 (#23758). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15822 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-09-05 17:16:21 +00:00
Jean-Philippe Lang
5597bf52a0 Merged r15816 (#23758). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15818 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-09-04 17:12:11 +00:00
Toshi MARUYAMA
99b7723f57 Merged r15800 from trunk to 3.2-stable (#23388, #23744) 
German translation for 3.1-stable updated by JW Fuchs.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15808 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-09-01 18:36:24 +00:00
Toshi MARUYAMA
6fcd360fd3 Merged r15791 from trunk to 3.2-stable (#23497, #23737) 
Russian translation for 3.2-stable updated by Alexander Ryabinovskiy.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15797 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-09-01 10:34:23 +00:00
Toshi MARUYAMA
1bdb1a5e05 Merged r15786 from trunk to 3.2-stable (#23497, #23736) 
Russian translation for 3.1-stable updated by Alexander Ryabinovskiy.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15789 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-09-01 04:31:56 +00:00
Jean-Philippe Lang
f5fc816e48 Merged r15781 (#23708). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15783 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-08-31 17:14:36 +00:00
Jean-Philippe Lang
b7444219a7 Merged r15778 (#23389). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15780 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-08-31 17:12:19 +00:00
Jean-Philippe Lang
09cfa67f67 Merged r15750 (#23655). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15766 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-08-31 16:52:01 +00:00