Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-08 06:15:59 +01:00
Code Issues Packages Projects Releases Activity
12,701 Commits 35 Branches 222 Tags
5e4f49c8ad1eb3154dca1995c833e47e901b6e24
Commit Graph

12701 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Philippe Lang
0c19c9394f Merged r16557 (#25713). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16566 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-05-27 07:40:13 +00:00
Jean-Philippe Lang
abf454c248 Merged r16556 (#25745). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16564 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-05-27 07:35:50 +00:00
Jean-Philippe Lang
996cb52bee Merged r16554 and r16555 (#25653). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16562 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-05-27 07:34:35 +00:00
Jean-Philippe Lang
d06d0b1c39 Merged r16553 (#25829). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16560 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-05-27 07:32:59 +00:00
Toshi MARUYAMA
0c9cf4d445 Merged r16546 from trunk to 3.3-stable (#25807) 
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
 2017-05-10 12:26:42 +00:00
Jean-Philippe Lang
aef65ffe63 Merged r16532. 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16533 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-04-09 08:28:38 +00:00
Jean-Philippe Lang
d47b673f9f Merged r16520 (#22335, #24271). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16530 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-04-09 08:14:53 +00:00
Jean-Philippe Lang
ec59ffc8f3 Merged r16500 to r16503 (#25503). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16523 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-04-08 07:45:20 +00:00
Jean-Philippe Lang
2af7d986d9 Merged r16504 (#25478). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16521 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-04-08 07:37:37 +00:00
Toshi MARUYAMA
f3821dcbda Merged r16515 and r16516 from trunk to 3.3-stable 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16518 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-04-07 08:23:07 +00:00
Toshi MARUYAMA
1770a9360d Merged r16507 from trunk to 3.3-stable (#22335, #24271) 
Gemfile: use rbpdf 1.19.0.

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16512 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-04-06 20:05:43 +00:00
Jean-Philippe Lang
50fc36ec44 Merged r16467 (#25501). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16505 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-04-06 17:11:49 +00:00
Jean-Philippe Lang
47f8339e47 Merged r16492 (#25526). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16495 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-04-05 16:12:45 +00:00
Jean-Philippe Lang
92292a56e9 Merged r16491 (#25526). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16493 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-04-05 16:11:56 +00:00
Toshi MARUYAMA
f637a4e4ce Merged r16485 from trunk to 3.3-stable (#22335, #24271) 
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
 2017-04-05 11:04:24 +00:00
Toshi MARUYAMA
9c2c354b46 Merged r16470 from trunk to 3.3-stable (#25349, #25505) 
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
 2017-04-03 16:41:00 +00:00
Toshi MARUYAMA
9ada14099a Russian translation for 3.3-stable updated by Ilya Potapov (#25397, #25502) 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16468 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-04-03 14:34:56 +00:00
Toshi MARUYAMA
196a0f17e6 Merged r16438 from trunk to 3.3-stable (#25204, #25458) 
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
 2017-03-29 06:10:35 +00:00
Toshi MARUYAMA
cba14bd6a7 3.3-stable: revert r16439. 
I mistook commit log.

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16441 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-03-29 06:10:24 +00:00
Toshi MARUYAMA
b1811c5478 Merged r16438 from trunk to 3.3-stable (#25204, #25459) 
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
 2017-03-29 05:50:01 +00:00
Toshi MARUYAMA
b748ebae8e Merged r16434 from trunk to 3.3-stable (#25204, #25459) 
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
 2017-03-29 05:20:30 +00:00
Toshi MARUYAMA
2352dad18e Merged r16433 from trunk to 3.3-stable (#25204, #25458) 
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
 2017-03-29 05:20:18 +00:00
Toshi MARUYAMA
648097cefe 3.3-stable: remove test/ui/custom_fields_test_ui.rb (#25455) 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16431 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-03-28 14:53:09 +00:00
Toshi MARUYAMA
d373a95c04 Merged r16428 from trunk to 3.3-stable (#25371) 
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
 2017-03-24 16:15:46 +00:00
Toshi MARUYAMA
dbc64d0b8e Merged r16422 from trunk to 3.3-stable (#25371) 
Git 2.9 compatibility.

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16424 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-03-20 18:03:42 +00:00
Jean-Philippe Lang
540237033e Merged r16341 (#25115). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16342 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-02-28 20:00:17 +00:00
Toshi MARUYAMA
ab0fa04b62 Merged r16329 from trunk to 3.3-stable (#24999) 
Mercurial 4.1 compatibility.

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16330 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-02-05 05:53:30 +00:00
Toshi MARUYAMA
b03982e1b7 Merged r16324 from trunk to 3.3-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.3-stable@16325 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-02-02 07:27:16 +00:00
Jean-Philippe Lang
cca51a8c51 Merged r16293 (#24875). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16307 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-30 17:42:54 +00:00
Jean-Philippe Lang
f37d1a5688 Merged r16292 (#20661). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16306 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-30 17:41:54 +00:00
Jean-Philippe Lang
4605381086 Merged r16284 (#23803). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16302 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-29 10:46:08 +00:00
Jean-Philippe Lang
ac7ebdc34a Merged r16283 (#23793). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16300 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-29 10:44:42 +00:00
Jean-Philippe Lang
e360394be7 Merged r16287 to r16289 (#24416). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16298 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-29 10:42:50 +00:00
Jean-Philippe Lang
b92d7879ff Merged r16286 (#24307). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16296 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-29 10:41:25 +00:00
Jean-Philippe Lang
46e11396b8 Merged r16285 (#24199). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16294 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-29 10:39:34 +00:00
Jean-Philippe Lang
730f1c3071 Merged r16227 (#24869). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16290 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-29 10:25:29 +00:00
Toshi MARUYAMA
643470664c Merged r16277 from trunk to 3.3-stable (#24949, #24923) 
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
 2017-01-28 14:32:08 +00:00
Toshi MARUYAMA
3c4028d711 Merged r16027 from trunk to 3.3-stable (#24948, #24400) 
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
 2017-01-28 12:59:35 +00:00
Toshi MARUYAMA
24999b203e Merged r16235 from trunk to 3.3-stable (#24751, #24886) 
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
 2017-01-20 14:00:19 +00:00
Toshi MARUYAMA
3c6df7d8aa Merged r16034 from trunk to 3.3-stable (#24512, #24885) 
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
 2017-01-20 12:14:11 +00:00
Toshi MARUYAMA
7512879c9e Merged r16212 from trunk to 3.3-stable (#24824) 
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
 2017-01-17 05:25:30 +00:00
Toshi MARUYAMA
cb8aaf1974 Merged r16167 from trunk to 3.3-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.3-stable@16168 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-09 16:40:13 +00:00
Toshi MARUYAMA
f905ee347b Merged r16157 from trunk to 3.3-stable (#24537, #24778) 
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
 2017-01-08 04:45:50 +00:00
Jean-Philippe Lang
d4dcd3a8dc Merged r16092. 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16145 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-07 08:40:28 +00:00
Jean-Philippe Lang
2551d68c1f Merged r16142 (3.3.2 release). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16143 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-07 08:37:58 +00:00
Jean-Philippe Lang
4ad24a2250 Merged r16138 (#14658). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16139 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-07 07:51:52 +00:00
Jean-Philippe Lang
01e985eb0a Merged r16134 (#24283). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16135 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-04 20:56:22 +00:00
Jean-Philippe Lang
c4b1ab644e Merged r16118 to r16122 (#24693, #24718, #24722). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16132 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-04 20:47:29 +00:00
Jean-Philippe Lang
82a67f4ebe Merged r16114 (#24646). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16130 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-04 19:52:47 +00:00
Jean-Philippe Lang
7ec2c27385 Merged r16116 (#22034). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16128 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-04 18:09:00 +00:00