Commit Graph

3601 Commits

Author SHA1 Message Date
Toshi MARUYAMA 5b1073095a Merged r12367 and r12368 from trunk to 2.4-stable
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12369 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-12-07 03:51:26 +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 b5a605c808 Fixed UI tests.
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12286 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-11-16 08:45:02 +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
Toshi MARUYAMA 303fdc2913 remove trailing white-spaces from test/unit/project_members_inheritance_test.rb
git-svn-id: http://svn.redmine.org/redmine/trunk@12255 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-11-09 16:47:40 +00:00
Toshi MARUYAMA 44012ec6c6 remove trailing white-spaces from test/unit/query_test.rb
git-svn-id: http://svn.redmine.org/redmine/trunk@12253 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-11-09 13:10:19 +00:00
Toshi MARUYAMA 979d3400ab remove trailing white-spaces from test/unit/setting_test.rb
git-svn-id: http://svn.redmine.org/redmine/trunk@12252 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-11-09 12:48:19 +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 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 1871378648 Gantt: sort versions like on the roadmap (#7335).
git-svn-id: http://svn.redmine.org/redmine/trunk@12247 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-11-09 08:54:45 +00:00
Jean-Philippe Lang 3661766edc Upgrade to Rails 3.2.15.
git-svn-id: http://svn.redmine.org/redmine/trunk@12246 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-11-09 07:51:00 +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 918ec276f1 Fixed test failure (#15182).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12240 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-10-26 11:50:16 +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 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
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
Toshi MARUYAMA 4eea64d38f remove trailing white-spaces from test/unit/user_test.rb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12224 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-10-17 01:00:04 +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 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 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 e7bc6364e1 add unit test of Redmine::Helpers::Diff (#15105)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12205 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-10-11 17:37:25 +00:00
Toshi MARUYAMA 53d749eb79 remove trailing white space from test/unit/wiki_content_test.rb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12204 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-10-10 03:56:54 +00:00
Jean-Philippe Lang 1b63553dd4 Rows may not be oredered as expected with ruby1.8 (#4911).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12201 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-10-05 10:58:33 +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 a77b462a53 Support for multiple issue update keywords/rules in commit messages (#4911).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12197 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-10-05 09:41:11 +00:00
Jean-Philippe Lang f399b31eff Test broken by r12192 (#2199).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12193 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-09-30 22:17:27 +00:00
Jean-Philippe Lang e35640f3e8 Allows user to clear dates and text fields when bulk editing issues (#2199).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12192 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-09-30 19:27:00 +00:00
Jean-Philippe Lang 481a1311b7 Adds a project specific css class to body (#14767).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12170 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-09-29 15:34:25 +00:00
Jean-Philippe Lang cfc05d310e Exclude attachments from incoming emails based on file name (#3413).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12167 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-09-29 11:50:49 +00:00
Jean-Philippe Lang 886284b33f REST API: custom fields definition (#11159).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12165 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-09-29 10:08:30 +00:00
Toshi MARUYAMA 11ae71c5b9 remove trailing white-space from test/functional/repositories_bazaar_controller_test.rb (#14931)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12157 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-09-18 14:37:25 +00:00
Toshi MARUYAMA 5aa8358f97 scm: fix annotate error with non ASCII author on Ruby 1.9 and Ruby 2.0 (#14931)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12156 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-09-18 14:22:44 +00:00
Toshi MARUYAMA 120689e7cb scm: bazaar: update test repository for non ASCII author (#14931)
* run "bzr branch --no-tree branch00 author_non_ascii"
* add revision to this branch

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12155 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-09-18 14:22:32 +00:00
Toshi MARUYAMA bf0676e17a scm: git: fix indents of non ASCII path annotate test (#14931)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12153 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-09-18 13:23:09 +00:00
Toshi MARUYAMA 9c9b5e471c use assert_select instead of assert_tag in Git non ASCII path annotate test (#14931)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12150 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-09-18 10:36:38 +00:00
Toshi MARUYAMA 8b794b5e83 scm: bazaar: add test for author html escaping (#14931)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12148 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-09-18 10:13:16 +00:00
Toshi MARUYAMA ef87b1cee4 scm: bazaar: update test repository for author html escaping (#14931)
* run "bzr branch --no-tree branch00 author_escaping"
* add revision to this branch

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12147 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-09-18 10:13:05 +00:00
Toshi MARUYAMA 23c56501de scm: bazaar: split REPOSITORY_PATH to trunk in functional test (#14931)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12146 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-09-18 10:12:53 +00:00
Toshi MARUYAMA 9002477006 scm: git: use "--encoding=UTF-8" for blame (#14931)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12143 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-09-18 06:16:55 +00:00
Toshi MARUYAMA da87e4b1ef scm: git: change non ASCII user name variable to instance variable (#14931)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12142 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-09-18 06:16:43 +00:00
Toshi MARUYAMA eaf05a87b4 use assert_select instead of assert_tag in Bazaar annotate test (#14931)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12141 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-09-18 05:44:41 +00:00
Toshi MARUYAMA 72e48e6a68 use assert_select instead of assert_tag in Mercurial annotate test (#14931)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12140 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-09-18 05:01:35 +00:00
Toshi MARUYAMA 435df86757 fix test failure (#14931)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12139 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-09-18 04:19:27 +00:00
Jean-Philippe Lang 59b935aa46 Filters show issues with unused custom fields (#13537).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12133 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-09-13 17:41:54 +00:00
Jean-Philippe Lang ae7304dd00 Test for #14798.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12132 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-09-11 22:00:40 +00:00