source.dussan.org Git - redmine.git/log

Jean-Philippe Lang [Sat, 19 Dec 2015 08:14:48 +0000 (08:14 +0000)]

Merged r14967 to r14969 (#21488).

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14983 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 19 Dec 2015 08:02:31 +0000 (08:02 +0000)]

Merged r14970 to r14972 (#21477).

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14981 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 19 Dec 2015 07:59:13 +0000 (07:59 +0000)]

Merged r14973 (#21219).

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14979 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 5 Dec 2015 08:43:33 +0000 (08:43 +0000)]

Updates for 3.1.3 release.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14938 e93f8b46-1217-0410-a6f0-8f06a7374b81

Merged r14928 from trunk to 3.1-stable (#21412)

Simplified Chinese translation for 3.1-stable updated by Hang Xie.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14934 e93f8b46-1217-0410-a6f0-8f06a7374b81

Merged r14927 from trunk to 3.1-stable (#21412, #21431)

Simplified Chinese translation for 3.0-stable updated by Hang Xie.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14933 e93f8b46-1217-0410-a6f0-8f06a7374b81

Merged r14926 from trunk to 3.1-stable (#21412, #21430)

Simplified Chinese translation for 2.6-stable updated by Hang Xie.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14932 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Fri, 4 Dec 2015 12:51:57 +0000 (12:51 +0000)]

Merged r14913 (#21419).

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14921 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Fri, 4 Dec 2015 12:49:03 +0000 (12:49 +0000)]

Merged r14892 (#21312).

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14917 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Fri, 4 Dec 2015 12:46:25 +0000 (12:46 +0000)]

Merged r14883 (#16948).

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14914 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Mon, 30 Nov 2015 13:08:12 +0000 (13:08 +0000)]

3.1-stable: backport appveyor.yml

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14906 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Wed, 25 Nov 2015 07:41:52 +0000 (07:41 +0000)]

Merged r14888 from trunk to 3.1-stable (#21328)

pdf: fix Vietnamese Italic is not shown.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14889 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Wed, 25 Nov 2015 04:25:18 +0000 (04:25 +0000)]

Merged r14884 from trunk to 3.1-stable.

update Rails to 4.2.5.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14885 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 14 Nov 2015 08:52:07 +0000 (08:52 +0000)]

Merged r14870.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14871 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Wed, 11 Nov 2015 07:35:03 +0000 (07:35 +0000)]

Merged r14863 (#6969).

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14864 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Wed, 11 Nov 2015 07:22:21 +0000 (07:22 +0000)]

Merged r14856 (#21155).

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14860 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sun, 8 Nov 2015 09:05:46 +0000 (09:05 +0000)]

Merged r14794 (#21136).

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14841 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sun, 8 Nov 2015 08:54:15 +0000 (08:54 +0000)]

Merged r14795 and r14796 (#21150).

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14837 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sun, 8 Nov 2015 08:50:21 +0000 (08:50 +0000)]

