]> source.dussan.org Git - redmine.git/log
redmine.git
9 years agoDisplay totals for each group on grouped queries (#1561).
Jean-Philippe Lang [Fri, 9 Oct 2015 09:02:11 +0000 (09:02 +0000)]
Display totals for each group on grouped queries (#1561).

git-svn-id: http://svn.redmine.org/redmine/trunk@14665 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoFix tokenization of phrases with non-ascii chars (#20730).
Jean-Philippe Lang [Fri, 9 Oct 2015 07:35:48 +0000 (07:35 +0000)]
Fix tokenization of phrases with non-ascii chars (#20730).

Patch by Jens Krämer.

git-svn-id: http://svn.redmine.org/redmine/trunk@14662 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoDisables IE compatibility mode (#20380).
Jean-Philippe Lang [Fri, 9 Oct 2015 07:20:26 +0000 (07:20 +0000)]
Disables IE compatibility mode (#20380).

git-svn-id: http://svn.redmine.org/redmine/trunk@14658 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoUpdgrade to jquery-rails 3.1.4 (#20380).
Jean-Philippe Lang [Fri, 9 Oct 2015 07:05:09 +0000 (07:05 +0000)]
Updgrade to jquery-rails 3.1.4 (#20380).

git-svn-id: http://svn.redmine.org/redmine/trunk@14654 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoSet autologin cookie as secure by default when using https (#20935).
Jean-Philippe Lang [Wed, 7 Oct 2015 19:43:12 +0000 (19:43 +0000)]
Set autologin cookie as secure by default when using https (#20935).

git-svn-id: http://svn.redmine.org/redmine/trunk@14648 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoAdds 4h, 8h and 12h as options for session maximum lifetime (#20933).
Jean-Philippe Lang [Wed, 7 Oct 2015 17:26:22 +0000 (17:26 +0000)]
Adds 4h, 8h and 12h as options for session maximum lifetime (#20933).

git-svn-id: http://svn.redmine.org/redmine/trunk@14647 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoMoves attachments settings to a new tab.
Jean-Philippe Lang [Tue, 6 Oct 2015 16:48:21 +0000 (16:48 +0000)]
Moves attachments settings to a new tab.

git-svn-id: http://svn.redmine.org/redmine/trunk@14646 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoReset current user to prevent random test failures.
Jean-Philippe Lang [Sun, 4 Oct 2015 22:22:25 +0000 (22:22 +0000)]
Reset current user to prevent random test failures.

git-svn-id: http://svn.redmine.org/redmine/trunk@14645 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoRound totals (#1561).
Jean-Philippe Lang [Sun, 4 Oct 2015 22:16:59 +0000 (22:16 +0000)]
Round totals (#1561).

git-svn-id: http://svn.redmine.org/redmine/trunk@14644 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoAdds :label_total_plural to locales (#1561).
Jean-Philippe Lang [Sun, 4 Oct 2015 19:43:53 +0000 (19:43 +0000)]
Adds :label_total_plural to locales (#1561).

git-svn-id: http://svn.redmine.org/redmine/trunk@14643 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoAdds options to display totals on the issue list (#1561).
Jean-Philippe Lang [Sun, 4 Oct 2015 19:42:37 +0000 (19:42 +0000)]
Adds options to display totals on the issue list (#1561).

Works for estimated hours, spent hours and any numeric custom field.

git-svn-id: http://svn.redmine.org/redmine/trunk@14642 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoRemoved duplicate link to open issues on report views.
Jean-Philippe Lang [Sun, 4 Oct 2015 12:48:36 +0000 (12:48 +0000)]
Removed duplicate link to open issues on report views.

git-svn-id: http://svn.redmine.org/redmine/trunk@14641 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoUse a table instead of an unordered list in "Issue tracking" box (#20413).
Jean-Philippe Lang [Sun, 4 Oct 2015 12:44:44 +0000 (12:44 +0000)]
Use a table instead of an unordered list in "Issue tracking" box (#20413).

Patch by Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/trunk@14640 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoMistake in Polish Translation file (#19403).
Jean-Philippe Lang [Sun, 4 Oct 2015 12:24:30 +0000 (12:24 +0000)]
Mistake in Polish Translation file (#19403).

Patch by Sebastian Paluch.

git-svn-id: http://svn.redmine.org/redmine/trunk@14639 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoAdds day numbers to HTML and PDF gantt (#3034).
Jean-Philippe Lang [Sat, 3 Oct 2015 09:10:27 +0000 (09:10 +0000)]
Adds day numbers to HTML and PDF gantt (#3034).

git-svn-id: http://svn.redmine.org/redmine/trunk@14638 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoAdds label_api string to locales.
Jean-Philippe Lang [Thu, 1 Oct 2015 18:45:12 +0000 (18:45 +0000)]
Adds label_api string to locales.

git-svn-id: http://svn.redmine.org/redmine/trunk@14637 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoMoved API settings to their own tab.
Jean-Philippe Lang [Thu, 1 Oct 2015 18:44:35 +0000 (18:44 +0000)]
Moved API settings to their own tab.

git-svn-id: http://svn.redmine.org/redmine/trunk@14636 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoActivate sudo mode after password based login (#20589).
Jean-Philippe Lang [Thu, 1 Oct 2015 17:07:06 +0000 (17:07 +0000)]
Activate sudo mode after password based login (#20589).

Patch by Jens Krämer.

git-svn-id: http://svn.redmine.org/redmine/trunk@14635 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoUpdate enumeration ovverides with their parents (#19657).
Jean-Philippe Lang [Wed, 30 Sep 2015 21:07:47 +0000 (21:07 +0000)]
Update enumeration ovverides with their parents (#19657).

git-svn-id: http://svn.redmine.org/redmine/trunk@14634 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoSQL error with MySQL (#19657).
Jean-Philippe Lang [Wed, 30 Sep 2015 20:59:47 +0000 (20:59 +0000)]
SQL error with MySQL (#19657).

git-svn-id: http://svn.redmine.org/redmine/trunk@14633 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoAdds Rack::ContentLength (#17403).
Jean-Philippe Lang [Wed, 30 Sep 2015 20:40:51 +0000 (20:40 +0000)]
Adds Rack::ContentLength (#17403).

git-svn-id: http://svn.redmine.org/redmine/trunk@14632 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoAdds some rounded corners (#20368).
Jean-Philippe Lang [Wed, 30 Sep 2015 19:11:54 +0000 (19:11 +0000)]
Adds some rounded corners (#20368).

Patch by Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/trunk@14631 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoRemove attachment after transaction commit (#20388).
Jean-Philippe Lang [Wed, 30 Sep 2015 18:59:51 +0000 (18:59 +0000)]
Remove attachment after transaction commit (#20388).

Patch by Ivan Zabrovskiy.

git-svn-id: http://svn.redmine.org/redmine/trunk@14630 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoTypo.
Jean-Philippe Lang [Wed, 30 Sep 2015 18:50:01 +0000 (18:50 +0000)]
Typo.

git-svn-id: http://svn.redmine.org/redmine/trunk@14629 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoEnables footnote support with Markdown (#16072).
Jean-Philippe Lang [Wed, 30 Sep 2015 18:42:23 +0000 (18:42 +0000)]
Enables footnote support with Markdown (#16072).

Patch by Mischa The Evil.

git-svn-id: http://svn.redmine.org/redmine/trunk@14628 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoForces enumeration override position to the same as its parent (#19657).
Jean-Philippe Lang [Wed, 30 Sep 2015 18:35:50 +0000 (18:35 +0000)]
Forces enumeration override position to the same as its parent (#19657).

git-svn-id: http://svn.redmine.org/redmine/trunk@14627 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoInclude inactive activities in time entries filter (#20117).
Jean-Philippe Lang [Wed, 30 Sep 2015 18:03:13 +0000 (18:03 +0000)]
Include inactive activities in time entries filter (#20117).

git-svn-id: http://svn.redmine.org/redmine/trunk@14626 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoReplaces a piggy back query with an association for loading wiki pages updates.
Jean-Philippe Lang [Mon, 28 Sep 2015 18:39:07 +0000 (18:39 +0000)]
Replaces a piggy back query with an association for loading wiki pages updates.

git-svn-id: http://svn.redmine.org/redmine/trunk@14625 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoFix for multiple tabs on the same page (#20271).
Jean-Philippe Lang [Sat, 26 Sep 2015 09:14:07 +0000 (09:14 +0000)]
Fix for multiple tabs on the same page (#20271).

Patch by Felix Gliesche.

git-svn-id: http://svn.redmine.org/redmine/trunk@14624 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoDisplay all versions in query filter (#19271).
Jean-Philippe Lang [Sat, 26 Sep 2015 08:12:44 +0000 (08:12 +0000)]
Display all versions in query filter (#19271).

git-svn-id: http://svn.redmine.org/redmine/trunk@14623 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoRaises wiki edits comments limit to 1024 (#19886).
Jean-Philippe Lang [Mon, 21 Sep 2015 21:13:06 +0000 (21:13 +0000)]
Raises wiki edits comments limit to 1024 (#19886).

git-svn-id: http://svn.redmine.org/redmine/trunk@14622 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoRaises time entries comments limit to 1024 (#19885).
Jean-Philippe Lang [Mon, 21 Sep 2015 21:00:06 +0000 (21:00 +0000)]
Raises time entries comments limit to 1024 (#19885).

git-svn-id: http://svn.redmine.org/redmine/trunk@14621 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoAdds tracker name to Redmine issue link titles (#13946).
Jean-Philippe Lang [Mon, 21 Sep 2015 20:42:06 +0000 (20:42 +0000)]
Adds tracker name to Redmine issue link titles (#13946).

git-svn-id: http://svn.redmine.org/redmine/trunk@14620 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoError message when editing a child project without add project/subprojects permission...
Jean-Philippe Lang [Mon, 21 Sep 2015 20:32:11 +0000 (20:32 +0000)]
Error message when editing a child project without add project/subprojects permissions (#20282).

git-svn-id: http://svn.redmine.org/redmine/trunk@14619 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoProject copy does not copy custom field settings (#20360).
Jean-Philippe Lang [Sun, 20 Sep 2015 20:25:16 +0000 (20:25 +0000)]
Project copy does not copy custom field settings (#20360).

git-svn-id: http://svn.redmine.org/redmine/trunk@14618 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoConfusing name: test public query called "private" (#20740).
Jean-Philippe Lang [Sun, 20 Sep 2015 12:54:44 +0000 (12:54 +0000)]
Confusing name: test public query called "private" (#20740).

Patch by Kirill Smirnov.

git-svn-id: http://svn.redmine.org/redmine/trunk@14617 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoTest failure, now that projects without trackers are ignored (#20463).
Jean-Philippe Lang [Sun, 20 Sep 2015 12:52:29 +0000 (12:52 +0000)]
Test failure, now that projects without trackers are ignored (#20463).

git-svn-id: http://svn.redmine.org/redmine/trunk@14616 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoProject copy does not update custom field of version type values (#20361).
Jean-Philippe Lang [Sun, 20 Sep 2015 12:50:06 +0000 (12:50 +0000)]
Project copy does not update custom field of version type values (#20361).

git-svn-id: http://svn.redmine.org/redmine/trunk@14615 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoFixed invalid search link on the new project form (#20565).
Jean-Philippe Lang [Sun, 20 Sep 2015 11:50:21 +0000 (11:50 +0000)]
Fixed invalid search link on the new project form (#20565).

git-svn-id: http://svn.redmine.org/redmine/trunk@14614 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoDon't propose projects without trackers when editing an issue (#20463).
Jean-Philippe Lang [Sun, 20 Sep 2015 11:38:01 +0000 (11:38 +0000)]
Don't propose projects without trackers when editing an issue (#20463).

git-svn-id: http://svn.redmine.org/redmine/trunk@14613 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoInternal error when moving an issue to a project without trackers (#20463).
Jean-Philippe Lang [Sun, 20 Sep 2015 11:18:53 +0000 (11:18 +0000)]
Internal error when moving an issue to a project without trackers (#20463).

git-svn-id: http://svn.redmine.org/redmine/trunk@14612 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoTable renders wrong if a trailing space is after | symbol (#18223).
Jean-Philippe Lang [Sun, 20 Sep 2015 11:02:01 +0000 (11:02 +0000)]
Table renders wrong if a trailing space is after | symbol (#18223).

Patch by Jens Krämer.

git-svn-id: http://svn.redmine.org/redmine/trunk@14611 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoUpdates for 3.1.1 release.
Jean-Philippe Lang [Sun, 20 Sep 2015 06:17:43 +0000 (06:17 +0000)]
Updates for 3.1.1 release.

git-svn-id: http://svn.redmine.org/redmine/trunk@14606 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years ago"Total estimated time" should be inserted after "Estimated time" (#20733).
Jean-Philippe Lang [Sat, 19 Sep 2015 07:29:08 +0000 (07:29 +0000)]
"Total estimated time" should be inserted after "Estimated time" (#20733).

Pätch by Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/trunk@14602 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agofix typo of Japanese translation for notice_gantt_chart_truncated (#20761)
Toshi MARUYAMA [Wed, 16 Sep 2015 10:11:49 +0000 (10:11 +0000)]
fix typo of Japanese translation for notice_gantt_chart_truncated (#20761)

Contributed by Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/trunk@14598 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoPortuguese translation for trunk updated by Rui Rebelo (#20728)
Toshi MARUYAMA [Mon, 14 Sep 2015 13:53:46 +0000 (13:53 +0000)]
Portuguese translation for trunk updated by Rui Rebelo (#20728)

git-svn-id: http://svn.redmine.org/redmine/trunk@14589 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoPortuguese translation for 3.1-stable updated by Rui Rebelo (#20728, #20747)
Toshi MARUYAMA [Mon, 14 Sep 2015 13:38:56 +0000 (13:38 +0000)]
Portuguese translation for 3.1-stable updated by Rui Rebelo (#20728, #20747)

git-svn-id: http://svn.redmine.org/redmine/trunk@14588 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoPortuguese translation for 3.0-stable updated by Rui Rebelo (#20728, #20746)
Toshi MARUYAMA [Mon, 14 Sep 2015 13:38:45 +0000 (13:38 +0000)]
Portuguese translation for 3.0-stable updated by Rui Rebelo (#20728, #20746)

git-svn-id: http://svn.redmine.org/redmine/trunk@14587 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoPortuguese translation for 2.6-stable updated by Rui Rebelo (#20728, #20745)
Toshi MARUYAMA [Mon, 14 Sep 2015 13:38:34 +0000 (13:38 +0000)]
Portuguese translation for 2.6-stable updated by Rui Rebelo (#20728, #20745)

git-svn-id: http://svn.redmine.org/redmine/trunk@14586 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoSpanish and Spanish Panama translation updated by Leonel Iturralde (#20708)
Toshi MARUYAMA [Mon, 14 Sep 2015 11:33:35 +0000 (11:33 +0000)]
Spanish and Spanish Panama translation updated by Leonel Iturralde (#20708)

git-svn-id: http://svn.redmine.org/redmine/trunk@14585 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoJapanese "spent time" translation changed by Go MAEDA (#20731)
Toshi MARUYAMA [Mon, 14 Sep 2015 10:27:52 +0000 (10:27 +0000)]
Japanese "spent time" translation changed by Go MAEDA (#20731)

git-svn-id: http://svn.redmine.org/redmine/trunk@14584 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoJapanese translation updated by Go MAEDA (#20729)
Toshi MARUYAMA [Mon, 14 Sep 2015 10:08:10 +0000 (10:08 +0000)]
Japanese translation updated by Go MAEDA (#20729)

git-svn-id: http://svn.redmine.org/redmine/trunk@14582 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agotrunk: Merged r14580 from 2.6-stable.
Toshi MARUYAMA [Mon, 14 Sep 2015 08:01:04 +0000 (08:01 +0000)]
trunk: Merged r14580 from 2.6-stable.

travis: upgrade jruby-9.0.0.0 to jruby-9.0.1.0.

git-svn-id: http://svn.redmine.org/redmine/trunk@14581 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agotrunk: merge r14572 from 3.1-stable (#20452)
Toshi MARUYAMA [Mon, 14 Sep 2015 06:13:31 +0000 (06:13 +0000)]
trunk: merge r14572 from 3.1-stable (#20452)

fix Czech textile ol example.

git-svn-id: http://svn.redmine.org/redmine/trunk@14573 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoTraditional Chinese "issue" translation changed by ChunChang Lo (#20720)
Toshi MARUYAMA [Mon, 14 Sep 2015 04:40:15 +0000 (04:40 +0000)]
Traditional Chinese "issue" translation changed by ChunChang Lo (#20720)

git-svn-id: http://svn.redmine.org/redmine/trunk@14569 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoTraditional Chinese translation updated by ChunChang Lo (#20720)
Toshi MARUYAMA [Mon, 14 Sep 2015 04:40:02 +0000 (04:40 +0000)]
Traditional Chinese translation updated by ChunChang Lo (#20720)

git-svn-id: http://svn.redmine.org/redmine/trunk@14568 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoAdds a test for #20714.
Jean-Philippe Lang [Sun, 13 Sep 2015 14:37:48 +0000 (14:37 +0000)]
Adds a test for #20714.

git-svn-id: http://svn.redmine.org/redmine/trunk@14561 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoOpen redirect vulnerability (#19577).
Jean-Philippe Lang [Sun, 13 Sep 2015 14:35:20 +0000 (14:35 +0000)]
Open redirect vulnerability (#19577).

Patch by Holger Just.

git-svn-id: http://svn.redmine.org/redmine/trunk@14560 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoAdds translation strings (#20688).
Jean-Philippe Lang [Sat, 12 Sep 2015 12:47:48 +0000 (12:47 +0000)]
Adds translation strings (#20688).

git-svn-id: http://svn.redmine.org/redmine/trunk@14555 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoAdds a Total estimated hours column on issue list (#20688).
Jean-Philippe Lang [Sat, 12 Sep 2015 12:47:21 +0000 (12:47 +0000)]
Adds a Total estimated hours column on issue list (#20688).

git-svn-id: http://svn.redmine.org/redmine/trunk@14554 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoHelp cursor showing up on span tags with title (#20633).
Jean-Philippe Lang [Sat, 12 Sep 2015 12:30:43 +0000 (12:30 +0000)]
Help cursor showing up on span tags with title (#20633).

git-svn-id: http://svn.redmine.org/redmine/trunk@14552 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoWARNING: Can't mass-assign protected attributes for User (#20490).
Jean-Philippe Lang [Sat, 12 Sep 2015 11:11:40 +0000 (11:11 +0000)]
WARNING: Can't mass-assign protected attributes for User (#20490).

git-svn-id: http://svn.redmine.org/redmine/trunk@14550 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoGemfile: remove loofah definition (#16962, #19419)
Toshi MARUYAMA [Tue, 1 Sep 2015 00:15:24 +0000 (00:15 +0000)]
Gemfile: remove loofah definition (#16962, #19419)

actionpack 4.2 depends on loofah.

git-svn-id: http://svn.redmine.org/redmine/trunk@14542 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agotrunk: revert r14300 (#16535, #20466, #20641)
Toshi MARUYAMA [Tue, 1 Sep 2015 00:15:13 +0000 (00:15 +0000)]
trunk: revert r14300 (#16535, #20466, #20641)

Set a max width to html email content.

Patch by Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/trunk@14541 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoadd roadie-rails gem for e-mail inline styles (#8335, #20641)
Toshi MARUYAMA [Mon, 31 Aug 2015 07:38:29 +0000 (07:38 +0000)]
add roadie-rails gem for e-mail inline styles (#8335, #20641)

Contributed by Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/trunk@14540 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agotravis: add PostgreSQL environments
Toshi MARUYAMA [Sun, 30 Aug 2015 04:53:56 +0000 (04:53 +0000)]
travis: add PostgreSQL environments

git-svn-id: http://svn.redmine.org/redmine/trunk@14530 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agotravis: allow failures on jruby 9000
Toshi MARUYAMA [Sun, 30 Aug 2015 04:53:43 +0000 (04:53 +0000)]
travis: allow failures on jruby 9000

git-svn-id: http://svn.redmine.org/redmine/trunk@14529 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agotrunk: merge r14527 from 2.6-stable
Toshi MARUYAMA [Sun, 30 Aug 2015 00:37:16 +0000 (00:37 +0000)]
trunk: merge r14527 from 2.6-stable

travis: add jruby 9000

refer:
https://github.com/travis-ci/travis-ci/issues/4720

git-svn-id: http://svn.redmine.org/redmine/trunk@14528 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agotravis: allow test failures on MySQL 5.7
Toshi MARUYAMA [Sat, 29 Aug 2015 23:13:32 +0000 (23:13 +0000)]
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/trunk@14525 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agotravis: allow ui test failure on all environments (#20251)
Toshi MARUYAMA [Sat, 29 Aug 2015 07:12:47 +0000 (07:12 +0000)]
travis: allow ui test failure on all environments (#20251)

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

git-svn-id: http://svn.redmine.org/redmine/trunk@14522 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoGemfile: update Rails to 4.2.4
Toshi MARUYAMA [Sat, 29 Aug 2015 07:03:17 +0000 (07:03 +0000)]
Gemfile: update Rails to 4.2.4

git-svn-id: http://svn.redmine.org/redmine/trunk@14521 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoReverts r14510 (#20508) and r14511 (#20507), tests broken.
Jean-Philippe Lang [Sat, 22 Aug 2015 11:49:12 +0000 (11:49 +0000)]
Reverts r14510 (#20508) and r14511 (#20507), tests broken.

git-svn-id: http://svn.redmine.org/redmine/trunk@14520 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agotrunk: merge r14516 from 3.1-stable (#20452)
Toshi MARUYAMA [Tue, 18 Aug 2015 15:16:19 +0000 (15:16 +0000)]
trunk: merge r14516 from 3.1-stable (#20452)

Czech wiki help translation updated by Karel Pičman.

git-svn-id: http://svn.redmine.org/redmine/trunk@14519 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoCzech translation updated by Karel Pičman (#20452)
Toshi MARUYAMA [Tue, 18 Aug 2015 14:59:37 +0000 (14:59 +0000)]
Czech translation updated by Karel Pičman (#20452)

git-svn-id: http://svn.redmine.org/redmine/trunk@14517 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoCzech translation for 2.6-stable updated by Karel Pičman (#20452, #20557)
Toshi MARUYAMA [Tue, 18 Aug 2015 13:39:30 +0000 (13:39 +0000)]
Czech translation for 2.6-stable updated by Karel Pičman (#20452, #20557)

git-svn-id: http://svn.redmine.org/redmine/trunk@14513 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoDon't render empty divs when there are no custom fields on the issue form (#20501).
Jean-Philippe Lang [Tue, 18 Aug 2015 07:05:25 +0000 (07:05 +0000)]
Don't render empty divs when there are no custom fields on the issue form (#20501).

git-svn-id: http://svn.redmine.org/redmine/trunk@14512 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoThemesHelper reopening ApplicationHelper is problem with autoloading (#20507).
Jean-Philippe Lang [Tue, 18 Aug 2015 06:59:24 +0000 (06:59 +0000)]
ThemesHelper reopening ApplicationHelper is problem with autoloading (#20507).

Patch by Ondřej Ezr.

git-svn-id: http://svn.redmine.org/redmine/trunk@14511 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoRequired file lib/redmine/hook.rb is patching autoloaded ApplicationHelper (#20508).
Jean-Philippe Lang [Tue, 18 Aug 2015 06:57:50 +0000 (06:57 +0000)]
Required file lib/redmine/hook.rb is patching autoloaded ApplicationHelper (#20508).

Patch by Ondřej.

git-svn-id: http://svn.redmine.org/redmine/trunk@14510 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoRedmine I18n autoload instead of require (#20506).
Jean-Philippe Lang [Tue, 18 Aug 2015 06:54:26 +0000 (06:54 +0000)]
Redmine I18n autoload instead of require (#20506).

Patch by Ondřej Ezr.

git-svn-id: http://svn.redmine.org/redmine/trunk@14509 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoProject.copy_from deletes enabled_modules on source (#20512).
Jean-Philippe Lang [Tue, 18 Aug 2015 06:46:49 +0000 (06:46 +0000)]
Project.copy_from deletes enabled_modules on source (#20512).

Fix by Ondřej Ezr.

git-svn-id: http://svn.redmine.org/redmine/trunk@14508 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoJapanese translation updated by Go MAEDA (#20538)
Toshi MARUYAMA [Tue, 18 Aug 2015 00:43:57 +0000 (00:43 +0000)]
Japanese translation updated by Go MAEDA (#20538)

git-svn-id: http://svn.redmine.org/redmine/trunk@14507 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoFind user by login then by email.
Jean-Philippe Lang [Sat, 15 Aug 2015 09:28:34 +0000 (09:28 +0000)]
Find user by login then by email.

git-svn-id: http://svn.redmine.org/redmine/trunk@14506 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoDEPRECATION WARNING: `#timestamps` was called without specifying an option for `null...
Jean-Philippe Lang [Sat, 15 Aug 2015 09:22:37 +0000 (09:22 +0000)]
DEPRECATION WARNING: `#timestamps` was called without specifying an option for `null` (#905, #20533).

git-svn-id: http://svn.redmine.org/redmine/trunk@14505 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoCSV importer raises I18n::InvalidLocale exception if current user's language is ...
Jean-Philippe Lang [Sat, 15 Aug 2015 09:19:12 +0000 (09:19 +0000)]
CSV importer raises I18n::InvalidLocale exception if current user's language is "(auto)" (#905, #20535).

git-svn-id: http://svn.redmine.org/redmine/trunk@14504 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoUse same logic for finding user as a custom field (#950).
Jean-Philippe Lang [Sat, 15 Aug 2015 09:15:13 +0000 (09:15 +0000)]
Use same logic for finding user as a custom field (#950).

git-svn-id: http://svn.redmine.org/redmine/trunk@14503 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years ago#downcase no longer needed after r14484 (#20369).
Jean-Philippe Lang [Sat, 15 Aug 2015 07:07:32 +0000 (07:07 +0000)]
#downcase no longer needed after r14484 (#20369).

git-svn-id: http://svn.redmine.org/redmine/trunk@14502 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoUse same logic for finding user when importing a file (#950).
Jean-Philippe Lang [Sat, 15 Aug 2015 07:06:43 +0000 (07:06 +0000)]
Use same logic for finding user when importing a file (#950).

git-svn-id: http://svn.redmine.org/redmine/trunk@14501 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoMoved implementation to Principal.
Jean-Philippe Lang [Sat, 15 Aug 2015 06:57:55 +0000 (06:57 +0000)]
Moved implementation to Principal.

git-svn-id: http://svn.redmine.org/redmine/trunk@14500 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoFixed that #find_assignee_from_keyword may return a group with blank keyword (#20454).
Jean-Philippe Lang [Sat, 15 Aug 2015 06:47:18 +0000 (06:47 +0000)]
Fixed that #find_assignee_from_keyword may return a group with blank keyword (#20454).

git-svn-id: http://svn.redmine.org/redmine/trunk@14499 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years ago#downcase no longer needed after r14484 (#20369).
Jean-Philippe Lang [Sat, 15 Aug 2015 06:44:14 +0000 (06:44 +0000)]
#downcase no longer needed after r14484 (#20369).

git-svn-id: http://svn.redmine.org/redmine/trunk@14498 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoUse named scope to find the matching version (#950).
Jean-Philippe Lang [Sat, 15 Aug 2015 06:22:21 +0000 (06:22 +0000)]
Use named scope to find the matching version (#950).

git-svn-id: http://svn.redmine.org/redmine/trunk@14497 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoSet default date format based on user locale (#950).
Jean-Philippe Lang [Fri, 14 Aug 2015 15:52:04 +0000 (15:52 +0000)]
Set default date format based on user locale (#950).

git-svn-id: http://svn.redmine.org/redmine/trunk@14496 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoAdds support for custom date format when importing a CSV file (#950).
Jean-Philippe Lang [Fri, 14 Aug 2015 15:42:28 +0000 (15:42 +0000)]
Adds support for custom date format when importing a CSV file (#950).

git-svn-id: http://svn.redmine.org/redmine/trunk@14495 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoAdds translation strings (#950).
Jean-Philippe Lang [Fri, 14 Aug 2015 09:00:51 +0000 (09:00 +0000)]
Adds translation strings (#950).

git-svn-id: http://svn.redmine.org/redmine/trunk@14494 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years agoImport issues from CSV file (#950).
Jean-Philippe Lang [Fri, 14 Aug 2015 08:20:32 +0000 (08:20 +0000)]
Import issues from CSV file (#950).

git-svn-id: http://svn.redmine.org/redmine/trunk@14493 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years ago[#20288] Update the CodeRay Ruby syntax highlight example.
Toshi MARUYAMA [Fri, 14 Aug 2015 02:47:54 +0000 (02:47 +0000)]
[#20288] Update the CodeRay Ruby syntax highlight example.

This commit changes the following:

* Remove line numbering from syntax highlight example.
* Add span with 'CodeRay' class around the syntax highlight example.
* Fix span classes in the syntax highlight example:
** Ruby scanner changed from ':reserved' to ':keyword' with CodeRay 1.0.0.
* Remove obsolete line numbering styles.
* Fix internal stylesheet to match CodeRay 1.1.0 (preserving r10132's changes).
* Sort internal styles and remove superfluous newlines between styles.

Contributed by Mischa The Evil.

git-svn-id: http://svn.redmine.org/redmine/trunk@14492 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years ago[#20288] Make clear that syntax highlighting cannot only be used in wiki pages.
Toshi MARUYAMA [Fri, 14 Aug 2015 02:38:25 +0000 (02:38 +0000)]
[#20288] Make clear that syntax highlighting cannot only be used in wiki pages.

Regarding the i18n: I used English as the base language. The
changed sentence was the same in 93 out of 98 language files,
public\help\xx[-xx]\wiki_syntax_detailed_[markdown||textile].html.

The only five exceptions were:

* cs; public\help\cs\wiki_syntax_detailed_textile.html
* fr; public\help\fr\wiki_syntax_detailed_textile.html
* ja; public\help\ja\wiki_syntax_detailed_textile.html
* ru; public\help\ru\qiki_syntax_detailed_textile.html
* zh-tw; public\help\zh-tw\wiki_syntax_detailed_textile.html

In the above given files, the changed sentence is translated. I
have replaced the whole translated sentence with the new English
base sentence, as such leaving new translations up to translators.

Contributed by Mischa The Evil.

git-svn-id: http://svn.redmine.org/redmine/trunk@14491 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years ago[#20288] Add a note about case-insensitivity of CodeRay language names/aliases.
Toshi MARUYAMA [Fri, 14 Aug 2015 02:37:17 +0000 (02:37 +0000)]
[#20288] Add a note about case-insensitivity of CodeRay language names/aliases.

Regarding the i18n: I used English as the base language. The
changed sentence was the same in 93 out of 98 language files,
public\help\xx[-xx]\wiki_syntax_detailed_[markdown||textile].html.

The only five exceptions were:

* cs; public\help\cs\wiki_syntax_detailed_textile.html
* fr; public\help\fr\wiki_syntax_detailed_textile.html
* ja; public\help\ja\wiki_syntax_detailed_textile.html
* ru; public\help\ru\qiki_syntax_detailed_textile.html
* zh-tw; public\help\zh-tw\wiki_syntax_detailed_textile.html

In the above given files, the changed sentence is translated. I
have replaced the whole translated sentence with the new English
base sentence, as such leaving new translations up to translators.

Contributed by Mischa The Evil.

git-svn-id: http://svn.redmine.org/redmine/trunk@14490 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years ago[#20288] Update the i18n'ed core doc to match CodeRay 1.1.0 capabilities.
Toshi MARUYAMA [Fri, 14 Aug 2015 02:36:09 +0000 (02:36 +0000)]
[#20288] Update the i18n'ed core doc to match CodeRay 1.1.0 capabilities.

This commit includes:

<pre>
1. an update of the list of languages supported by CodeRay:

  * added:
    + clojure [added in CodeRay 1.0.x]
    + diff (patch) [added in CodeRay 0.8.x]
    + go [added in CodeRay 1.1.x]
    + haml [added in CodeRay 1.0.x]
    + lua [added in CodeRay 1.1.x]
    + sass [added in CodeRay 1.1.x]
    + taskpaper [added in CodeRay 1.1.x]
    + text (plain, plaintext) [never been documented in Redmine]
  * removed:
    - scheme [removed from CodeRay 1.0.x]
  * renamed:
    ~ erb (eruby, rhtml) [renamed from rhtml in CodeRay 1.0.x]

2. the inclusion of additional, comma-separated language mappings
   (aliases) inside parentheses:

  * cpp (c++, cplusplus)
  * delphi (pascal)
  * diff (patch)
  * erb (eruby, rhtml)
  * html (xhtml)
  * javascript (ecmascript, ecma_script, java_script, js)
  * ruby (irb)
  * text (plain, plaintext)
  * yaml (yml)
</pre>

Regarding the i18n: I used English as the base language. The
changed sentence was the same in 94 out of 98 language files,
public\help\xx[-xx]\wiki_syntax_detailed_[markdown||textile].html.

The only four exceptions were:

* cs; public\help\cs\wiki_syntax_detailed_textile.html
* fr; public\help\fr\wiki_syntax_detailed_textile.html
* ja; public\help\ja\wiki_syntax_detailed_textile.html
* zh-tw; public\help\zh-tw\wiki_syntax_detailed_textile.html

In the above given files, the sentence containing the supported
languages is translated (and/or stylized). I have chosen to
replace the whole translated sentence with the new English base
sentence, as such leaving decisions about stylizing language names
to translators and the people that actually use the respective
languages. In general (and for English, as it's the base language)
I think we can better stick to non-capitalized language names to
prevent any formatting confusion.

Contributed by Mischa The Evil.

git-svn-id: http://svn.redmine.org/redmine/trunk@14489 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 years ago[#20288] Update styles to match CodeRay 1.1.0 (preserving changes of r10132).
Toshi MARUYAMA [Fri, 14 Aug 2015 01:20:19 +0000 (01:20 +0000)]
[#20288] Update styles to match CodeRay 1.1.0 (preserving changes of r10132).

This commit updates the CSS styles to match with CodeRay 1.1.0,
while it preserves the custom changes applied in r10132.

The CSS styles were still based on CodeRay 1.0.6 (included since
Redmine 1.4.0) with the custom changes from r10132 (included since
Redmine 2.1.0). Redmine 2.3.2 till 2.3.4 came with CodeRay 1.0.9,
an upgrade that didn't needed changes in the CSS styles. Starting
with 2.4.0 Redmine comes with CodeRay 1.1.0, a minor upgrade
that came with new/changed token_kinds and lots of changes in the
alpha stylesheet, that in turn is used as a base for Redmine's own
CodeRay CSS styles. As such, this upgrade needed CSS stylesheet
changes like done before in r7618 and r7623 (for 1.0.0 upgrade)
and r9389 (for 1.0.6 upgrade). But these changes, plus an update
of the Redmine core documentation that is shipped along the core
(wiki_syntax_detailed_[markdown|textile].html), aren't integrated
up untill today.

Contributed by Mischa The Evil.

git-svn-id: http://svn.redmine.org/redmine/trunk@14488 e93f8b46-1217-0410-a6f0-8f06a7374b81