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

8218 Commits

Author SHA1 Message Date
Jean-Philippe Lang fb3b904b8f Better handling of issue update conflicts (#8691). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8774 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-02-04 17:36:15 +00:00
Etienne Massip b9c26d6ddc Revision graph code cleanup. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8773 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-02-04 14:02:31 +00:00
Toshi MARUYAMA be050be5e5 replace tabs to spaces at public/help/wiki_syntax_detailed.html 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8772 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-02-04 11:48:02 +00:00
Jean-Philippe Lang 06f8c4b27a Removed useless code. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8771 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-02-04 11:41:43 +00:00
Jean-Philippe Lang 333a6cc370 Fixed rounding issue on spent hours column in CSV export (#10150). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8764 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-02-04 11:03:44 +00:00
Toshi MARUYAMA 2789cf2506 attachment: fix that diff type is not saved in user preference (#10152) 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8761 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-02-04 06:23:38 +00:00
Toshi MARUYAMA af50c1e13e scm: git: add test that diff type is saved in user preference (#10152) 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8760 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-02-04 06:23:00 +00:00
Toshi MARUYAMA 3b75e9f90a remove Korean yaml comment header 
It is too hard to maintain.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8758 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-02-02 23:27:46 +00:00
Toshi MARUYAMA 8f2888e228 Korean translation for 1.3-stable updated by Ki Won Kim (#10137) 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8757 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-02-02 23:27:23 +00:00
Toshi MARUYAMA 7574ab730d code layout cleanup app/controllers/sys_controller.rb 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8756 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-02-02 23:26:54 +00:00
Jean-Philippe Lang 46ab7b45d7 Permissions report: display role names on each permission group (#10119). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8755 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-02-02 22:31:00 +00:00
Jean-Philippe Lang e4ef0b04ef Adds specific css class for information in forms. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8754 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-02-02 20:07:37 +00:00
Jean-Philippe Lang b47c5af0b8 Fixed broken italic text style in edited comment preview (#10130). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8752 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-02-02 19:45:40 +00:00
Jean-Philippe Lang 73f9b825f0 Replaced ruby-net-ldap with net-ldap 0.2.2 gem. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8751 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-02-02 19:30:01 +00:00
Jean-Philippe Lang d02f6a8e32 Adds a setting that allows to reference/fix issues of all projects (#3087). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8750 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-02-02 18:09:37 +00:00
Jean-Philippe Lang 3dc73dcb88 Fixed: associated changesets from other projects are not visible if the current project doesn't have the repository module enabled (#3087). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8749 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-02-02 17:43:36 +00:00
Jean-Philippe Lang b13f85e456 Adds custom field in TimeEntry API responses (#10131). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8748 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-02-01 21:15:13 +00:00
Jean-Philippe Lang 2808adf99f Adds members of subprojects in assignee and author filters (#10126). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8747 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-02-01 20:07:01 +00:00
Jean-Philippe Lang 0154d7477b Simplifies Principal.active scope (status defaults to 1 for groups). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8746 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-02-01 19:35:49 +00:00
Toshi MARUYAMA 5dd08133ef code layout cleanup app/models/mail_handler.rb 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8745 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-01-31 12:49:06 +00:00
Toshi MARUYAMA 7b600cdb91 code layout cleanup app/models/mail_handler.rb 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8744 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-01-31 10:19:04 +00:00
Toshi MARUYAMA bcef0de43b replace tabs to spaces at app/views/wiki/index.html.erb 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8743 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-01-31 03:53:37 +00:00
Toshi MARUYAMA 406633491f Rails3: add number.format to ro and sk locales (#4796) 
Test fails on Rails 3.0.11 and Ruby 1.8.7.

<pre>
Failure:
test_number_to_human_size_for_each_language(Redmine::I18nTest)
    [test/unit/lib/redmine/i18n_test.rb:114:in `test_number_to_human_size_for_each_language'
     test/unit/lib/redmine/i18n_test.rb:112:in `each'
     test/unit/lib/redmine/i18n_test.rb:112:in `test_number_to_human_size_for_each_language']:
sk failure.
Exception raised:
TypeError(<can't convert nil into String>)
</pre>

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8742 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-01-31 02:41:40 +00:00
Toshi MARUYAMA 65a1f54f71 code layout clean up test/unit/mail_handler_test.rb 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8741 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-01-30 23:27:15 +00:00
Jean-Philippe Lang be9f1c592e Removed border around wiki pages in PDF. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8740 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-01-30 23:11:26 +00:00
Jean-Philippe Lang 7abaa570c6 Fix for ruby1.9.3. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8739 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-01-30 22:53:53 +00:00
Toshi MARUYAMA 682efe399d code layout cleanup unit mail handler test fixtures 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8738 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-01-30 22:51:55 +00:00
Toshi MARUYAMA fbe351287a Bulgarian translation updated by Ivan Cenov (#10087) 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8737 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-01-30 22:51:30 +00:00
Jean-Philippe Lang 7409963c9a Fix for ruby1.9.3. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8736 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-01-30 20:11:08 +00:00
Jean-Philippe Lang 2664693ae8 Removed useless permission check in wiki controller. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8735 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-01-30 18:50:04 +00:00
Jean-Philippe Lang 3d27bf5318 Adds export of all wiki pages to a PDF file (#3463). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8734 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-01-30 18:42:14 +00:00
Jean-Philippe Lang a03c585a84 Check parent wiki page by default. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8733 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-01-30 18:19:29 +00:00
Jean-Philippe Lang a749e788ab Adds bookmarks to PDF when exporting a grouped issue list. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8732 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-01-30 18:01:47 +00:00
Jean-Philippe Lang 967e6413e5 Fixed that tag[0] may be nil. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8731 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-01-30 17:57:51 +00:00
Toshi MARUYAMA 2c6edb9f3c remove trailing tabs from app/views/news/_form.html.erb 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8730 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-01-30 01:38:58 +00:00
Jean-Philippe Lang e8cfa65155 Enable attached images to be displayed inline on the news list. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8729 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-01-29 22:42:12 +00:00
Jean-Philippe Lang 24138187eb Allows attachments on news (#1972). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8728 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-01-29 22:39:06 +00:00
Jean-Philippe Lang 992aebf6df Locales update. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8727 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-01-29 22:03:19 +00:00
Jean-Philippe Lang 79b12c73d9 Display of multi custom fields. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8726 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-01-29 22:01:40 +00:00
Jean-Philippe Lang 0cd62a3c77 Display custom_field_values instead of custom_values. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8725 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-01-29 21:21:45 +00:00
Jean-Philippe Lang cd4a19241a Code cleanup. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8724 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-01-29 21:12:10 +00:00
Jean-Philippe Lang f84688687b Allow existing single value custom fields to be changed to multiselect. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8723 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-01-29 21:10:18 +00:00
Jean-Philippe Lang 8d5f932660 Do not validate blank default custom field value. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8722 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-01-29 21:09:44 +00:00
Jean-Philippe Lang cd6db6a3cb Adds support for multiselect custom fields (#1189). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8721 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-01-29 20:51:48 +00:00
Jean-Philippe Lang 0c5af16e14 Support for nested array in API builder. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8720 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-01-29 18:29:09 +00:00
Toshi MARUYAMA 64b59f1502 test: add attachment tests at unit mail handler test for Rails3 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8719 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-01-29 11:24:48 +00:00
Toshi MARUYAMA f49d8d8c5f route: repository: move :repository_id routes before non :repository_id routes 
On Rails3 new route format, tests pass except following routes.

* 'projects/:id/repository' :action => 'show'
* 'projects/:id/repository/:repository_id' :action => 'show'

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8718 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-01-29 01:23:15 +00:00
Jean-Philippe Lang 83e7ee6729 Extracts custom field values validation from CustomValue so that they can be validated globally from the customized object (#1189). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8717 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-01-28 11:16:58 +00:00
Toshi MARUYAMA d4d27bd2d8 Ruby1.9: skip enforcing UTF-8 encodings on the params hash on Rails2 if it is frozen (#4050, #4796) 
Tests on CI server fail.
http://www.redmine.org/builds/build_trunk-1.9.2-sqlite3_257.html

<pre>
  1) Error:
test_index_with_short_filters(IssuesControllerTest):
RuntimeError: can't modify frozen string
    /var/lib/hudson/jobs/trunk-1.9.2-sqlite3/workspace/app/controllers/application_controller.rb:58:in `force_encoding'
    /var/lib/hudson/jobs/trunk-1.9.2-sqlite3/workspace/app/controllers/application_controller.rb:58:in `utf8nize!'
    /var/lib/hudson/jobs/trunk-1.9.2-sqlite3/workspace/app/controllers/application_controller.rb:60:in `block in utf8nize!'
    /var/lib/hudson/jobs/trunk-1.9.2-sqlite3/workspace/app/controllers/application_controller.rb:60:in `each'
    /var/lib/hudson/jobs/trunk-1.9.2-sqlite3/workspace/app/controllers/application_controller.rb:60:in `utf8nize!'
    /var/lib/hudson/jobs/trunk-1.9.2-sqlite3/workspace/app/controllers/application_controller.rb:52:in `params_filter'
    /var/lib/hudson/ruby1.9.2/lib/ruby/gems/1.9.1/gems/activesupport-2.3.14/lib/active_support/callbacks.rb:178:in `evaluate_method'
    /var/lib/hudson/ruby1.9.2/lib/ruby/gems/1.9.1/gems/activesupport-2.3.14/lib/active_support/callbacks.rb:166:in `call'
    /var/lib/hudson/ruby1.9.2/lib/ruby/gems/1.9.1/gems/actionpack-2.3.14/lib/action_controller/filters.rb:225:in `call'
    /var/lib/hudson/ruby1.9.2/lib/ruby/gems/1.9.1/gems/actionpack-2.3.14/lib/action_controller/filters.rb:629:in `run_before_filters'
    /var/lib/hudson/ruby1.9.2/lib/ruby/gems/1.9.1/gems/actionpack-2.3.14/lib/action_controller/filters.rb:615:in `call_filters'
    /var/lib/hudson/ruby1.9.2/lib/ruby/gems/1.9.1/gems/actionpack-2.3.14/lib/action_controller/filters.rb:610:in `perform_action_with_filters'
    /var/lib/hudson/ruby1.9.2/lib/ruby/gems/1.9.1/gems/actionpack-2.3.14/lib/action_controller/benchmarking.rb:68:in `block in perform_action_with_benchmark'
    /var/lib/hudson/ruby1.9.2/lib/ruby/gems/1.9.1/gems/activesupport-2.3.14/lib/active_support/core_ext/benchmark.rb:17:in `block in ms'
</pre>

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8716 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-01-28 10:26:34 +00:00
Toshi MARUYAMA 189bc0f7c8 test: route: repositories: split tests whether 'show' action or not 
On Rails3, 'show' action has some problems.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8715 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-01-28 06:51:08 +00:00