Commit Graph

1484 Commits

Author SHA1 Message Date
Toshi MARUYAMA fbeba062cf Merged r12456 from trunk to 2.4-stable (#15756)
change requirement in bazaar lib as same with other scm libs.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12458 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-12-24 07:17:01 +00:00
Toshi MARUYAMA 37a07789d1 backport r12453 AbstractAdapter change to 2.4-stable (#15756)
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12454 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-12-24 05:00:26 +00:00
Jean-Philippe Lang 742ab6f6b3 Merged r12447 for 2.4.2 release.
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12448 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-12-23 08:47:47 +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
Toshi MARUYAMA 260d6d2c78 Merged r12387 from trunk to 2.4-stable.
fix disable to run test environment.

git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12388 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-12-09 04:55:22 +00:00
Jean-Philippe Lang 931c198de4 Merged r12314.
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12315 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-11-23 08:27:16 +00:00
Jean-Philippe Lang 84100235e0 Set version to 2.4.0 stable.
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12264 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-11-10 11:21:50 +00:00
Jean-Philippe Lang 6ccdee7713 Fixed that rake db:create fails with JRuby (#15218).
git-svn-id: http://svn.redmine.org/redmine/trunk@12261 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-11-10 10:33:35 +00:00
Toshi MARUYAMA ccf55e65f0 ci.rake: use 'jdbcsqlite3' for JRuby
git-svn-id: http://svn.redmine.org/redmine/trunk@12258 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-11-10 08:17:49 +00:00
Toshi MARUYAMA 0707c7a12d ci.rake: code format cleanup
git-svn-id: http://svn.redmine.org/redmine/trunk@12257 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-11-10 08:17:40 +00:00
Toshi MARUYAMA 882c4495c0 work around "rake db:create:all" error on JRuby SQLite3
<pre>
$ bundle exec rake ci --trace
...
rake aborted!
stack level too deep
/home/xxxx/.rvm/gems/jruby-1.7.4/gems/activerecord-3.2.15/lib/active_record/railties/databases.rake:184:in `local_database?'
/home/xxxx/.rvm/gems/jruby-1.7.4/gems/activerecord-3.2.15/lib/active_record/railties/databases.rake:52:in `(root)'
org/jruby/RubyHash.java:1375:in `each_value'
/home/xxxx/.rvm/gems/jruby-1.7.4/gems/activerecord-3.2.15/lib/active_record/railties/databases.rake:38:in `(root)'
</pre>

git-svn-id: http://svn.redmine.org/redmine/trunk@12256 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-11-10 00:19:17 +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 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 758cc2f2e6 Fixed that WikiContent#next_version raises a comparison of Symbol with Arel::Table failed error (#14773).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12222 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-10-14 17:07:17 +00:00
Jean-Philippe Lang 58c69b8123 Fixed that redmine:migrate_from_mantis fails to migrate projects with all upper case name (#15050).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12218 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-10-13 10:07:34 +00:00
Toshi MARUYAMA 461342dd2e add missing "require 'diff'" to Redmine::Helpers::Diff (#15105)
Contributed by Felix Bünemann.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12206 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-10-11 17:37:38 +00:00
Toshi MARUYAMA 38e8703ed4 pdf: fix empty page attached when exporting (#13632)
Contributed by Jun NAITOH.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12189 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-09-30 10:16:16 +00:00
Jean-Philippe Lang 4a36e09d49 migrate_from_trac.rake does not properly parse First Name and Last Name (#14592).
Patch by Craig Rodrigues.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12164 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-09-25 17:49:58 +00:00
Jean-Philippe Lang 5e2eedf2c5 Fixed that Mantis/Trac users are not imported because of password too short (#14590).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12163 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-09-25 17:47:29 +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
Jean-Philippe Lang 4db3e0be80 Updates for 2.3.3
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12135 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-09-14 06:46:40 +00:00
Toshi MARUYAMA a3c30bf234 remove svn:executable from lib/plugins/rfpdf excluding lib/fonts/ttf2ufm/ttf2ufm(.exe)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12108 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-08-10 09:52:40 +00:00
Toshi MARUYAMA 98ac4c0baf remove unused lib/plugins/rfpdf/lib/fpdf/fpdf_eps.rb
This source has broken syntax "when :" on Ruby 1.9.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12107 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-08-10 09:37:10 +00:00
Toshi MARUYAMA 0be69b8b04 copy English wiki syntax helps to other languages (#14630)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12096 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-08-08 03:49:00 +00:00
Toshi MARUYAMA 43da3859bc revert r12094 (#14630)
r12094 lost "svn copy".

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12095 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-08-08 03:46:39 +00:00
Toshi MARUYAMA e4c13efed7 copy English wiki syntax helps to other languages (#14630)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12094 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-08-08 03:38:50 +00:00
Toshi MARUYAMA 7394aeaa32 move English wiki syntax helps to en sub directory (#14630)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12093 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-08-08 03:38:21 +00:00
Jean-Philippe Lang b900ea8e2f Default data loader raises an error when called from the rake task (#14607).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12076 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-08-04 10:18:46 +00:00
Jean-Philippe Lang 9a0db9cb88 Fixed: warning: class variable access from toplevel on Ruby 2.0 (#14511).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12052 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-07-28 11:57:39 +00:00
Toshi MARUYAMA 670d2b6e2b fix diff of CJK(Chinese/Japanese/Korean) is broken on Ruby 1.8 (#14562)
Contributed by Jun NAITOH.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12046 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-07-28 11:00:02 +00:00
Jean-Philippe Lang 01a9e17c49 CVS root_url not recognized when connection string does not include port (#14422).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12027 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-07-15 21:06:54 +00:00
Jean-Philippe Lang 0e3dfa8de4 Updates for 2.3.2 release.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12024 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-07-14 14:51:01 +00:00
Jean-Philippe Lang 628d05629b Role-based issue custom field visibility (#5037).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12012 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-07-13 09:20:11 +00:00
Jean-Philippe Lang bc4785ca60 Add more info about the ruby version (#14419).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12003 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-07-11 18:45:43 +00:00
Toshi MARUYAMA c5ca4e2622 gender neutral source comment at lib/tasks/migrate_from_trac.rake
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11990 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-07-06 01:02:10 +00:00
Toshi MARUYAMA 9bf4288af9 not run Capybara tests on the CI server (#12822)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11979 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-06-14 14:39:48 +00:00
Jean-Philippe Lang f9ddb562d5 Cleanup of finders with :conditions option.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11963 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-06-12 19:13:25 +00:00
Jean-Philippe Lang 7371077fa2 Code cleanup.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11960 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-06-11 18:29:29 +00:00
Jean-Philippe Lang 2113b88db3 Code cleanup.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11958 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-06-11 18:18:02 +00:00
Toshi MARUYAMA 5a7f656303 run test:ui on CI Server Ruby 1.9.3 or higher (#12822)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11951 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-06-10 00:51:37 +00:00
Toshi MARUYAMA 442532e316 remove trailing white-spaces from lib/redmine/plugin.rb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11933 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-06-06 05:09:46 +00:00
Toshi MARUYAMA 01411ab567 prevent coderay "warning: already initialized constant" on Ruby 1.8.7 (#13692)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11925 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-06-04 14:07:46 +00:00
Toshi MARUYAMA 1fd7540b85 pdf: replace "id_width" parameter name to original "col_id_width" (#14178)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11921 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-06-04 11:02:45 +00:00
Toshi MARUYAMA 7bc0c26198 pdf: restore "id_width" parameter of issues_to_pdf_draw_borders (#14178)
Contributed by Massimo Rossello.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11920 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-06-04 10:54:55 +00:00
Jean-Philippe Lang 29c3b34641 Adds SCM versions in script/about output.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11918 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-06-01 16:32:29 +00:00
Jean-Philippe Lang 73aadc4900 Use uid_ methods for retrieving IMAP messages (#14101).
Patch by Pierre Pretorius.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11906 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-05-28 18:41:14 +00:00
Jean-Philippe Lang 131dc3a8fc Disconnect and logout from IMAP after mail receive (#14103).
Patch by Pierre Pretorius.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11905 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-05-28 18:17:36 +00:00
Toshi MARUYAMA f085508121 gantt: sort versions by start date (#7335)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11898 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-05-21 13:42:34 +00:00
Toshi MARUYAMA 8ea4e79964 gantt: sort issues by start date (#7335)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11897 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-05-21 13:42:19 +00:00