Merged r14812 (#6969).

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14834 e93f8b46-1217-0410-a6f0-8f06a7374b81

Merged r14813 from trunk to 3.1-stable (#20591, #20811)

update rbpdf version to 1.18.7.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14814 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 7 Nov 2015 08:21:57 +0000 (08:21 +0000)]

Merged r14753 (#21085).

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14807 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 7 Nov 2015 08:21:13 +0000 (08:21 +0000)]

Merged r14754 (#21076).

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14806 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 7 Nov 2015 08:20:26 +0000 (08:20 +0000)]

Merged r14728 (#20906).

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14805 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 7 Nov 2015 08:19:40 +0000 (08:19 +0000)]

Merged r14671 (#20992).

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14804 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 7 Nov 2015 08:18:10 +0000 (08:18 +0000)]

Merged r14758 (#21071).

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14802 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 7 Nov 2015 08:10:23 +0000 (08:10 +0000)]

Merged r14670 (#20677).

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14799 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Sat, 31 Oct 2015 12:04:05 +0000 (12:04 +0000)]

Merged r14777 from trunk to 3.1-stable (#21019, #20791)

Traditional Chinese translation for 3.1-stable changed by ChunChang Lo.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14780 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Thu, 29 Oct 2015 16:40:48 +0000 (16:40 +0000)]

Merged r14761 from trunk to 3.1-stable (#20911, #21105)

Japanese wiki_syntax_detailed_textile.html translation for 3.0-stable updated by Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14762 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Thu, 29 Oct 2015 12:37:03 +0000 (12:37 +0000)]

Merged r14755 from trunk to 3.1-stable (#20892)

Spanish and Spanish Panama translation updated by Leonel Iturralde.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14757 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Sat, 24 Oct 2015 11:18:05 +0000 (11:18 +0000)]

Merged r14740 from trunk to 3.1-stable (#20837)

Bulgarian translation for 3.1-stable updated by Ivan Cenov.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14741 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Tue, 20 Oct 2015 12:00:02 +0000 (12:00 +0000)]

Merged r14700 from trunk to 3.1-stable (#20785)

Polish translation for 3.1-stable updated by Sebastian Paluch.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14703 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Tue, 20 Oct 2015 11:59:51 +0000 (11:59 +0000)]

Merged r14699 from trunk to 3.1-stable (#20785, #21031)

Polish translation for 3.0-stable updated by Sebastian Paluch.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14702 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Tue, 20 Oct 2015 11:59:41 +0000 (11:59 +0000)]

Merged r14698 from trunk to 3.1-stable (#20785, #21030)

Polish translation for 2.6-stable updated by Sebastian Paluch.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14701 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Tue, 20 Oct 2015 10:45:14 +0000 (10:45 +0000)]

Merged r14696 from trunk to 3.1-stable (#20791)

Traditional Chinese translation updated by ChunChang Lo.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14697 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Fri, 9 Oct 2015 07:36:25 +0000 (07:36 +0000)]

Merged r14662 (#20730).

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14663 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Fri, 9 Oct 2015 07:21:14 +0000 (07:21 +0000)]

Merged r14658 (#20380).

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14659 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Fri, 9 Oct 2015 07:06:18 +0000 (07:06 +0000)]

Merged r14654 (#20380).

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14655 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Fri, 9 Oct 2015 06:41:39 +0000 (06:41 +0000)]

Merged r14618 (#20360).

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14651 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Fri, 9 Oct 2015 06:36:58 +0000 (06:36 +0000)]

Merged r14619 (#20282).

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14649 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sun, 20 Sep 2015 06:18:15 +0000 (06:18 +0000)]

Merged r14606.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14607 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 19 Sep 2015 07:31:55 +0000 (07:31 +0000)]

Merged r14602 (#20733).

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14603 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Wed, 16 Sep 2015 10:49:18 +0000 (10:49 +0000)]

Merged r14598 from trunk to 3.1-stable (#20761)

fix typo of Japanese translation for notice_gantt_chart_truncated.

Contributed by Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14599 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Wed, 16 Sep 2015 05:49:06 +0000 (05:49 +0000)]

Merged r14584 from trunk to 3.1-stable (#20731)

Japanese "spent time" translation changed by Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14597 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Wed, 16 Sep 2015 03:52:20 +0000 (03:52 +0000)]

