summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merged r16708 from trunk to 3.2-stable (#26261, #26263)Toshi MARUYAMA2017-06-261-2/+1
| | | | | | Simplified Chinese translation for 3.2-stable updated by Steven Wong. git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16717 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16676 (#26183).Jean-Philippe Lang2017-06-251-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16684 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16626 (#25212).Jean-Philippe Lang2017-06-071-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16633 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16622 to r16625 (#26055).Jean-Philippe Lang2017-06-073-18/+49
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16631 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16619 (#26072).Jean-Philippe Lang2017-06-072-1/+13
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16629 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16574 (#25760).Jean-Philippe Lang2017-06-063-6/+41
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16621 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16572 (#25861).Jean-Philippe Lang2017-06-063-1/+13
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16618 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16611 from trunk to 3.2-stable.Toshi MARUYAMA2017-06-061-0/+1
| | | | | | 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
* Merged r16568 (#25634).Jean-Philippe Lang2017-05-272-1/+18
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16571 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16557 (#25713).Jean-Philippe Lang2017-05-272-1/+23
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16567 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16556 (#25745).Jean-Philippe Lang2017-05-272-2/+29
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16565 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16554 and r16555 (#25653).Jean-Philippe Lang2017-05-271-4/+4
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16563 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16553 (#25829).Jean-Philippe Lang2017-05-271-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16561 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16546 from trunk to 3.2-stable (#25807)Toshi MARUYAMA2017-05-101-1/+1
| | | | | | 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
* Updates for 3.2.6 release.Jean-Philippe Lang2017-04-092-1/+24
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16534 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16520 (#22335, #24271).Jean-Philippe Lang2017-04-091-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16531 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16500 to r16503 (#25503).Jean-Philippe Lang2017-04-088-16/+104
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16524 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16504 (#25478).Jean-Philippe Lang2017-04-082-2/+16
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16522 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16515 and r16516 from trunk to 3.2-stableToshi MARUYAMA2017-04-071-1/+3
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16519 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16507 from trunk to 3.2-stable (#22335, #24271)Toshi MARUYAMA2017-04-061-1/+1
| | | | | | Gemfile: use rbpdf 1.19.0. git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16513 e93f8b46-1217-0410-a6f0-8f06a7374b81
* total_spent_hours not returned in 3.2 (#25526).Jean-Philippe Lang2017-04-061-1/+0
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16510 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16492 (#25526).Jean-Philippe Lang2017-04-051-0/+9
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16496 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16491 (#25526).Jean-Philippe Lang2017-04-051-3/+3
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16494 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16485 from trunk to 3.2-stable (#22335, #24271)Toshi MARUYAMA2017-04-051-1/+1
| | | | | | 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
* Merged r16470 from trunk to 3.2-stable (#25349, #25505)Toshi MARUYAMA2017-04-031-2/+1
| | | | | | 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
* Merged r16438 from trunk to 3.2-stable (#25204, #25458)Toshi MARUYAMA2017-03-291-3/+3
| | | | | | 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
* Merged r16433 from trunk to 3.2-stable (#25204, #25458)Toshi MARUYAMA2017-03-291-9/+8
| | | | | | 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
* Merged r16428 from trunk to 3.2-stable (#25371)Toshi MARUYAMA2017-03-241-1/+1
| | | | | | 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
* Merged r16422 from trunk to 3.2-stable (#25371)Toshi MARUYAMA2017-03-201-0/+3
| | | | | | Git 2.9 compatibility. git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16425 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16329 from trunk to 3.2-stable (#24999)Toshi MARUYAMA2017-02-051-40/+41
| | | | | | Mercurial 4.1 compatibility. git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16331 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16324 from trunk to 3.2-stable.Toshi MARUYAMA2017-02-021-0/+1
| | | | | | | | | | | | | | | | | | 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
* Backported r16293 (#24875).Jean-Philippe Lang2017-01-301-0/+31
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16309 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16292 (#20661).Jean-Philippe Lang2017-01-302-1/+6
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16308 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Test failure introduced in r16295 (#24199).Jean-Philippe Lang2017-01-301-2/+2
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16305 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16284 (#23803).Jean-Philippe Lang2017-01-291-1/+5
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16303 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16283 (#23793).Jean-Philippe Lang2017-01-293-1/+10
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16301 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16287 to r16289 (#24416).Jean-Philippe Lang2017-01-293-3/+25
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16299 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16286 (#24307).Jean-Philippe Lang2017-01-292-2/+28
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16297 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Backported r16285 (#24199).Jean-Philippe Lang2017-01-292-2/+2
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16295 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16227 (#24869).Jean-Philippe Lang2017-01-291-2/+2
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16291 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16277 from trunk to 3.2-stable (#24949, #24923)Toshi MARUYAMA2017-01-281-2/+1
| | | | | | 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
* Merged r16235 from trunk to 3.2-stable (#24751, #24886)Toshi MARUYAMA2017-01-201-2/+1
| | | | | | 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
* Merged r16212 from trunk to 3.2-stable (#24824)Toshi MARUYAMA2017-01-171-2/+1
| | | | | | 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
* Merged r16167 from trunk to 3.2-stable.Toshi MARUYAMA2017-01-091-2/+1
| | | | | | | | 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
* Merged r16092.Jean-Philippe Lang2017-01-071-2/+3
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16146 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Updates for 3.2.5 release.Jean-Philippe Lang2017-01-072-2/+17
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16144 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16138 (#14658).Jean-Philippe Lang2017-01-071-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16140 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16134 (#24283).Jean-Philippe Lang2017-01-041-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16136 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16118 to r16122 (#24693, #24718, #24722).Jean-Philippe Lang2017-01-0453-7/+165
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16133 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16114 (#24646).Jean-Philippe Lang2017-01-042-1/+13
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16131 e93f8b46-1217-0410-a6f0-8f06a7374b81