1
0
mirror of https://github.com/meineerde/redmine.git synced 2026-03-11 03:33:07 +00:00

13389 Commits

Author SHA1 Message Date
Jean-Philippe Lang
e57b5ddbcc Merged r16808 (#26387).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16818 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-07-16 11:48:44 +00:00
Jean-Philippe Lang
7e9805aa95 Merged r16812 (#26393).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16817 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-07-16 11:47:55 +00:00
Jean-Philippe Lang
6e16ab0c60 Merged r16779.
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16780 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-07-09 07:17:52 +00:00
Jean-Philippe Lang
66f6bf0e8d Merged r16766 to r16768 (#26376).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16771 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-07-08 12:56:27 +00:00
Jean-Philippe Lang
8e9ce2dbee Merged r16764 (#26364).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16765 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-07-06 16:53:10 +00:00
Jean-Philippe Lang
0705c839d9 Merged r16762 (#26350).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16763 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-07-06 16:45:34 +00:00
Jean-Philippe Lang
bc42405d7f Merged r16760 (#26325).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16761 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-07-06 16:43:25 +00:00
Toshi MARUYAMA
7ac7c600e0 Merged r16756 from trunk to 3.4-stable (#26365)
Traditional Chinese translation for 3.4-stable updated by ChunChang Lo.

git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16759 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-07-06 05:01:08 +00:00
Toshi MARUYAMA
9256159d2a Merged r16754 from trunk to 3.4-stable (#26344)
Bulgarian translation for 3.4-stable updated by Ivan Cenov.

git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16758 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-07-06 05:00:58 +00:00
Jean-Philippe Lang
cd491f5ac4 Merged r16747.
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16748 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-07-02 11:57:55 +00:00
Jean-Philippe Lang
53cf7233f4 Merged r16740 (#25616).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16741 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-07-02 11:51:11 +00:00
Jean-Philippe Lang
a3eb6bf1f7 Merged r16738 (#26310, #25988).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16739 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-07-02 10:00:07 +00:00
Toshi MARUYAMA
2f23c70713 Merged r16736 from trunk to 3.4-stable (#26312).
Remove duplicate notifiable require.

This duplication was introduced as part of r10909.

Contributed by Mischa The Evil.

git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16737 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-07-02 07:18:58 +00:00
Toshi MARUYAMA
8321fe9a84 Merged r16734 from trunk to 3.4-stable (#26311).
Update remaining copyrights.

git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16735 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-07-02 07:11:56 +00:00
Toshi MARUYAMA
367d955974 Merged r16730 from trunk to 3.4-stable (#26266)
Russian translation for 3.4-stable updated by Alexander Ryabinovskiy.

git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16733 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-06-30 05:27:10 +00:00
Toshi MARUYAMA
dd28523d5f Merged r16729 from trunk to 3.4-stable (#26265)
Japanese wiki help translation updated by Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16732 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-06-30 05:26:57 +00:00
Jean-Philippe Lang
094588ffc9 Merged r16727.
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16728 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-06-28 20:14:53 +00:00
Jean-Philippe Lang
85131b5655 Merged r16721 (#7068).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16723 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-06-26 19:57:36 +00:00
Jean-Philippe Lang
f35b9a7968 Merged r16718 (#14790).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16719 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-06-26 19:31:25 +00:00
Toshi MARUYAMA
46d3d330f2 Merged r16710 from trunk to 3.4-stable (#26261)
Simplified Chinese translation for 3.4-stable updated by Steven Wong.

git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16714 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-06-26 13:04:11 +00:00
Toshi MARUYAMA
aa863b19b7 Merged r16709 from trunk to 3.4-stable (#26261, #26264)
Simplified Chinese translation for 3.3-stable updated by Steven Wong.

git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16713 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-06-26 13:03:59 +00:00
Toshi MARUYAMA
830f281962 Merged r16708 from trunk to 3.4-stable (#26261, #26263)
Simplified Chinese translation for 3.2-stable updated by Steven Wong.

git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16712 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-06-26 13:03:49 +00:00
Jean-Philippe Lang
e9eddce08c Merged r16705.
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16706 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-06-25 15:51:41 +00:00
Jean-Philippe Lang
2f57af6f8f Set version to 3.4 stable.
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16696 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-06-25 09:20:40 +00:00
Jean-Philippe Lang
2b6992399f Merged r16689 to r16693 (#21375, #26188).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16694 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-06-25 09:07:38 +00:00
Jean-Philippe Lang
7dd05eeb29 Add code doc for forum & news links (#26188).
Patch by Mischa The Evil.

git-svn-id: http://svn.redmine.org/redmine/trunk@16693 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-06-25 09:05:52 +00:00
Jean-Philippe Lang
fc7652d803 Fix code doc indentation (#26188).
Patch by Mischa The Evil.

git-svn-id: http://svn.redmine.org/redmine/trunk@16692 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-06-25 09:05:21 +00:00
Jean-Philippe Lang
551cd201f1 Add user link documentation (#26188).
Patch by Mischa The Evil.

git-svn-id: http://svn.redmine.org/redmine/trunk@16691 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-06-25 09:04:52 +00:00
Jean-Philippe Lang
229aa274f0 Fix typo in detailed Japanse textile doc (#26188).
Patch by Mischa The Evil.

git-svn-id: http://svn.redmine.org/redmine/trunk@16690 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-06-25 09:03:23 +00:00
Jean-Philippe Lang
6544ca3329 Complement external URL documentation (#21375).
Patch by Mischa The Evil.

git-svn-id: http://svn.redmine.org/redmine/trunk@16689 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-06-25 09:01:41 +00:00
Jean-Philippe Lang
74e854e267 Merged r16687 (#23310).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16688 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-06-25 08:53:43 +00:00
Jean-Philippe Lang
e89cb8829e Fix project jump box text when creating/editing a project (#23310).
git-svn-id: http://svn.redmine.org/redmine/trunk@16687 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-06-25 08:51:53 +00:00
Jean-Philippe Lang
323a0cea0c Created branch for 3.4.
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16686 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-06-25 08:44:44 +00:00
Jean-Philippe Lang
7fd04e1f8d Update copyright.
git-svn-id: http://svn.redmine.org/redmine/trunk@16685 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-06-25 08:40:31 +00:00
Toshi MARUYAMA
04fa679cb8 add test of email reminder in case of user language is 'auto' (#26247)
git-svn-id: http://svn.redmine.org/redmine/trunk@16682 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-06-23 16:46:05 +00:00
Toshi MARUYAMA
a528fc07f3 change Russian translation for "Estimated time" (#26180)
git-svn-id: http://svn.redmine.org/redmine/trunk@16681 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-06-22 13:36:52 +00:00
Toshi MARUYAMA
6def4625d5 Japanese translation updated by Go MAEDA (#26187)
git-svn-id: http://svn.redmine.org/redmine/trunk@16680 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-06-19 05:39:41 +00:00
Toshi MARUYAMA
ba0b635b1e generate i18n keys (#26035)
git-svn-id: http://svn.redmine.org/redmine/trunk@16679 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-06-19 05:39:30 +00:00
Toshi MARUYAMA
2b24a617e1 code layout cleanup test/unit/custom_field_test.rb
git-svn-id: http://svn.redmine.org/redmine/trunk@16678 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-06-19 05:38:48 +00:00
Toshi MARUYAMA
741fff9956 code layout cleanup test/unit/mail_handler_test.rb
git-svn-id: http://svn.redmine.org/redmine/trunk@16677 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-06-19 05:38:36 +00:00
Jean-Philippe Lang
02a8442701 Use Nokogiri 1.7.2 if possible (#26183).
Patch by Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/trunk@16676 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-06-17 10:48:32 +00:00
Jean-Philippe Lang
7b6e6b9370 Removes plugins_path from configuration file (#24007).
git-svn-id: http://svn.redmine.org/redmine/trunk@16675 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-06-17 10:40:51 +00:00
Jean-Philippe Lang
557f8bf87a German translation for download (#26035).
Patch by Jan Schulz-Hofen.

git-svn-id: http://svn.redmine.org/redmine/trunk@16674 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-06-17 09:51:57 +00:00
Jean-Philippe Lang
580b591c57 Add download link to no preview message (#26035).
Patch by Jan Schulz-Hofen.

git-svn-id: http://svn.redmine.org/redmine/trunk@16673 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-06-17 09:51:19 +00:00
Jean-Philippe Lang
0a9b0dd46c Move download link to contextual area (#26035).
Patch by Jan Schulz-Hofen.

git-svn-id: http://svn.redmine.org/redmine/trunk@16672 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-06-17 09:49:41 +00:00
Jean-Philippe Lang
7017874cc9 Link to user by id (#4179).
Patch by Marius BALTEANU.

git-svn-id: http://svn.redmine.org/redmine/trunk@16671 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-06-17 08:48:23 +00:00
Jean-Philippe Lang
4120b59e10 Redmine::Plugin.directory is an absolute path (#24007).
git-svn-id: http://svn.redmine.org/redmine/trunk@16670 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-06-17 07:57:58 +00:00
Jean-Philippe Lang
2407bcba29 Reverts r16666 that prevents Redmine to start.
[!] There was an error parsing `Gemfile`: uninitialized constant Bundler::Dsl::R
edmine. Bundler cannot continue.

git-svn-id: http://svn.redmine.org/redmine/trunk@16669 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-06-17 07:50:01 +00:00
Jean-Philippe Lang
ca1fbf1ea1 Render all possible inline textile images even if an invalid one exists (#26157).
Patch by Holger Just.

git-svn-id: http://svn.redmine.org/redmine/trunk@16668 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-06-17 07:45:08 +00:00
Jean-Philippe Lang
5744bfc2c6 Removes duplicate shell_quote method (#26149).
Patch by Jens Krämer.

git-svn-id: http://svn.redmine.org/redmine/trunk@16667 e93f8b46-1217-0410-a6f0-8f06a7374b81
2017-06-17 07:42:54 +00:00