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

2166 Commits

Author SHA1 Message Date
Jean-Philippe Lang
9bdcf3f603 Merged r14237 (#19735). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14255 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-05-10 07:30:50 +00:00
Jean-Philippe Lang
232ddd0756 Backported r14179 (#19569). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14211 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-04-25 07:44:57 +00:00
Jean-Philippe Lang
fea9353152 Merged r14164 (#19538). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14200 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-04-25 07:20:53 +00:00
Jean-Philippe Lang
94d91e75f5 Merged r14156 and r14161 (#19400). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14198 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-04-25 07:18:20 +00:00
Jean-Philippe Lang
1154fd33bf Merged r14142 and r14143 (#19400). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14148 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-03-21 08:29:59 +00:00
Jean-Philippe Lang
2b83ffe284 Backported r14137 (#19297). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14139 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-03-20 09:52:00 +00:00
Toshi MARUYAMA
e580d565eb 2.6-stable: fix unit test on Ruby 1.8.7 (#19305) 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14119 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-03-16 04:55:45 +00:00
Jean-Philippe Lang
2bfeaf886e Merged r14112 (#19305). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14114 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-03-15 18:13:58 +00:00
Jean-Philippe Lang
7783d7557f Merged r14108 (#19348). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14110 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-03-15 14:08:00 +00:00
Jean-Philippe Lang
c7510519e2 Redcarpet not available with jruby (#19313). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14105 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-03-15 10:08:04 +00:00
Jean-Philippe Lang
ae1e3980b0 Merged r14080 (#19313). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14089 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-03-14 14:59:13 +00:00
Jean-Philippe Lang
9da5692aee Merged r14050 (#19260). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14059 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-03-08 09:42:51 +00:00
Jean-Philippe Lang
223ffd50d5 Merged r14049 (#19197). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14057 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-03-08 09:41:42 +00:00
Jean-Philippe Lang
3ba5e24a91 Copyright update in 2.6-stable. 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13873 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-11 09:12:51 +00:00
Toshi MARUYAMA
158a01f2b7 2.6-stable: fix r13807 on Ruby 1.8.7 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13817 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-12-26 16:06:44 +00:00
Jean-Philippe Lang
4da6874d05 Reverts r13805 (#18679). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13809 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-12-26 11:43:59 +00:00
Jean-Philippe Lang
8238e66fb1 Merged r13807. 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13808 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-12-26 11:41:05 +00:00
Jean-Philippe Lang
279fae1c62 Merged r13786 and r13789 (#18679). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13805 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-12-26 10:48:17 +00:00
Jean-Philippe Lang
1e7de03fb5 Merged r13677 (#18501). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13801 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-12-26 10:43:15 +00:00
Jean-Philippe Lang
548e316898 Merged r13638 (#18060). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13642 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-23 08:44:39 +00:00
Jean-Philippe Lang
73edc3f59d Merged r13593 (#17705). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13634 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-22 10:42:59 +00:00
Jean-Philippe Lang
cf12814911 Merged r13592, r13594, r13599 (#18349). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13632 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-22 10:41:00 +00:00
Jean-Philippe Lang
cc2d5f61ab Backported r13560 and r13569 (#18280). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13631 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-22 10:39:09 +00:00
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
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
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
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
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
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
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
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-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
4fba4ca691 Fixed: Issues counters in roadmap only link to issues in the same project (#9660). 
Contributed by Sridhar Dhanapalan.

git-svn-id: http://svn.redmine.org/redmine/trunk@13398 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-09-14 09:41:39 +00:00
Jean-Baptiste Barth
2eb95f41b4 Invalidate security tokens on password or email changes (#17717). 
Contributed by Jan Schulz-Hofen.


git-svn-id: http://svn.redmine.org/redmine/trunk@13396 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-09-14 08:22:25 +00:00
Toshi MARUYAMA
34beae1c7a add missing fixtures to TimeEntryActivityTest 
git-svn-id: http://svn.redmine.org/redmine/trunk@13386 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-09-12 13:40:07 +00:00
Toshi MARUYAMA
7e88c2a990 add missing fixtures to Redmine::VersionFieldFormatTest 
git-svn-id: http://svn.redmine.org/redmine/trunk@13385 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-09-12 13:39:58 +00:00
Toshi MARUYAMA
3170ffbf85 add missing fixtures to TimeEntryQueryTest 
git-svn-id: http://svn.redmine.org/redmine/trunk@13381 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-09-12 07:37:45 +00:00
Toshi MARUYAMA
d4d124eb0e add missing fixtures to Redmine::UserFieldFormatTest 
git-svn-id: http://svn.redmine.org/redmine/trunk@13379 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-09-12 04:03:01 +00:00
Toshi MARUYAMA
652ea628ad add missing fixtures to CustomFieldTest 
git-svn-id: http://svn.redmine.org/redmine/trunk@13374 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-09-11 17:19:33 +00:00
Jean-Baptiste Barth
d00f875800 Make 2nd parameter optional in User#allowed_to_globally? for consistency (#6498). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13364 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-09-06 03:39:52 +00:00
Jean-Baptiste Barth
8c945fb791 Honnor committers/users mapping in repository statistics (#13487). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13353 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-08-26 17:32:01 +00:00
Jean-Baptiste Barth
fc99c1851f Fix text failing on some rubies/sql drivers because of improper length in Change#action (#13487). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13352 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-08-26 17:15:55 +00:00
Jean-Baptiste Barth
41bf39df36 Move some RepositoriesController logic to Repository#stats_by_author (#13487). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13351 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-08-26 13:58:58 +00:00
Jean-Baptiste Barth
1617ee7bd8 Add a warning if two plugins have the same settings partial name (#14008). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13336 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-08-13 04:56:44 +00:00
Jean-Philippe Lang
41e7210210 Fixed an error when member's project is nil (#17486). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13334 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-07-29 17:49:53 +00:00
Toshi MARUYAMA
d2b505b2c3 add missing fixtures to ChangesetTest 
git-svn-id: http://svn.redmine.org/redmine/trunk@13332 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-07-16 03:37:31 +00:00
Jean-Philippe Lang
9f7901e364 Fixed that query roles are not copied when copying a project (#17202). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13329 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-07-14 16:20:44 +00:00
Jean-Philippe Lang
2e04614e21 Don't prepend project name if the version is not shared. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13325 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-07-14 11:26:29 +00:00