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

9009 Commits

Author SHA1 Message Date
Jean-Philippe Lang 5fe4aae7ba Non working days is an array of strings (#2161). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10749 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-10-29 10:19:40 +00:00
Jean-Philippe Lang 6b2e0333ca Filling locales (#2161). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10748 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-10-29 10:07:07 +00:00
Jean-Philippe Lang b71355f10b Ignore non-working days when rescheduling an issue (#2161). 
Weekly non-working days can be configured in application settings (set to saturday and sunday by default).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10747 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-10-29 10:06:30 +00:00
Jean-Philippe Lang 48d83884c3 Hard-coded "Back" on 404 view (#12231). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10745 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-10-28 20:42:18 +00:00
Jean-Philippe Lang fe690dcf20 Use page parameter instead of p for pagination. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10744 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-10-28 20:27:50 +00:00
Jean-Philippe Lang beb2610650 REST API for deleting wiki pages (#7082). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10743 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-10-28 20:17:38 +00:00
Toshi MARUYAMA 625eebb720 code cleanup scm_iconv (#12228) 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10742 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-10-28 11:39:43 +00:00
Toshi MARUYAMA 123d2b318f fix scm_iconv local variable name (#12228) 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10741 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-10-28 07:12:23 +00:00
Toshi MARUYAMA 5a2c80cb48 use String#encode at scm_iconv on Ruby 1.9 (#12228) 
Unit git adapter test fails on JRuby 1.7.

<pre>
Failure:
  <"test-Ü-2.txt">("UTF-8") expected but was
  <"test-\xC3\x9C-2.txt">("ASCII-8BIT").

  diff:
  - test-Ü-2.txt
  ?      ^
  + test-Ü-2.txt
  ?      ^^
test_entries_latin_1_files(GitAdapterTest)
test/unit/lib/redmine/scm/adapters/git_adapter_test.rb:468:in `test_entries_latin_1_files'
     465:         assert entries1
     466:         assert_equal 3, entries1.size
     467:         f1 = entries1[1]
  => 468:         assert_equal "test-#{@char_1}-2.txt", f1.name
     469:         assert_equal "latin-1-dir/test-#{@char_1}-2.txt", f1.path
     470:         assert_equal 'file', f1.kind
     471:       end
</pre>

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10740 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-10-28 06:19:29 +00:00
Toshi MARUYAMA a71ff93f8f fix JRuby 1.6 tests fail on CI server (#12228) 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10739 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-10-28 03:59:09 +00:00
Toshi MARUYAMA 49f2d4729d prevent rake task error on JRuby 1.7 (#12228) 
Following is "rake db:migrate RAILS_ENV=test" output
on jruby 1.7.0 (1.9.3p203) 2012-10-22 ff1ebbe on OpenJDK Client VM 1.6.0_18-b18 [linux-i386].

<pre>
ArgumentError: file not found: db:migrate
   non_options at /xxxxx/rubies/jruby-1.7.0/lib/ruby/1.9/test/unit.rb:167
          map! at org/jruby/RubyArray.java:2387
   non_options at /xxxxx/rubies/jruby-1.7.0/lib/ruby/1.9/test/unit.rb:146
   non_options at /xxxxx/rubies/jruby-1.7.0/lib/ruby/1.9/test/unit.rb:207
  process_args at /xxxxx/rubies/jruby-1.7.0/lib/ruby/1.9/test/unit.rb:52
          _run at /xxxxx/rubies/jruby-1.7.0/lib/ruby/1.9/minitest/unit.rb:891
           run at /xxxxx/rubies/jruby-1.7.0/lib/ruby/1.9/minitest/unit.rb:884
           run at /xxxxx/rubies/jruby-1.7.0/lib/ruby/1.9/test/unit.rb:21
       autorun at /xxxxx/rubies/jruby-1.7.0/lib/ruby/1.9/test/unit.rb:326
      run_once at /xxxxx/rubies/jruby-1.7.0/lib/ruby/1.9/test/unit.rb:27
       autorun at /xxxxx/rubies/jruby-1.7.0/lib/ruby/1.9/test/unit.rb:325
</pre>

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10737 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-10-28 01:52:01 +00:00
Toshi MARUYAMA d840837563 remove trailing white-space from app/controllers/repositories_controller.rb 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10736 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-10-28 01:12:00 +00:00
Toshi MARUYAMA ac75aad581 German translation enhancements by Daniel Felix (#12232) 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10735 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-10-28 00:43:53 +00:00
Toshi MARUYAMA 176e239e23 German translation for trunk updated by Daniel Felix (#12232) 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10734 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-10-28 00:43:25 +00:00
Toshi MARUYAMA 0932689ef6 German translation for 2.1-stable updated by Daniel Felix (#12232, #12235) 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10733 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-10-28 00:42:36 +00:00
Jean-Philippe Lang 00736951cf Adds double quotes in mysql configuration example (#12229). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10729 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-10-27 08:50:33 +00:00
Jean-Philippe Lang 29a474b641 Wrap issue description and its contextual menu in a div (#12211). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10728 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-10-27 08:35:19 +00:00
Jean-Philippe Lang 8a2786c91e Fixes that test randomly fails. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10727 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-10-27 07:36:06 +00:00
Jean-Philippe Lang fb68f4703b Use textual CSS class for priorities in alternate theme (#12216). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10726 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-10-27 06:26:24 +00:00
Jean-Philippe Lang 2af516bd05 Use textual CSS class for priorities in alternate theme (#12216). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10725 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-10-27 06:25:41 +00:00
Jean-Philippe Lang 166cbfdb3c Adjusts tests for the css class added in r10720 (#12216). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10721 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-10-26 02:46:38 +00:00
Jean-Philippe Lang 113f8b5cf2 Adds a textual css class for issue priorities (#12216). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10720 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-10-26 01:25:23 +00:00
Jean-Philippe Lang a679d19709 Adds last edit comments on the wiki page (#7082). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10719 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-10-25 21:17:46 +00:00
Jean-Philippe Lang 03062394fc Adds ?include=attachments option when retrieving a wiki page with the REST API (#7082). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10718 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-10-25 20:44:37 +00:00
Jean-Philippe Lang eff874b29a REST API for creating/updating wiki pages (#7082). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10717 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-10-25 20:38:29 +00:00
Jean-Philippe Lang 9e31308720 REST API for retrieving wiki pages (#7082). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10716 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-10-25 19:44:04 +00:00
Jean-Philippe Lang b2e035fa96 Don't show confirmation message when disabled delete link in the context menu (#12199). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10715 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-10-24 21:24:40 +00:00
Jean-Philippe Lang 1c7e4bb7f0 Javascript syntax error (#12195). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10714 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-10-24 21:01:37 +00:00
Toshi MARUYAMA e0811bc80d scm: use nil instead of @rev at revision text box of "View all revisions" page 
@rev is set as default branch at controller.
On Git, in most cases it is "master".
And it is set on revision text box of "View all revisions" page.
"master" branch is NOT revision, so clicking OK button causes error.
It is very confused.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10713 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-10-24 11:12:05 +00:00
Toshi MARUYAMA 60afbcd37f add tmp/thumbnails/* to .hgignore and .gitignore 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10712 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-10-24 11:11:38 +00:00
Toshi MARUYAMA c4ce048970 fix "Page not found" on OK button in SCM "View all revisions" page (#12196) 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10709 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-10-24 09:24:30 +00:00
Toshi MARUYAMA 2beae77c58 backout r10707 (#12196) 
fix "Page not found" on OK button in SCM "View all revisions" page.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10708 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-10-24 09:23:59 +00:00
Toshi MARUYAMA 440232a54d fix "Page not found" on OK button in SCM "View all revisions" page (#12196) 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10707 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-10-24 07:59:16 +00:00
Jean-Philippe Lang 881a22d248 Fixed test case class name (#10852). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10706 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-10-23 21:24:38 +00:00
Jean-Philippe Lang 6cccdce06e Ability to delete a version from a wiki page history (#10852). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10705 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-10-23 18:45:14 +00:00
Toshi MARUYAMA 9e7f71080f add tmp/pdf directory (#12189) 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10702 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-10-23 10:50:09 +00:00
Toshi MARUYAMA ff4a92a782 Simplified Chinese translation for trunk updated by Steven Wong (#12188) 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10700 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-10-23 06:18:06 +00:00
Toshi MARUYAMA a829e381be Simplified Chinese translation for 2.1-stable updated by Steven Wong (#12188) 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10699 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-10-23 06:17:39 +00:00
Toshi MARUYAMA 1db6a0f89c gantt: remove unused issues parameter from gantt_issue_compare method 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10698 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-10-23 00:17:05 +00:00
Toshi MARUYAMA 8975f9c235 Traditional Chinese translation updated by ChunChang Lo (#12176) 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10696 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-10-22 08:13:37 +00:00
Toshi MARUYAMA 4ff3c9fdb5 partial backout r10263 
Backout replacing shoulda context of test/unit/helpers/issues_helper_test.rb.
Test methods in shoulda context do not run on Ruby 1.8.7-p370.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10689 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-10-22 02:03:23 +00:00
Toshi MARUYAMA f188277ab2 backout r10253 
Backout replacing shoulda context of test/unit/helpers/issues_helper_test.rb.
Test methods in shoulda context do not run on Ruby 1.8.7-p370.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10688 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-10-22 02:03:11 +00:00
Jean-Philippe Lang d66b3452db Wiki page versions routes cleanup. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10687 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-10-21 18:46:26 +00:00
Toshi MARUYAMA 9ec142713d Japanese translation updated by Go MAEDA (#12171) 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10686 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-10-21 10:12:11 +00:00
Jean-Philippe Lang 61d8e8f1f4 Don't show watch, lock/unlock, delete links on previous wiki page versions. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10685 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-10-21 04:56:58 +00:00
Jean-Philippe Lang 9796d18609 Handle deleted wiki page versions (#10852). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10684 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-10-21 04:43:15 +00:00
Jean-Philippe Lang f09be68323 Adds cc and bcc to email log messages (#12090). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10683 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-10-21 03:38:54 +00:00
Jean-Philippe Lang 82eab51203 Bulgarian translation updated by Ivan Cenov (#12168). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10682 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-10-20 17:17:25 +00:00
Jean-Philippe Lang d22b57a27d Filling locales (#12167). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10681 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-10-20 15:01:44 +00:00
Jean-Philippe Lang d29fa4735b Adds a macro for inserting collapsed text (#12167). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10680 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-10-20 14:49:32 +00:00