Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-02-04 21:59:57 +01:00
Code Issues Packages Projects Releases Activity
11,150 Commits 35 Branches 225 Tags
6f01582c61bb85fdf41aa49dca285bcaeb3ad8bd
Commit Graph

1932 Commits

Author SHA1 Message Date
Jean-Philippe Lang
09fdc1fcf1 Merged r14267 (#19840). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14280 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-05-30 08:11:05 +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
Jean-Philippe Lang
eabda2f745 Merged r14115 (#19305). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14116 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-03-15 20:26:34 +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
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
Jean-Philippe Lang
7ca5df0836 Merged r13787 (#18667). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13803 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-12-26 10:46:29 +00:00
Jean-Philippe Lang
60d9dba5af Merged r13784 (#14699). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13798 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-12-26 10:41: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
Toshi MARUYAMA
6ddae89aff 2.6-stable: fix syntax error on Ruby 1.8.7 (#18280) 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13640 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-22 13:45:35 +00:00
Jean-Philippe Lang
f295623267 Merged r13625 (#18410). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13637 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-22 10:54:41 +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
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
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
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
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
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
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-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
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
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
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-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
Jean-Philippe Lang
e124da5488 Fixed: Files assigned to a version can not be deleted if Issue Tracking module is disabled (#17163). 
Patch by Michael Esemplare.

git-svn-id: http://svn.redmine.org/redmine/trunk@13390 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-09-13 10:17:15 +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
c190496f24 Fix syntax for ruby 1.8.7 (#13487). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13362 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-08-31 17:36:06 +00:00
Jean-Baptiste Barth
ad9a35c6b9 Optimize committers/users map retrieval for statistic graphs (#13487). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13361 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-08-31 17:23:48 +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
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
Toshi MARUYAMA
64255dc663 remove unneeded setting self[left_column_name] and self[right_column_name] from Issue#update_nested_set_attributes_on_parent_change (#6579) 
git-svn-id: http://svn.redmine.org/redmine/trunk@13345 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-08-23 05:45:49 +00:00
Jean-Philippe Lang
efc05bc73c Add time entries custom fields to the context menu for quick bulk edit (#17484). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13335 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-07-29 17:52:27 +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
Jean-Philippe Lang
2a4fdf6755 WARNING: Can't mass-assign protected attributes: user_id, type. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13330 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-07-14 16:21:17 +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
Toshi MARUYAMA
d29799712f remove unneeded statement from Issue#parent_issue_id= 
git-svn-id: http://svn.redmine.org/redmine/trunk@13303 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-07-13 00:04:23 +00:00
Toshi MARUYAMA
c2e75254b7 remove trailing white-spaces from app/models/user.rb 
git-svn-id: http://svn.redmine.org/redmine/trunk@13287 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-07-11 08:04:52 +00:00
Toshi MARUYAMA
1b01a7ab5e remove trailing white-space from app/models/workflow_permission.rb 
git-svn-id: http://svn.redmine.org/redmine/trunk@13209 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-07-03 23:03:39 +00:00
Toshi MARUYAMA
45a744d77d use \A instead of ^ for RegExp (#16190) 
git-svn-id: http://svn.redmine.org/redmine/trunk@13207 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-07-02 16:13:33 +00:00
Toshi MARUYAMA
4b55bb913c only ignore undesirable Auto-Submitted headers defined in RFC3834 (#16190) 
Contributed by Felix Schäfer.

git-svn-id: http://svn.redmine.org/redmine/trunk@13206 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-07-02 16:13:18 +00:00
Toshi MARUYAMA
d0c741c88c remove redundant empty lines from app/models/auth_source_ldap.rb 
git-svn-id: http://svn.redmine.org/redmine/trunk@13169 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-25 14:37:56 +00:00
Toshi MARUYAMA
5368af4847 replace tabs to spaces (#16795) 
git-svn-id: http://svn.redmine.org/redmine/trunk@13142 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-24 10:15:43 +00:00
Jean-Philippe Lang
1fd5346c3c Fixed that Member#destroy triggers after_destroy callbacks twice (#16795). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13140 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-24 09:55:39 +00:00