Commit Graph

4147 Commits

Author SHA1 Message Date
Eric Davis 98f85b3332 Merge branch 'ticket/master/30-upstream-code-review' into upstream-master 2011-02-09 17:00:37 -08:00
Eric Davis 8e60c5bf1c Merge branch 'ticket/master/30-upstream-code-review-cherry-pick' into ticket/master/30-upstream-code-review 2011-02-09 16:53:07 -08:00
Toshi MARUYAMA 6c207d6ecf scm: cvs: generate pseudo scmid for auto issue close text (#6706).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4802 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-09 16:51:39 -08:00
Toshi MARUYAMA 9cd5e6967e scm: cvs: change temporary revision number from "_N" to "tmpN" (#996, #3761, #6706).
'_' is SQL "like" special character.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4801 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-09 16:51:39 -08:00
Jean-Baptiste Barth 8b64d5d0f0 Fixed various typos in french locale
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4799 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-09 16:51:39 -08:00
Toshi MARUYAMA 3f62da8d82 scm: add scm_cvs_command at config/configuration.yml.example (#7517).
I forgot to add it.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4798 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-09 16:51:39 -08:00
Toshi MARUYAMA d449ac518d scm: change key name of configurable command name (#7517, #6159, #7047).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4797 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-09 16:51:39 -08:00
Toshi MARUYAMA 21585064b2 scm: use "e.g." for "for example" at config/configuration.yml.example (#7517).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4796 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-09 16:51:04 -08:00
Toshi MARUYAMA 02c30b1a67 scm: add a feature of configurable path of executable for scm adapters (#7517).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4795 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-09 16:51:04 -08:00
Toshi MARUYAMA 1656ce3c53 scm: cvs: use localtime at cvs rlog -d option (#996, #3761).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4794 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-09 16:50:24 -08:00
Toshi MARUYAMA cb7e4f01cc scm: cvs: add unit lib test.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4793 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-09 16:50:24 -08:00
Toshi MARUYAMA 9524795051 scm: mercurial: add unit lib test for the previous changeset isn't the parent (#7253, #7518).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4792 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-09 16:50:24 -08:00
Toshi MARUYAMA b7e38791f2 scm: cvs: add fetch_changesets at all unit app test methods.
Redmine generates pseudo revision number, so all tests need to read database.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4791 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-09 16:50:24 -08:00
Toshi MARUYAMA 6d649a6f84 scm: cvs: code clean up.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4790 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-09 16:50:24 -08:00
Toshi MARUYAMA 70214da573 scm: cvs: change project id of functional test from 1 to 3.
Project id 1 has Subversion fixtures.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4789 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-09 16:50:24 -08:00
Toshi MARUYAMA f101bb6e9c scm: cvs: change project id of unit app test from 1 to 3.
Project id 1 has Subversion fixtures.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4788 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-09 16:50:24 -08:00
Toshi MARUYAMA 50df0ba08b Ignore config/configuration.yml (#7408).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4787 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-09 16:50:24 -08:00
Jean-Philippe Lang e4a180d7be Update for 1.1.1 release.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4784 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-09 16:50:24 -08:00
Jean-Philippe Lang 52a2a174e0 Reverted r4780 that broke gantt tests (#7280).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4782 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-09 16:50:24 -08:00
Jean-Philippe Lang 9ed0387851 Removed issue subjects wrapping in gantt (#7280).
Contributed by Etienne Massip.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4780 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-09 16:50:24 -08:00
Jean-Philippe Lang df02ce005d Translations updates.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4777 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-09 16:50:24 -08:00
Jean-Philippe Lang 99431d79b4 Moves .htaccess to htaccess.fcgi.example (#7256).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4775 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-09 16:50:24 -08:00
Jean-Philippe Lang a8473368ee Prevent error when Mantis version.date_order is nil (#7476).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4765 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-09 16:49:05 -08:00
Jean-Philippe Lang e6bf7ea34b Fixed: Relations are not displayed after adding/removing an issue relation (#7463).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4764 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-09 16:48:16 -08:00
Jean-Philippe Lang 710edf6c79 Fixed: no email sent with 'Notifiy for any event on the selected projects only' (#7421).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4761 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-09 16:48:16 -08:00
Jean-Philippe Lang 8957b56b87 Moves link_to_message to ApplicationHelper to make it available to redmine links.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4760 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-09 16:48:15 -08:00
Jean-Philippe Lang bedf99d9df Adds visible scope to redmine links queries.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4759 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-09 16:48:15 -08:00
Jean-Philippe Lang 47f3f5ae68 Adds support for cross project Redmine links (#7409).
See public/help/wiki_syntax_detailed.html for the syntax.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4758 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-09 16:48:15 -08:00
Jean-Philippe Lang ef32606c43 Set the httponly flag on the autologin cookie.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4757 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-09 16:46:45 -08:00
Jean-Philippe Lang 4adf3abf83 Makes the autologin cookie configurable (#1763).
The cookie attributes (name, path, secure) can now be set in config/configuration.yml.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4756 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-09 16:46:45 -08:00
Jean-Philippe Lang b88143ca3f Makes the folder for attachments storage configurable in config/configuration.yml (#1236).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4755 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-09 16:46:45 -08:00
Jean-Philippe Lang 2ea7a78da3 Ignores db/*.sqlite3.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4753 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-09 16:46:45 -08:00
Jean-Philippe Lang 9a13b39e26 Adds an application configuration file: config/configuration.yml (#7408).
Email delivery settings that were stored in config/email.yml should be moved to this new configuration file.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4752 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-09 16:46:45 -08:00
Toshi MARUYAMA 908e9f9c28 scm: darcs: fix Darcs adapter recognizes new files as modified files above Darcs 2.4 (#7415).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4749 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-09 16:41:32 -08:00
Toshi MARUYAMA 75cc7a8130 scm: darcs: add compatible test of Darcs 2.3 and 2.4 (#7415).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4748 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-09 16:41:32 -08:00
Toshi MARUYAMA d6594fde27 scm: darcs: switch '.' or @url at entries() in darcs version (#4899).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4744 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-09 16:41:32 -08:00
Toshi MARUYAMA 668b0c0e50 scm: darcs: change io.gets to io.read and add darcs version unit (#4494, #5404).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4743 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-09 16:41:32 -08:00
Toshi MARUYAMA 5ff1f6fdfa scm: darcs: add unit lib test.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4742 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-09 16:41:32 -08:00
Jean-Philippe Lang c2a530f8c8 Moves relations fetching from views to the controller and skip invalid relations (#7385).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4741 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-09 16:41:32 -08:00
Jean-Philippe Lang cc10d1a0d8 Removed extraneous hidden_field on wiki history (#7379).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4740 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-09 16:41:32 -08:00
Jean-Philippe Lang b80b789cc6 Coderay upgraded to 0.9.7 (#5344).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4739 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-09 16:41:32 -08:00
Jean-Philippe Lang e5c8513dda Fixes french translation of "Connection" (#7348).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4738 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-09 16:41:32 -08:00
Jean-Philippe Lang 36a12aab9e Make POP3 mail fetcher log messages instead of puts (#7177).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4737 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-09 16:41:32 -08:00
Jean-Philippe Lang ea7224a461 Avoid "private method `gsub' called for nil:NilClass" error when exporting issues with nil description (#7386).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4736 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-09 16:41:32 -08:00
Jean-Philippe Lang 4525b7f6e2 Fixed: subtasks are deleted (not destroyed) when destroying parent issue (#7385).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4735 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-09 16:41:32 -08:00
Toshi MARUYAMA 3249ac2647 scm: functional test of using format_revision() for annotate (#3724).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4734 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-09 16:41:31 -08:00
Toshi MARUYAMA e1667dabbf scm: use format_revision() for history, view and annotate (#3724).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4733 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-09 16:41:31 -08:00
Jean-Philippe Lang a489c66219 Load csshover.htc for IE6 only as later versions support hover on non-link elements.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4731 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-09 16:41:31 -08:00
Jean-Philippe Lang 8933482c37 Do not show "for only project I select" notification option on application settings form (#7294).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4730 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-09 16:28:46 -08:00
Jean-Philippe Lang 16fdf5fe66 Fixed: "Notifiy for only project I select" is randomly displayed (#7294).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4727 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-09 16:27:15 -08:00