Commit Graph

5444 Commits

Author SHA1 Message Date
Jean-Philippe Lang
dc724dfc51 Merged r14389 (#20203).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14402 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-07-05 10:30:21 +00:00
Jean-Philippe Lang
f745102e4d Merged r14381.
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14384 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-06-28 09:19:25 +00:00
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
84a40b16f1 Merged r14268 (#19815).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14278 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-05-30 08:09:48 +00:00
Jean-Philippe Lang
30e1513b23 Merged r14239 and r14240 (#19706).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14254 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-05-10 07:29:40 +00:00
Jean-Philippe Lang
e57b796617 Merged r14245 (#19655).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14253 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-05-10 07:26:52 +00:00
Jean-Philippe Lang
b51dfd414b Merged r14242 (#18580).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14252 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-05-10 07:25:38 +00:00
Jean-Philippe Lang
094e772897 Merged r14160 (#19580).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14212 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-04-25 07:46:28 +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
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
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
35c01b3b12 Merged r13922 (#18896).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14021 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-02-18 11:34:25 +00:00
Jean-Philippe Lang
a5a7c62b69 Merged r13921 (#18894).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14020 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-02-18 11:33:40 +00:00
Jean-Philippe Lang
f2732bc942 Merged r14014 (#17722).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14018 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-02-18 11:29:57 +00:00
Jean-Philippe Lang
a1f40686ba Merged r14016 (#19117).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14017 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-02-17 18:00:24 +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
f2ee9ccb1b Merged r13852 and r13853 (#18769).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13866 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-01-10 21:10:18 +00:00
Toshi MARUYAMA
a845524180 Merged r13836 from trunk to 2.6-stable
remove duplicated :remote key from app/views/messages/show.html.erb

Ruby 2.2 shows warning.

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13838 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-01-04 04:48:03 +00:00
Toshi MARUYAMA
3955c60357 Merged r13835 from trunk to 2.6-stable
remove duplicated :id key from app/views/timelog/report.html.erb

Ruby 2.2 shows warning.

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13837 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-01-04 04:47:55 +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
3c7aa17b5c Merged r13785 (#18665).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13802 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-12-26 10:45:18 +00:00
Jean-Philippe Lang
baa9469c9b Merged r13670 (#18499).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13800 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-12-26 10:42:41 +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
ebde5a5f90 Merged r13486 to r13489 and r13492 (#8817).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13635 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-11-22 10:44:30 +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
da1247ac65 Merged r13477 (#18051).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13633 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-11-22 10:41:48 +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
2d612f32b7 Merged r13562 (#18269).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13630 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-11-22 10:35:38 +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
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
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
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
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
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