Commit Graph

1525 Commits

Author SHA1 Message Date
Toshi MARUYAMA 2d2542008e graft r5285 to awesome_nested_set 2.1.5 (#7920)
git-svn-id: http://svn.redmine.org/redmine/trunk@12685 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-21 06:51:22 +00:00
Toshi MARUYAMA 65d2df44db back out r12679 awesome_nested_set 2.1.5 modification
git-svn-id: http://svn.redmine.org/redmine/trunk@12684 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-21 06:51:06 +00:00
Toshi MARUYAMA 94e3eb2b8b move awesome_nested_set leaf? modification to config/initializers/10-patches.rb
git-svn-id: http://svn.redmine.org/redmine/trunk@12682 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-20 17:54:47 +00:00
Toshi MARUYAMA 89c43d24c8 back out r12680
<pre>
  1) Failure:
test_children(ProjectTest) [test/unit/project_test.rb:374]:
<[5, 3, 4]> expected but was
<[3, 4, 5]>.
</pre>

git-svn-id: http://svn.redmine.org/redmine/trunk@12681 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-20 13:35:05 +00:00
Toshi MARUYAMA 1c0c22de17 use :order_column option instead of :order for acts_as_nested_set
git-svn-id: http://svn.redmine.org/redmine/trunk@12680 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-20 12:53:01 +00:00
Toshi MARUYAMA bcec29d5e4 apply Redmine awesome_nested_set 2.1.5 modification
git-svn-id: http://svn.redmine.org/redmine/trunk@12679 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-20 05:59:50 +00:00
Toshi MARUYAMA 90777c1673 add lib/plugins/awesome_nested_set/init.rb
git-svn-id: http://svn.redmine.org/redmine/trunk@12678 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-20 05:59:34 +00:00
Toshi MARUYAMA 6f78b3a408 import awesome_nested_set 2.1.5
60fe4f69e4

