Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-02-02 04:40:06 +01:00
Code Issues Packages Projects Releases Activity
11,054 Commits 35 Branches 225 Tags
89e386ea0cd73ce043ab82e092551252f42b08c2
Commit Graph

11054 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Philippe Lang
89e386ea0c Merged r13557 (#17744). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13629 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-22 10:34:25 +00:00
Jean-Philippe Lang
fa4b6f294b Merged r13556 (#13673). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13628 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-22 10:33:16 +00:00
Jean-Philippe Lang
7436169bd1 Merged r13555 (#13608). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13627 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-22 10:31:35 +00:00
Toshi MARUYAMA
672dbf418e 2.6-stable: Gemfile: update Rails to 3.2.21 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13612 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-18 11:13:57 +00:00
Toshi MARUYAMA
1a6b7e2a60 Merged r13531 from trunk to 2.6-stable (#18252) 
Japanese wiki_syntax_detailed.html translation updated by Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13532 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-01 07:39:12 +00:00
Toshi MARUYAMA
f716688eef 2.6-stable: Gemfile: update Rails to 3.2.20 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13530 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-31 04:15:01 +00:00
Toshi MARUYAMA
83d55b40af Merged r13506 from trunk to 2.6-stable (#18176) 
Gemfile: update rbpdf to version 1.18.2.

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13507 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-25 07:39:41 +00:00
Toshi MARUYAMA
008516e47d Merged r13493 from trunk to 2.6-stable (#18156) 
Spanish wiki_syntax.html translation updated by Jesus Gutierrez de la Vega.

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13494 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-23 01:52:15 +00:00
Toshi MARUYAMA
6b3e62e57a Merged r13479 from trunk to 2.6-stable (#18157) 
German translation updated by Gundolf Dampf.

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13481 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-22 09:40:24 +00:00
Toshi MARUYAMA
c1fb0a73bb Merged r13478 from trunk to 2.6-stable (#18156) 
Spanish translation updated by Jesus Gutierrez de la Vega.

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13480 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-22 09:40:14 +00:00
Jean-Philippe Lang
05c2cea56f Merged r13471. 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13472 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-21 18:59:33 +00:00
Jean-Philippe Lang
178c7dab80 Merged r13464 (#18144). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13465 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-20 21:23:15 +00:00
Jean-Philippe Lang
3a0a55c8ba Merged r13451 (#18119). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13463 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-20 21:11:08 +00:00
Jean-Philippe Lang
778625de9a Merged r13450 (#18110). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13462 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-20 21:10:32 +00:00
Toshi MARUYAMA
5bbcc0698a Merged r13458 from trunk to 2.6-stable (#13781) 
pdf: define "general_pdf_fontname" at i18n yaml for multilingual environment.

Contributed by Jun NAITOH.

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13460 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-20 06:36:40 +00:00
Toshi MARUYAMA
ebd3435cc7 Merged r13457 from trunk to 2.6-stable (#14491) 
use deep_dup to prevent losing mail receiving options.

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13459 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-20 06:36:05 +00:00
Toshi MARUYAMA
93d43cfc94 Merged r13439 from trunk to 2.6-stable (#18069) 
Japanese translation updated by Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13440 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-12 13:56:35 +00:00
Jean-Philippe Lang
0b34d5e365 Set version to stable. 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13438 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-12 13:04:16 +00:00
Jean-Philippe Lang
32f67a5f73 Added 2.6-stable branch. 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13437 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-12 13:02:26 +00:00
Jean-Philippe Lang
6d10e8cd13 Set version to 2.6.0. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13436 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-12 13:02:03 +00:00
Toshi MARUYAMA
6ac8507b3b MailHandler: Don't use String#respond_to?(:force_encoding) (#18047) 
Contributed by Felix Schäfer.

git-svn-id: http://svn.redmine.org/redmine/trunk@13432 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-08 14:59:21 +00:00
Toshi MARUYAMA
bfe7997e38 remove unneeded instance variable assignment from ProjectNestedSetTest 
git-svn-id: http://svn.redmine.org/redmine/trunk@13430 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-08 14:20:34 +00:00
Jean-Philippe Lang
85f2074aff Reverts change in r13428, project can't be found by identifier (#17959). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13429 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-05 13:24:24 +00:00
Jean-Philippe Lang
74cd72a2d9 Fixed that preview doesn't show notes when issue project is changed (#17959). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13428 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-05 13:18:55 +00:00
Jean-Philippe Lang
a567546335 Don't link multiple changesets from the same commit multiple times (#17931). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13427 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-05 12:10:33 +00:00
Jean-Philippe Lang
8b678837a3 Adds a test for adding a group membership with the REST API (#17904). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13426 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-04 09:46:50 +00:00
Jean-Philippe Lang
8b998ec05b Adds css classes to get sort order on the issue list (#17993). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13425 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-04 09:36:35 +00:00
Jean-Philippe Lang
2e9b28906d Removes routes for time entries nested under project/issues. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13424 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-04 09:14:17 +00:00
Jean-Philippe Lang
efdf2584b6 Adds a link to /time_entries/new from My Page Spent Time block (#17955). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13423 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-04 07:26:48 +00:00
Jean-Philippe Lang
15d5c331eb Let the new time_entry form be submitted without project (#17954). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13422 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-04 07:23:14 +00:00
Toshi MARUYAMA
1232f0670e Traditional Chinese translation updated by ChunChang Lo (#18002) 
git-svn-id: http://svn.redmine.org/redmine/trunk@13421 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-01 07:22:38 +00:00
Jean-Philippe Lang
86a33395db Fixed test failure with ruby1.8.7 and postgresql (#17976). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13420 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-09-30 20:41:15 +00:00
Toshi MARUYAMA
105cc74b00 Bulgarian translation updated by Ivan Cenov (#17992) 
git-svn-id: http://svn.redmine.org/redmine/trunk@13419 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-09-29 11:15:29 +00:00
Jean-Philippe Lang
d2837bc187 Adds locales strings (#17976). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13418 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-09-28 14:51:42 +00:00
Jean-Philippe Lang
7e7ac5340a Adds buit-in groups to give specific permissions to anonymous and non members users per project (#17976). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13417 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-09-28 14:51:08 +00:00
Toshi MARUYAMA
9a7fb0ad7b import jQuery Datepicker i18n files version 1.11.1 
874945e66d

git-svn-id: http://svn.redmine.org/redmine/trunk@13416 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-09-27 05:22:10 +00:00
Toshi MARUYAMA
5ce32798f2 rename jQuery Datepicker i18n file name 
jquery-ui renamed these files.
21154cfa2e

git-svn-id: http://svn.redmine.org/redmine/trunk@13415 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-09-27 05:14:53 +00:00
Jean-Philippe Lang
8ae41b4846 Ignore email keywords after truncation line (#8758). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13413 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-09-20 07:51:37 +00:00
Jean-Baptiste Barth
b519aba63e Expire other sessions on password change (#17796). 
Contributed by Jan Schulz-Hofen.


git-svn-id: http://svn.redmine.org/redmine/trunk@13412 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-09-16 21:38:54 +00:00
Jean-Baptiste Barth
e632a79d59 Add a constraint on "shoulda-matchers" version (#17828). 
This helps bundler find its dependencies in case shoulda-matchers v1.4.2 is
already installed. In such a case bundler breaks while it shouldn't.


git-svn-id: http://svn.redmine.org/redmine/trunk@13411 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-09-16 21:17:29 +00:00
Toshi MARUYAMA
5a96012ad0 remove trailing white-space from app/models/issue_custom_field.rb 
git-svn-id: http://svn.redmine.org/redmine/trunk@13410 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-09-16 02:54:12 +00:00
Toshi MARUYAMA
a614678835 Gemfile: update rbpdf version to 1.18.1 (#17570) 
git-svn-id: http://svn.redmine.org/redmine/trunk@13409 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-09-16 02:18:48 +00:00
Toshi MARUYAMA
cc688bb1b1 Backport r13313 from rails-4.1 to trunk. 
Upgrade to JQuery 1.11.1

git-svn-id: http://svn.redmine.org/redmine/trunk@13408 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-09-14 14:17:52 +00:00
Toshi MARUYAMA
0b8645007f Backport r13315 from rails-4.1 to trunk. 
Use .on() instead of .live().

git-svn-id: http://svn.redmine.org/redmine/trunk@13407 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-09-14 14:16:56 +00:00
Toshi MARUYAMA
98589f0ecd stricter check of uploading attachments (#17581) 
Contributed by fred bregar.

git-svn-id: http://svn.redmine.org/redmine/trunk@13404 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-09-14 13:44:24 +00:00
Jean-Philippe Lang
5ccbe10d10 Code cleanup (#17717). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13403 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-09-14 11:38:52 +00:00
Jean-Philippe Lang
d444dc61af Lowering configuration.example.yml confusion (#17492) 
git-svn-id: http://svn.redmine.org/redmine/trunk@13402 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-09-14 11:32:10 +00:00
Jean-Philippe Lang
abbe06a98e Long strings such as URL break out of box (#17322). 
Patch by Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/trunk@13401 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-09-14 10:47:24 +00:00
Jean-Philippe Lang
51db15ac61 Parent issue autocomplete does not follow to the "Allow cross-project subtasks" setting (#14281). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13400 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-09-14 10:42:31 +00:00
Jean-Philippe Lang
1a9f4c8014 Long hyperlinks inserted in task description breaks right frame boundary (#12580). 
Patch by Go MAEDA.


git-svn-id: http://svn.redmine.org/redmine/trunk@13399 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-09-14 09:49:02 +00:00