Commit Graph

4012 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
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
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
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
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
87816ea9e1 Merged r14015 (#19065).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14024 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-02-18 11:42:11 +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
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
a673d1f553 Merged r13860 (#18782).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13868 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-01-10 21:12:42 +00:00
Jean-Philippe Lang
0c78d2cd8c Merged r13861 and r13862 (#18789).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13867 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-01-10 21:12:07 +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
049db4923c Fixed order syntax for Rails 3 (#18667).
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13810 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-12-26 11:46:34 +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
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
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
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
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
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
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
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
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