summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Merged r16553 (#25829).Jean-Philippe Lang2017-05-271-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16560 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16546 from trunk to 3.3-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.3-stable@16547 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16532.Jean-Philippe Lang2017-04-092-1/+27
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16533 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.3-stable@16530 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.3-stable@16523 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.3-stable@16521 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16515 and r16516 from trunk to 3.3-stableToshi MARUYAMA2017-04-071-1/+3
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16518 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16507 from trunk to 3.3-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.3-stable@16512 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16467 (#25501).Jean-Philippe Lang2017-04-064-13/+27
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16505 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.3-stable@16495 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.3-stable@16493 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16485 from trunk to 3.3-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.3-stable@16486 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16470 from trunk to 3.3-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.3-stable@16471 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Russian translation for 3.3-stable updated by Ilya Potapov (#25397, #25502)Toshi MARUYAMA2017-04-031-2/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16468 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16438 from trunk to 3.3-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.3-stable@16442 e93f8b46-1217-0410-a6f0-8f06a7374b81
* 3.3-stable: revert r16439.Toshi MARUYAMA2017-03-291-3/+3
| | | | | | I mistook commit log. git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16441 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16438 from trunk to 3.3-stable (#25204, #25459)Toshi MARUYAMA2017-03-291-3/+3
| | | | | | Portuguese translation for 3.3-stable updated by Rui Rebelo. git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16439 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16434 from trunk to 3.3-stable (#25204, #25459)Toshi MARUYAMA2017-03-291-24/+20
| | | | | | Portuguese translation for 3.3-stable updated by Rui Rebelo. git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16436 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16433 from trunk to 3.3-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.3-stable@16435 e93f8b46-1217-0410-a6f0-8f06a7374b81
* 3.3-stable: remove test/ui/custom_fields_test_ui.rb (#25455)Toshi MARUYAMA2017-03-281-38/+0
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16431 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16428 from trunk to 3.3-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.3-stable@16429 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16422 from trunk to 3.3-stable (#25371)Toshi MARUYAMA2017-03-201-0/+3
| | | | | | Git 2.9 compatibility. git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16424 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16341 (#25115).Jean-Philippe Lang2017-02-283-4/+20
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16342 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16329 from trunk to 3.3-stable (#24999)Toshi MARUYAMA2017-02-051-40/+41
| | | | | | Mercurial 4.1 compatibility. git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16330 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16324 from trunk to 3.3-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.3-stable@16325 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16293 (#24875).Jean-Philippe Lang2017-01-301-0/+33
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16307 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.3-stable@16306 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.3-stable@16302 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.3-stable@16300 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.3-stable@16298 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.3-stable@16296 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16285 (#24199).Jean-Philippe Lang2017-01-292-2/+2
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16294 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.3-stable@16290 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16277 from trunk to 3.3-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.3-stable@16278 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16027 from trunk to 3.3-stable (#24948, #24400)Toshi MARUYAMA2017-01-281-2/+1
| | | | | | Bulgarian translation for 3.3-stable updated by Ivan Cenov. git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16276 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16235 from trunk to 3.3-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.3-stable@16237 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16034 from trunk to 3.3-stable (#24512, #24885)Toshi MARUYAMA2017-01-201-2/+1
| | | | | | Japanese translation for 3.3-stable updated by Go MAEDA git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16234 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16212 from trunk to 3.3-stable (#24824)Toshi MARUYAMA2017-01-171-2/+1
| | | | | | Traditional Chinese translation for trunk updated by ChunChang Lo. git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16214 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16167 from trunk to 3.3-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.3-stable@16168 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16157 from trunk to 3.3-stable (#24537, #24778)Toshi MARUYAMA2017-01-081-7/+5
| | | | | | Czech translation for 3.3-stable updated by Karel Pičman. git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16158 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16092.Jean-Philippe Lang2017-01-071-2/+3
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16145 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16142 (3.3.2 release).Jean-Philippe Lang2017-01-072-2/+27
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16143 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.3-stable@16139 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.3-stable@16135 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.3-stable@16132 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.3-stable@16130 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16116 (#22034).Jean-Philippe Lang2017-01-045-16/+52
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16128 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16125.Jean-Philippe Lang2017-01-041-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16126 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16059, r16060, r16064, r16072.Jean-Philippe Lang2016-12-2029-50/+75
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16106 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Fix test in 3.3-stable (#14817).Jean-Philippe Lang2016-12-201-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16104 e93f8b46-1217-0410-a6f0-8f06a7374b81