Merged r14405 from trunk to 3.1-stable (#11253, #20456)

Don't display estimated hours when nil and total is 0.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14596 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Mon, 14 Sep 2015 14:08:37 +0000 (14:08 +0000)]

Merged r14588 from trunk to 3.1-stable (#20728, #20747)

Portuguese translation for 3.1-stable updated by Rui Rebelo.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14592 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Mon, 14 Sep 2015 14:08:26 +0000 (14:08 +0000)]

Merged r14587 from trunk to 3.1-stable (#20728, #20746)

Portuguese translation for 3.0-stable updated by Rui Rebelo.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14591 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Mon, 14 Sep 2015 14:08:15 +0000 (14:08 +0000)]

Merged r14586 from trunk to 3.1-stable (#20728, #20745)

Portuguese translation for 2.6-stable updated by Rui Rebelo.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14590 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Mon, 14 Sep 2015 10:14:55 +0000 (10:14 +0000)]

Merged r14582 from trunk to 3.1-stable (#20729)

Japanese translation updated by Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14583 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Mon, 14 Sep 2015 06:09:51 +0000 (06:09 +0000)]

3.1-stable: fix Czech textile ol example (#20452)

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14572 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sun, 13 Sep 2015 14:50:32 +0000 (14:50 +0000)]

Merged r14480 (#20735).

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14565 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sun, 13 Sep 2015 14:43:50 +0000 (14:43 +0000)]

Merged r14560 and r14561 (#19577).

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14562 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 12 Sep 2015 14:54:37 +0000 (14:54 +0000)]

Adds translation strings (#20688).

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14559 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 12 Sep 2015 14:53:28 +0000 (14:53 +0000)]

Merged r14554 (#20688).

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14558 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 12 Sep 2015 12:48:51 +0000 (12:48 +0000)]

Merged r14508 (#20512).

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14556 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 12 Sep 2015 12:31:21 +0000 (12:31 +0000)]

Merged r14552 (#20633).

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14553 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 12 Sep 2015 11:12:18 +0000 (11:12 +0000)]

Merged r14550 (#20490).

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14551 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 12 Sep 2015 10:58:28 +0000 (10:58 +0000)]

Merged r14499 (#20454).

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14548 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 12 Sep 2015 10:54:45 +0000 (10:54 +0000)]

Merged r14472 (#20427).

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14546 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 12 Sep 2015 10:53:22 +0000 (10:53 +0000)]

Merged r14475 (#20407).

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14545 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 12 Sep 2015 10:52:37 +0000 (10:52 +0000)]

Merged r14474 (#20401).

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14544 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 12 Sep 2015 10:51:25 +0000 (10:51 +0000)]

Merged r14473 (#20278).

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14543 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Mon, 31 Aug 2015 07:20:29 +0000 (07:20 +0000)]

3.1-stable: revert r14300 (#16535, #20466)

Set a max width to html email content.

Patch by Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14539 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Mon, 31 Aug 2015 05:22:59 +0000 (05:22 +0000)]

Merged r14413 from trunk to 3.1-stable (#20243, #20456)

Use https links instead of http links in ApplicationHelper#avatar_edit_link and Redmine::Info class methods.

Patch by Mischa The Evil.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14538 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Mon, 31 Aug 2015 03:38:55 +0000 (03:38 +0000)]

Merged r14410 from trunk to 3.1-stable (#11253, #20456)

Asserts that spent time is preloaded.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14537 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Mon, 31 Aug 2015 03:38:44 +0000 (03:38 +0000)]

Merged r14409 from trunk to 3.1-stable (#11253, #20456)

Fixes methods comments.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14536 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Mon, 31 Aug 2015 03:38:34 +0000 (03:38 +0000)]

Merged r14408 from trunk to 3.1-stable (#11253, #20456)

Limit queries to given issues only.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14535 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Mon, 31 Aug 2015 03:38:23 +0000 (03:38 +0000)]

Merged r14407 from trunk to 3.1-stable (#11253, #20456)

Preload total spent time on the issue list with 1 query.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14534 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Mon, 31 Aug 2015 03:38:12 +0000 (03:38 +0000)]

Merged r14406 from trunk to 3.1-stable (#11253, #20456)

Adds "Total spent hours" column available on the issue list.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14533 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Sun, 30 Aug 2015 05:05:49 +0000 (05:05 +0000)]

Merged r14416 and r14530 from trunk to 3.1-stable

travis: add PostgreSQL environments

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14531 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Sat, 29 Aug 2015 23:18:40 +0000 (23:18 +0000)]

Merged r14525 from trunk to 3.1-stable

travis: allow test failures on MySQL 5.7

<pre>
ActiveRecord::StatementInvalid: Mysql2::Error:
Table 'performance_schema.session_variables' doesn't exist:
SHOW VARIABLES LIKE 'character_set_database'
</pre>

Refer:

* https://github.com/rails/rails/issues/21108
* https://github.com/rails/rails/pull/21318

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14526 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Sat, 29 Aug 2015 09:53:49 +0000 (09:53 +0000)]

Merged r14521 from trunk to 3.1-stable

Gemfile: update Rails to 4.2.4

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14524 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Sat, 29 Aug 2015 07:21:52 +0000 (07:21 +0000)]

Merged r14415 and r14522 from trunk to 3.1-stable (#20251)

travis: allow ui test failure.

Refer:
https://github.com/travis-ci/travis-ci/issues/3225

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14523 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Tue, 18 Aug 2015 15:09:29 +0000 (15:09 +0000)]

Merged r14517 from trunk to 3.1-stable (#20452)

Czech translation updated by Karel Pičman.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14518 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Tue, 18 Aug 2015 14:54:12 +0000 (14:54 +0000)]

3.1-stable: Czech wiki help translation updated by Karel Pičman (#20452)

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14516 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Tue, 18 Aug 2015 13:44:29 +0000 (13:44 +0000)]

Merged r14513 from trunk to 3.1-stable (#20452, #20557)

Czech translation for 2.6-stable updated by Karel Pičman.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14514 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Sun, 26 Jul 2015 14:05:44 +0000 (14:05 +0000)]

