Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-17 18:50:53 +01:00
Code Issues Packages Projects Releases Activity
12,670 Commits 35 Branches 222 Tags
f02e841bf03b51f77eec175e417ce0c2f8a5d03e
Commit Graph

12670 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Toshi MARUYAMA
f2581bbbc4 Merged r16964 from trunk to 3.3-stable (#26703, #27006) 
German translation for 3.3-stable updated by Peter Pfläging.

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16970 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-09-15 05:01:48 +00:00
Toshi MARUYAMA
995a0111e9 Merged r16957 from trunk to 3.3-stable (#26599) 
fix file name corruption when export a wiki page with non-ASCII title in MS browsers.

Contributed by Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16960 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-08-30 16:39:41 +00:00
Toshi MARUYAMA
2ede29186c Merged r16938 from trunk to 3.3-stable (#22320) 
try IssueTest#test_overdue failing on CI server at Japanese daytime.

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16952 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-08-09 06:38:04 +00:00
Toshi MARUYAMA
d48d0b6cf1 Merged r16948 from trunk to 3.3-stable (#26645) 
git: remove "--no-color" option from "git --version" for git 2.14 compatibility.

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16950 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-08-08 06:24:05 +00:00
Jean-Philippe Lang
988402f8c8 Merged r16926. 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16928 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-07-30 17:10:53 +00:00
Jean-Philippe Lang
5938d080d1 Updates for 3.3.4 release. 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16746 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-07-02 11:55:40 +00:00
Jean-Philippe Lang
99095a7c41 Fix changelog markup (#25616). 
Patch by Mischa The Evil.

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16742 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-07-02 11:51:38 +00:00
Toshi MARUYAMA
73db9ce495 Merged r16709 from trunk to 3.3-stable (#26261, #26264) 
Simplified Chinese translation for 3.3-stable updated by Steven Wong.

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16716 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-06-26 13:08:40 +00:00
Toshi MARUYAMA
78373f0131 Merged r16708 from trunk to 3.3-stable (#26261, #26263) 
Simplified Chinese translation for 3.2-stable updated by Steven Wong.

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16715 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-06-26 13:08:29 +00:00
Jean-Philippe Lang
9365fd97ef Merged r16676 (#26183). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16683 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-06-25 08:37:04 +00:00
Jean-Philippe Lang
ba9909aa5d Merged r16627 (#25064). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16634 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-06-07 19:37:29 +00:00
Jean-Philippe Lang
2db8fbb33c Merged r16626 (#25212). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16632 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-06-07 19:36:40 +00:00
Jean-Philippe Lang
49108983cb Merged r16622 to r16625 (#26055). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16630 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-06-07 19:35:27 +00:00
Jean-Philippe Lang
635daf888a Merged r16619 (#26072). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16628 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-06-07 19:33:15 +00:00
Jean-Philippe Lang
f561ffd5e9 Merged r16574 (#25760). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16620 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-06-06 21:17:08 +00:00
Jean-Philippe Lang
a594c377a6 Merged r16572 (#25861). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16617 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-06-06 20:56:38 +00:00
Jean-Philippe Lang
b02b7369a0 Merged r16569 (#25791). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16616 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-06-06 20:54:14 +00:00
Toshi MARUYAMA
c07a140f61 Merged r16611 from trunk to 3.3-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.3-stable@16613 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-06-06 05:15:16 +00:00
Jean-Philippe Lang
e24ba3b907 Merged r16568 (#25634). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16570 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-05-27 08:36:05 +00:00
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