summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* tagged version 1.4.61.4.6Jean-Philippe Lang2013-01-090-0/+0
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/tags/1.4.6@11156 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Removed Rails patch.Jean-Philippe Lang2013-01-091-37/+0
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@11154 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Changes for 1.4.6 release.Jean-Philippe Lang2013-01-092-2/+2
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@11149 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Upgrade to Rails 2.3.15.Jean-Philippe Lang2013-01-092-1/+2
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@11148 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r11051 from trunk to 1.4-stable (#12630)Toshi MARUYAMA2012-12-192-2/+3
| | | | | | Russian "x_hours" translation updated by Mikhail Velkin. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@11055 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r11035 from trunk to 1.4-stable (#12615)Toshi MARUYAMA2012-12-172-5/+6
| | | | | | Russian translation updated by Kirill Bezrukov. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@11039 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r11022 from trunk to 1.4-stable (#12614)Toshi MARUYAMA2012-12-172-28/+32
| | | | | | Dutch translation updated. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@11025 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r11014 from trunk to 1.4-stable (#12605)Toshi MARUYAMA2012-12-162-35/+36
| | | | | | Norwegian translation for 1.4-stable updated by Ketil Mehl. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@11020 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Reverts r10896 (#12472).Jean-Philippe Lang2012-11-301-1/+0
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@10899 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Reverts r10896 (#12472).Jean-Philippe Lang2012-11-301-1/+0
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@10898 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r10893 into 1.4-stable (#12472).Jean-Philippe Lang2012-11-302-0/+2
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@10896 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r10862 from trunk to 1.4-stable (#12409)Toshi MARUYAMA2012-11-221-2/+2
| | | | | | scm: git: change extra_report_last_commit type at unit test to string. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@10864 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r10856 and r10857 from trunk to 1.4-stable (#12409)Toshi MARUYAMA2012-11-214-0/+53
| | | | | | scm: git: fix changesets aren't read after clear_changesets call. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@10859 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r10840 from trunk to 1.4-stableToshi MARUYAMA2012-11-181-1/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@10849 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Updates for 1.4.5 release.Jean-Philippe Lang2012-11-172-2/+6
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@10834 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r10709 from trunk to 1.4-stable (#12196)Toshi MARUYAMA2012-10-243-1/+18
| | | | | | fix "Page not found" on OK button in SCM "View all revisions" page. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@10711 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r10702 from trunk to 1.4-stable (#12189)Toshi MARUYAMA2012-10-234-0/+3
| | | | | | add tmp/pdf directory. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@10704 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r10689 from trunk to 1.4-stableToshi MARUYAMA2012-10-221-9/+11
| | | | | | | | | 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/branches/1.4-stable@10693 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r10688 from trunk to 1.4-stableToshi MARUYAMA2012-10-221-9/+11
| | | | | | | | | 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/branches/1.4-stable@10692 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r10596 from trunk to 1.4-stable (#9732)Toshi MARUYAMA2012-10-112-2/+3
| | | | | | German translation updated by Raphael Kallensee. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@10601 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r10572 from trunkToshi MARUYAMA2012-10-091-1/+11
| | | | | | add missing fixtures to test/unit/issue_relation_test.rb git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@10579 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r10571 from trunkToshi MARUYAMA2012-10-091-0/+1
| | | | | | add missing fixture to test/integration/api_test/issues_test.rb git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@10578 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r10503 from trunk to 1.4-stable (#11966)Toshi MARUYAMA2012-09-281-0/+34
| | | | | | add functional test of sub repository diff path. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@10508 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r10502 from trunk to 1.4-stable (#11966)Toshi MARUYAMA2012-09-281-0/+14
| | | | | | add functional test of main repository diff path. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@10507 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r10490 from trunk to 1.4-stable (#11966)Toshi MARUYAMA2012-09-281-2/+3
| | | | | | explicitly define route at scm diff view. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@10506 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r10501 from trunkToshi MARUYAMA2012-09-282-2/+12
| | | | | | set user preference diff type nil at functional tests. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@10504 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r10498 from trunkToshi MARUYAMA2012-09-281-6/+6
| | | | | | scm: git: use with_settings instead of assigned setting at functional test git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@10500 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r10477 from trunkToshi MARUYAMA2012-09-261-1/+2
| | | | | | set default_language en at test_commit_closing_a_subproject_issue of unit changeset test. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@10483 e93f8b46-1217-0410-a6f0-8f06a7374b81
* add tests that i18n currency options are nil to 1.4-stable Rails2 (#11922)Toshi MARUYAMA2012-09-261-0/+18
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@10475 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Updated 1.4 CHANGELOG.Jean-Philippe Lang2012-09-061-0/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@10300 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Add namespace to Time (#11298).Jean-Philippe Lang2012-09-061-1/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@10299 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r10294 from trunk.Jean-Philippe Lang2012-09-062-1/+4
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@10297 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Updated 1.4 CHANGELOG.Jean-Philippe Lang2012-09-061-0/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@10296 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r10148 from trunk.Jean-Philippe Lang2012-09-063-9/+7
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@10295 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r10253, r10257, r10263 and r10264 from trunk to 1.4-stableToshi MARUYAMA2012-09-011-10/+34
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@10266 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r10255 from trunk to 1.4-stableToshi MARUYAMA2012-09-011-0/+1
| | | | | | add missing fixture to test/unit/lib/redmine/safe_attributes_test.rb. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@10262 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r10256 from trunk to 1.4-stableToshi MARUYAMA2012-09-011-2/+8
| | | | | | add missing fixtures to test/unit/lib/redmine/hook_test.rb. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@10261 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r10249 from trunk to 1.4-stableToshi MARUYAMA2012-09-011-0/+3
| | | | | | set language en to test_label_for at test/unit/query_test.rb. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@10260 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r10252 from trunk to 1.4-stable (#11752)Toshi MARUYAMA2012-09-011-7/+7
| | | | | | scm: git: use with_settings at test_diff_truncated of functional test. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@10259 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r10251 from trunk to 1.4-stable (#11752)Toshi MARUYAMA2012-09-011-16/+18
| | | | | | scm: git: use diff_max_lines_displayed setting at test_diff_with_rev_and_path of functional test. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@10258 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r9949 from trunk to 1.4-stableToshi MARUYAMA2012-09-0115-61/+94
| | | | | | Tests should not change settings. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@10250 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r10245 from trunk to 1.4-stable (#11752)Toshi MARUYAMA2012-08-311-0/+24
| | | | | | scm: git: add functional test of diff with revision and path. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@10248 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r10230 from trunk (#11665)Toshi MARUYAMA2012-08-221-0/+2
| | | | | | add check default document category is not defined on database in tests. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@10233 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r10219 from trunk to 1.4-stable (#11665)Toshi MARUYAMA2012-08-211-0/+17
| | | | | | add functional test to create non default document category. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@10227 e93f8b46-1217-0410-a6f0-8f06a7374b81
* set default category_id instead of the object (#11665)Toshi MARUYAMA2012-08-211-1/+3
| | | | | | | | | | | | | Rails 2.3 still has issues with synchronizing the association_id and association attributes of an object. That means, if you set the association with an object first and then just set the id afterwards, the object wins and the setting of the id gets lost. This is not an issue in Rails >= 3.1 anymore. Contributed by Holger Just. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@10226 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r10221 from trunk to 1.4-stable (#11665)Toshi MARUYAMA2012-08-212-0/+12
| | | | | | force set default document category if it is not set on database. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@10225 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r10220 from trunk to 1.4-stable (#11665)Toshi MARUYAMA2012-08-211-0/+6
| | | | | | add unit test to get default document category defined on database. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@10224 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r10222 from trunk to 1.4-stable (#11665)Toshi MARUYAMA2012-08-211-0/+4
| | | | | | add position to DocumentCategory in enumerations fixture. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@10223 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r10216 from trunkToshi MARUYAMA2012-08-211-1/+3
| | | | | | add missing fixtures to test/functional/documents_controller_test.rb git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@10218 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r10213 from trunkToshi MARUYAMA2012-08-211-1/+4
| | | | | | add missing fixtures to test/unit/document_test.rb git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@10215 e93f8b46-1217-0410-a6f0-8f06a7374b81