kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
10,270 Commits 2 Branches 91 Tags 22 MiB
Commit Graph

5095 Commits

Author SHA1 Message Date
Jean-Philippe Lang 1b20fa3b49 Merged r13018 (#16466). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@13028 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-03-29 14:54:06 +00:00
Jean-Philippe Lang d05cbf4df8 Merged r12896 (#16081). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12946 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-03-02 09:30:35 +00:00
Jean-Philippe Lang e9e0ffb6dd Merged r12941 (#16161). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12943 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-28 12:53:34 +00:00
Jean-Philippe Lang 40abbfa82d Backported r12938 (#16169). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12940 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-28 11:40:02 +00:00
Jean-Philippe Lang c47aacd6b0 Merged r12736 (#15977). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12860 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-08 07:58:49 +00:00
Jean-Philippe Lang 287bcacd81 Merged r12848 (#16032). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12853 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-07 08:09:36 +00:00
Jean-Philippe Lang d6b718b43c Merged r12844 (#16038). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12852 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-07 08:06:38 +00:00
Jean-Philippe Lang b8ffc995c1 Merged r12745 (#15870). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12847 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-06 18:00:37 +00:00
Jean-Philippe Lang a11aec0d4c Merged r12660 (#13544). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12845 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-06 17:58:24 +00:00
Jean-Philippe Lang aacaa9da8e Merged r12438 (#15735). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12444 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-12-22 14:48:46 +00:00
Jean-Philippe Lang 36c35080b2 Merged r12419. 
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12434 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-12-21 11:26:01 +00:00
Jean-Philippe Lang beed3c5746 Merged r12420 (#15684). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12433 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-12-21 11:25:25 +00:00
Jean-Philippe Lang fa2b39bf73 Merged r12415 (#15677). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12432 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-12-21 11:24:41 +00:00
Jean-Philippe Lang c295f67329 Merged r12414 (#15623). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12431 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-12-21 11:23:58 +00:00
Jean-Philippe Lang 624b0071ad Merged r12349 (#15523). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12430 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-12-21 11:23:12 +00:00
Jean-Philippe Lang 8ea273d427 Merged r12309 (#15398). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12429 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-12-21 11:21:59 +00:00
Toshi MARUYAMA 64a72f2ea2 Merged r12273 from trunk to 2.4-stable. 
Fixed uninitialized constant Redmine::Scm::Adapters::CommandFailed error when reloading in development mode.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12389 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-12-09 05:44:08 +00:00
Jean-Philippe Lang bf3d9f0851 Merged r12310 (#15414). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12313 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-11-23 08:24:00 +00:00
Jean-Philippe Lang a74ffeff07 Merged r12311 (#15427). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12312 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-11-22 23:28:12 +00:00
Jean-Philippe Lang 4710cd8e6f Merged r12265, r12268, r12272 (#15307). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12282 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-11-16 07:48:27 +00:00
Jean-Philippe Lang a435ca7278 Merged r12278 (#15311). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12281 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-11-15 20:35:37 +00:00
Jean-Philippe Lang c462a8790e Merged r12277 (#15344). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12280 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-11-15 20:33:35 +00:00
Jean-Philippe Lang 6628610ed6 Merged r12267. 
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12271 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-11-11 21:41:10 +00:00
Jean-Philippe Lang bff12254ac Custom fields in issue form - splitting is incorrect (#15227). 
git-svn-id: http://svn.redmine.org/redmine/trunk@12251 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-11-09 11:19:06 +00:00
Jean-Philippe Lang d89c968bb1 Accept issue id with leading sharp when adding a related issue. 
git-svn-id: http://svn.redmine.org/redmine/trunk@12250 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-11-09 11:09:50 +00:00
Jean-Philippe Lang f4aff7919a Log errors when moving attachments (#15295). 
git-svn-id: http://svn.redmine.org/redmine/trunk@12249 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-11-09 09:46:55 +00:00
Jean-Philippe Lang 10e29f2223 Accept custom field format added at runtime (#15277). 
Patch by Boris Bera.

git-svn-id: http://svn.redmine.org/redmine/trunk@12248 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-11-09 09:07:48 +00:00
Jean-Philippe Lang 71b43ea1c7 Wiki Pages REST API with version returns wrong comments (#15235). 
Patch by Yukinari TOYOTA.

git-svn-id: http://svn.redmine.org/redmine/trunk@12245 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-11-09 07:42:54 +00:00
Jean-Philippe Lang ba083225b7 Return to section anchor after wiki section edit (#15182). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12239 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-10-26 09:03:08 +00:00
Jean-Philippe Lang e162f87964 Replaces <option value=""></option> which is not HTML5 valid (#15191). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12237 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-10-26 08:08:45 +00:00
Jean-Philippe Lang 711982b7b3 Prevents duplicate element ids (#15191). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12236 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-10-26 07:17:02 +00:00
Jean-Philippe Lang 3578cf4d9a Replaced acronym with abbr tags (#15191). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12235 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-10-26 07:15:08 +00:00
Toshi MARUYAMA 3109ed9320 code format cleanup app/models/changeset.rb 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12231 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-10-24 05:40:32 +00:00
Toshi MARUYAMA 16b94e126b code format cleanup app/models/issue.rb 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12230 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-10-24 05:40:21 +00:00
Jean-Philippe Lang b48fcdaa97 Avoid a query if enabled_modules association is already loaded (#15058). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12228 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-10-20 16:04:04 +00:00
Jean-Philippe Lang 99bf8c95ab Fixed that issue nested set update is triggered even if parent is not changed (#15135). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12226 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-10-20 09:25:14 +00:00
Jean-Philippe Lang 13e381d31d Projects selection on custom field form (#15136). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12225 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-10-20 08:29:55 +00:00
Jean-Philippe Lang 3172359f97 Avoid N queries when displaying the issue list with custom fields. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12223 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-10-15 16:38:17 +00:00
Jean-Philippe Lang 699317e12e Adds some links for wiki history navigation. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12221 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-10-14 16:58:39 +00:00
Jean-Philippe Lang 5f747faa58 Fixed that viewing/editing a wiki page without WikiContent raises an error (#14986). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12220 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-10-13 11:19:47 +00:00
Jean-Philippe Lang 94e7df78ca Fixed that controller_issues_edit_before/after_save hooks have no controller context (#15044). 
Patch by Jordan Hollinger.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12219 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-10-13 10:31:04 +00:00
Jean-Philippe Lang 7bea176cdb Avoid lots of CustomField.find_by_id calls when displaying an issue history with custom fields (#15072). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12217 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-10-13 10:04:59 +00:00
Jean-Philippe Lang 60d6e16978 Fixed that non array commit_update_keywords raises an error (#7590). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12216 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-10-13 10:03:13 +00:00
Jean-Philippe Lang 176ce78574 Fixed that the mail method should return a Mail::Message (#15113). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12210 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-10-13 07:58:33 +00:00
Jean-Philippe Lang b6cb7aa8e3 Ability to define commit keywords per tracker (#7590). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12208 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-10-13 07:37:49 +00:00
Toshi MARUYAMA b8aa4da28a remove unneeded "require 'diff'" from WikiController (#15105) 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12207 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-10-11 17:37:51 +00:00
Jean-Philippe Lang cfc65d9397 NoMethodError when uploading a file without logger (#14977). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12202 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-10-05 11:37:57 +00:00
Jean-Philippe Lang 3f566d6042 Hide issue custom fields when disabling issue tracking on new project. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12200 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-10-05 10:45:43 +00:00
Jean-Philippe Lang 7b1b605ae8 Don't update issues nor log time when importing old changesets (#4823). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12199 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-10-05 10:33:03 +00:00
Jean-Philippe Lang 0444ecca3c Pass the commit keyword used to update the issue to the plugin hook. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12198 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-10-05 10:02:31 +00:00