Merged r14461 from trunk to 3.1-stable (#20338, #20410)

Turkish translation for 3.1-stable updated by Giray Pultar.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14464 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Sun, 26 Jul 2015 14:05:33 +0000 (14:05 +0000)]

Merged r14460 from trunk to 3.1-stable (#20338, #20409)

Turkish translation for 3.0-stable updated by Giray Pultar.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14463 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Sun, 26 Jul 2015 14:05:22 +0000 (14:05 +0000)]

Merged r14459 from trunk to 3.1-stable (#20338, #20408)

Turkish translation for 2.6-stable updated by Giray Pultar.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14462 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sun, 26 Jul 2015 07:08:09 +0000 (07:08 +0000)]

Merged r14455.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14456 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 25 Jul 2015 08:54:25 +0000 (08:54 +0000)]

Merged r14450 (#20206).

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14453 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sat, 25 Jul 2015 06:52:41 +0000 (06:52 +0000)]

Merged r14451 (#20372).

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14452 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Fri, 24 Jul 2015 04:07:24 +0000 (04:07 +0000)]

Merged r14448 (#5770).

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14449 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Fri, 24 Jul 2015 04:05:11 +0000 (04:05 +0000)]

Merged r14446 (#16373).

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14447 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Mon, 13 Jul 2015 04:09:13 +0000 (04:09 +0000)]

Merged r14443 from trunk to 3.1-stable (#19172)

doc/INSTALL: update requirements Bundler >= 1.5.0.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14444 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Sun, 12 Jul 2015 10:45:12 +0000 (10:45 +0000)]

Merged r14440 from trunk to 3.1-stable (#20292)

add config/secrets.yml to .gitignore and .hgignore.

Contributed by Benjamin Petersen.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14441 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Sun, 12 Jul 2015 10:15:47 +0000 (10:15 +0000)]

Merged r14437 from trunk to 3.1-stable (#20292)

add config/secrets.yml to svn:ignore.

Contributed by Benjamin Petersen.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14438 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Sun, 12 Jul 2015 09:37:12 +0000 (09:37 +0000)]

Merged r14430 from trunk to 3.1-stable (#20199)

Russian translation for 3.1-stable updated.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14433 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Sun, 12 Jul 2015 09:37:00 +0000 (09:37 +0000)]

Merged r14429 from trunk to 3.1-stable (#20199, #20295)

Russian translation for 3.0-stable updated.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14432 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Toshi MARUYAMA [Sun, 12 Jul 2015 09:36:49 +0000 (09:36 +0000)]

Merged r14428 from trunk to 3.1-stable (#20199, #20294)

Russian translation for 2.6-stable updated.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14431 e93f8b46-1217-0410-a6f0-8f06a7374b81

Merged r14420 from trunk to 3.1-stable (#20198)

Japanese translation updated by Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14422 e93f8b46-1217-0410-a6f0-8f06a7374b81

Merged r14419 from trunk to 3.1-stable (#20193)

Bulgarian translation updated by Ivan Cenov.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14421 e93f8b46-1217-0410-a6f0-8f06a7374b81

Merged r14417 from trunk to 3.1-stable.

add missing fixtures to IssueSubtaskingTest.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14418 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sun, 5 Jul 2015 10:34:02 +0000 (10:34 +0000)]

Merged r14388 (#19842).

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14403 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sun, 5 Jul 2015 10:29:59 +0000 (10:29 +0000)]

Merged r14389 (#20203).

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14400 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sun, 5 Jul 2015 10:23:12 +0000 (10:23 +0000)]

Merged r14396 (#17757).

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14397 e93f8b46-1217-0410-a6f0-8f06a7374b81

Merged r14394 from trunk to 3.1-stable (#19993)

change csv separators of es-PA.yml by Leonel Iturralde.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14395 e93f8b46-1217-0410-a6f0-8f06a7374b81

Merged r14392 from trunk to 3.1-stable (#19993)

Spanish (es, es-PA) translation updated by Leonel Iturralde.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14393 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sun, 28 Jun 2015 10:05:06 +0000 (10:05 +0000)]

Set BRANCH to stable.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14387 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sun, 28 Jun 2015 10:00:53 +0000 (10:00 +0000)]

Merged r14380 (#20066).

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14385 e93f8b46-1217-0410-a6f0-8f06a7374b81

commit | commitdiff | tree

Jean-Philippe Lang [Sun, 28 Jun 2015 09:18:49 +0000 (09:18 +0000)]

Merged r14381.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14382 e93f8b46-1217-0410-a6f0-8f06a7374b81