Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-03-25 22:00:43 +01:00
Code Issues Packages Projects Releases Activity
12,285 Commits 35 Branches 228 Tags
9102a78baef89bfcd1e6028cb1dbadeb16eb99f9
Commit Graph

12285 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Philippe Lang
9102a78bae Merged r16626 (#25212). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16633 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-06-07 19:36:48 +00:00
Jean-Philippe Lang
93d78771c6 Merged r16622 to r16625 (#26055). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16631 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-06-07 19:35:35 +00:00
Jean-Philippe Lang
e9a7d1be63 Merged r16619 (#26072). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16629 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-06-07 19:34:01 +00:00
Jean-Philippe Lang
3bb7524c1f Merged r16574 (#25760). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16621 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-06-06 21:17:16 +00:00
Jean-Philippe Lang
ba4744d4c4 Merged r16572 (#25861). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16618 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-06-06 20:56:47 +00:00
Toshi MARUYAMA
433e887170 Merged r16611 from trunk to 3.2-stable. 
Gemfile: ping roadie version 3.2 to prevent decadency failure on CI server Ruby 2.1.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16614 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-06-06 05:16:49 +00:00
Jean-Philippe Lang
c2e613981a Merged r16568 (#25634). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16571 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-05-27 08:36:13 +00:00
Jean-Philippe Lang
d54ede781b Merged r16557 (#25713). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16567 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-05-27 07:40:24 +00:00
Jean-Philippe Lang
313706276c Merged r16556 (#25745). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16565 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-05-27 07:36:01 +00:00
Jean-Philippe Lang
4150200fec Merged r16554 and r16555 (#25653). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16563 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-05-27 07:34:42 +00:00
Jean-Philippe Lang
93b08e8044 Merged r16553 (#25829). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16561 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-05-27 07:33:09 +00:00
Toshi MARUYAMA
837bc019df Merged r16546 from trunk to 3.2-stable (#25807) 
Gemfile: pin roadie-rails version 1.1.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16548 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-05-10 12:27:57 +00:00
Jean-Philippe Lang
7ca976e0c9 Updates for 3.2.6 release. 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16534 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-04-09 08:30:16 +00:00
Jean-Philippe Lang
559ce11996 Merged r16520 (#22335, #24271). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16531 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-04-09 08:15:02 +00:00
Jean-Philippe Lang
b64f8b4de9 Merged r16500 to r16503 (#25503). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16524 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-04-08 07:47:09 +00:00
Jean-Philippe Lang
ffd1ebda98 Merged r16504 (#25478). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16522 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-04-08 07:39:30 +00:00
Toshi MARUYAMA
0ffeec672c Merged r16515 and r16516 from trunk to 3.2-stable 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16519 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-04-07 08:24:47 +00:00
Toshi MARUYAMA
85a3c9646d Merged r16507 from trunk to 3.2-stable (#22335, #24271) 
Gemfile: use rbpdf 1.19.0.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16513 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-04-06 20:07:00 +00:00
Jean-Philippe Lang
e92f3127e4 total_spent_hours not returned in 3.2 (#25526). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16510 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-04-06 18:07:54 +00:00
Jean-Philippe Lang
c66898259c Merged r16492 (#25526). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16496 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-04-05 16:12:51 +00:00
Jean-Philippe Lang
9b2f70f4f1 Merged r16491 (#25526). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16494 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-04-05 16:12:04 +00:00
Toshi MARUYAMA
c260cd89bb Merged r16485 from trunk to 3.2-stable (#22335, #24271) 
Gemfile: explicitly use rbpdf 1.19.1.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16487 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-04-05 11:05:40 +00:00
Toshi MARUYAMA
39af7eb11e Merged r16470 from trunk to 3.2-stable (#25349, #25505) 
Russian translation for 3.2-stable updated by Kirill Bezrukov.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16472 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-04-03 16:44:15 +00:00
Toshi MARUYAMA
364e0201fd Merged r16438 from trunk to 3.2-stable (#25204, #25458) 
Portuguese translation for 3.2-stable updated by Rui Rebelo.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16440 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-03-29 05:56:03 +00:00
Toshi MARUYAMA
bf63602382 Merged r16433 from trunk to 3.2-stable (#25204, #25458) 
Portuguese translation for 3.2-stable updated by Rui Rebelo.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16437 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-03-29 05:24:19 +00:00
Toshi MARUYAMA
7aa98f8187 Merged r16428 from trunk to 3.2-stable (#25371) 
git: use '--no-renames' option in 'show' command.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16430 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-03-24 16:18:29 +00:00
Toshi MARUYAMA
e87c3a09bd Merged r16422 from trunk to 3.2-stable (#25371) 
Git 2.9 compatibility.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16425 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-03-20 18:05:10 +00:00
Toshi MARUYAMA
b8ab16b448 Merged r16329 from trunk to 3.2-stable (#24999) 
Mercurial 4.1 compatibility.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16331 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-02-05 05:55:03 +00:00
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