git-svn-id: http://svn.redmine.org/redmine/trunk@12677 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-20 05:59:16 +00:00
Toshi MARUYAMA 77f29deb29 svn propset svn:eol-style LF lib/plugins/awesome_nested_set/spec/*
git-svn-id: http://svn.redmine.org/redmine/trunk@12676 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-20 02:19:08 +00:00
Toshi MARUYAMA df9da6750d svn propset svn:eol-style LF lib/plugins/awesome_nested_set/.travis.yml
git-svn-id: http://svn.redmine.org/redmine/trunk@12675 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-20 01:53:58 +00:00
Toshi MARUYAMA 4d95f815d2 svn propset svn:eol-style LF lib/plugins/awesome_nested_set/.autotest
git-svn-id: http://svn.redmine.org/redmine/trunk@12674 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-20 01:47:06 +00:00
Toshi MARUYAMA b933cd7a65 add newline at end of lib/plugins/awesome_nested_set/init.rb
git-svn-id: http://svn.redmine.org/redmine/trunk@12672 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-19 09:59:25 +00:00
Toshi MARUYAMA 1951aeac78 add .travis.yml and switch database user/password by environments
git-svn-id: http://svn.redmine.org/redmine/trunk@12665 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-18 23:59:32 +00:00
Jean-Philippe Lang b25c7003da Adds a task for moving Redmine data to a different DBMS.
git-svn-id: http://svn.redmine.org/redmine/trunk@12659 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-12 09:02:31 +00:00
Jean-Philippe Lang 0711c585b6 Adds missing permissions on attachments/upload (#15664).
git-svn-id: http://svn.redmine.org/redmine/trunk@12652 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-11 12:27:01 +00:00
Jean-Philippe Lang 9ad2ca61da Fixed: cannot retrieve members for closed projects through the REST API (#15848).
git-svn-id: http://svn.redmine.org/redmine/trunk@12650 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-11 11:47:26 +00:00
Jean-Philippe Lang 8b999962de Make favicon themeable (#15689).
Patch by Felix Schäfer modified by Jean-Philippe Lang.

git-svn-id: http://svn.redmine.org/redmine/trunk@12646 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-11 11:22:46 +00:00
Toshi MARUYAMA b3dbe07c95 Rails4: replace deprecated find_all_by_* at FieldFormat
git-svn-id: http://svn.redmine.org/redmine/trunk@12570 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-09 08:14:06 +00:00
Toshi MARUYAMA 78ca50560a Rails4: replace deprecated Relation#update_all at acts_as_list
git-svn-id: http://svn.redmine.org/redmine/trunk@12526 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-08 10:11:16 +00:00
Toshi MARUYAMA 76110407b7 Rails4: replace deprecated Relation#update_all at acts_as_list
git-svn-id: http://svn.redmine.org/redmine/trunk@12504 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-08 04:13:18 +00:00
Toshi MARUYAMA a5f028a242 use lambda form in acts_as_tree scope (#12499)
git-svn-id: http://svn.redmine.org/redmine/trunk@12487 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-07 10:02:50 +00:00
Jean-Philippe Lang d2f540358f Store mime type lookups in a hash.
git-svn-id: http://svn.redmine.org/redmine/trunk@12484 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-05 17:56:21 +00:00
Jean-Philippe Lang e1189c5335 Use the mime-types gem for getting mime types from filenames (#15790).
git-svn-id: http://svn.redmine.org/redmine/trunk@12483 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-05 16:35:59 +00:00
Jean-Philippe Lang 1f50862586 Use Rails.application.config.i18n.load_path for adding plugin locales (#12753).
Patch by Takeshi Yaegashi.

git-svn-id: http://svn.redmine.org/redmine/trunk@12482 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-05 14:46:22 +00:00
Jean-Philippe Lang 77ac3b7891 Reduces the number of subqueries when searching with many custom fields set as searchable (#15781).
git-svn-id: http://svn.redmine.org/redmine/trunk@12481 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-05 14:23:36 +00:00
Toshi MARUYAMA 461c93a2dc fix typo redcarpet requirement in lib/redmine.rb (#15520)
git-svn-id: http://svn.redmine.org/redmine/trunk@12461 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-12-26 03:52:25 +00:00
Toshi MARUYAMA e10aa2529d change requirement in bazaar lib as same with other scm libs (#15756)
git-svn-id: http://svn.redmine.org/redmine/trunk@12456 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-12-24 05:06:36 +00:00
Jean-Philippe Lang a657a12450 Don't load redcarpet with JRuby.
git-svn-id: http://svn.redmine.org/redmine/trunk@12453 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-12-23 17:07:51 +00:00
Jean-Philippe Lang 471e01ca50 Adds experimental support for Markdown formatting with redcarpet (#15520).
git-svn-id: http://svn.redmine.org/redmine/trunk@12452 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-12-23 13:05:10 +00:00
Jean-Philippe Lang 6311ade827 Rescue syntax highlighter exceptions.
git-svn-id: http://svn.redmine.org/redmine/trunk@12451 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-12-23 12:39:18 +00:00
Jean-Philippe Lang 0dc98aabe6 Adds an option for formatter display name.
git-svn-id: http://svn.redmine.org/redmine/trunk@12450 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-12-23 12:33:42 +00:00
Jean-Philippe Lang 0fabbd281e Updates for 2.4.2 release.
git-svn-id: http://svn.redmine.org/redmine/trunk@12447 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-12-23 08:46:47 +00:00
Jean-Philippe Lang b8c94d93e9 Fixed slow SELECT ... FOR UPDATE query when deleting an issue.
git-svn-id: http://svn.redmine.org/redmine/trunk@12445 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-12-22 15:49:53 +00:00
Jean-Philippe Lang 4333a80bc1 Adds support for links on values for various custom field formats (#1358).
git-svn-id: http://svn.redmine.org/redmine/trunk@12442 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-12-22 14:09:33 +00:00
Toshi MARUYAMA b9db2228c0 replace deprecated Version#completed_pourcent at lib/redmine/helpers/gantt.rb (#12724)
git-svn-id: http://svn.redmine.org/redmine/trunk@12439 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-12-22 12:39:38 +00:00
Toshi MARUYAMA 2db5fc1a66 use environment variable for running independent tests (units etc.) in ci.rake
git-svn-id: http://svn.redmine.org/redmine/trunk@12437 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-12-21 12:00:08 +00:00
Toshi MARUYAMA fc4df508f0 make IssuesHelperTest passes when config.threadsafe! is enabled (#12097)
git-svn-id: http://svn.redmine.org/redmine/trunk@12427 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-12-21 11:08:51 +00:00
Toshi MARUYAMA 694394b04e use environment variable for extacting SCM repositories in ci.rake
git-svn-id: http://svn.redmine.org/redmine/trunk@12426 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-12-21 09:30:53 +00:00
Jean-Philippe Lang a4a91cab7e Add project identifier substitution option to the URL-pattern property of link format custom fields (#15701).
Patch by Mischa The Evil.

git-svn-id: http://svn.redmine.org/redmine/trunk@12413 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-12-15 08:53:02 +00:00
Jean-Philippe Lang e715c4b847 Removed default values on custom field min and max length.
git-svn-id: http://svn.redmine.org/redmine/trunk@12405 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-12-14 10:01:45 +00:00
Jean-Philippe Lang 3e5f1e326a ruby1.8 compatibility.
git-svn-id: http://svn.redmine.org/redmine/trunk@12404 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-12-14 09:24:37 +00:00
Jean-Philippe Lang ebb8e86122 Removed hardcoded formats for right-click edit.
git-svn-id: http://svn.redmine.org/redmine/trunk@12402 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-12-14 08:57:30 +00:00
Jean-Philippe Lang 2e2e2cfe42 Merged custom fields format refactoring.
git-svn-id: http://svn.redmine.org/redmine/trunk@12400 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-12-14 08:22:43 +00:00
Toshi MARUYAMA 3782836e73 fix disable to run test environment
git-svn-id: http://svn.redmine.org/redmine/trunk@12387 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-12-09 04:30:51 +00:00
Jean-Philippe Lang 436ab28443 Updates for 2.4.1 release.
git-svn-id: http://svn.redmine.org/redmine/trunk@12314 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-11-23 08:26:39 +00:00
Jean-Philippe Lang a22242ed20 Fixed uninitialized constant Redmine::Scm::Adapters::CommandFailed error when reloading in development mode.
git-svn-id: http://svn.redmine.org/redmine/trunk@12273 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-11-11 22:02:21 +00:00
Toshi MARUYAMA 81d6952587 ci.rake: code format cleanup
git-svn-id: http://svn.redmine.org/redmine/trunk@12266 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-11-10 22:59:10 +00:00
Jean-Philippe Lang 3096b6183e Set version to 2.4.0.
git-svn-id: http://svn.redmine.org/redmine/trunk@12263 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-11-10 11:21:21 +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