summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* tagged version 1.2.31.2.3Jean-Philippe Lang2011-12-100-0/+0
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/tags/1.2.3@8179 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Version set to 1.2.3.1.2-stableJean-Philippe Lang2011-12-101-1/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@8178 e93f8b46-1217-0410-a6f0-8f06a7374b81
* CHANGELOG updated.Jean-Philippe Lang2011-12-101-0/+21
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@8177 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r7920, r7921, r7922 and r7924 from trunk (#9405).Jean-Philippe Lang2011-12-107-10/+67
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@8158 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r8103 from trunk (#9737).Jean-Philippe Lang2011-12-102-1/+17
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@8157 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r7809 from trunk (#9567).Jean-Philippe Lang2011-12-071-5/+7
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@8120 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r7834 from trunk (#9566).Jean-Philippe Lang2011-12-071-7/+8
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@8119 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r7780 from trunk (#9552).Jean-Philippe Lang2011-12-072-1/+23
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@8118 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r7814 from trunk (#9577).Jean-Philippe Lang2011-12-072-3/+18
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@8117 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r7971 from trunk (#9682).Jean-Philippe Lang2011-12-072-2/+9
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@8116 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r7919 from trunk (#9448).Jean-Philippe Lang2011-12-071-1/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@8115 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r8106 from trunkToshi MARUYAMA2011-12-071-2/+2
| | | | | | remove trailing white-spaces from calendar-hr.js git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@8108 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r8105 from trunkToshi MARUYAMA2011-12-071-4/+4
| | | | | | convert calendar-hr.js (Croatian) from Windows-1250 to UTF-8. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@8107 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r8002 from trunkToshi MARUYAMA2011-12-041-1/+1
| | | | | | Bulgarian translation updated by Ivan Cenov. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@8083 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r7983 and r7984 from trunk.Jean-Philippe Lang2011-11-293-3/+21
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@8000 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r7782 from trunk.Jean-Philippe Lang2011-11-292-0/+2
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7999 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r7779 from trunk.Jean-Philippe Lang2011-11-292-1/+3
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7998 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r7985 from trunk.Jean-Philippe Lang2011-11-292-1/+9
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7997 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Backported r7982 from trunk.Jean-Philippe Lang2011-11-292-0/+4
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7996 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r7956 from trunk.Jean-Philippe Lang2011-11-292-3/+16
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7995 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r7837 from trunk (#9597).Etienne Massip2011-11-181-1/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7838 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merge r7797 from trunkToshi MARUYAMA2011-11-131-1/+2
| | | | | | Simplified Chinese "text_git_repository_note" translation updated by Steven Wong. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7801 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merge r7796 from trunkToshi MARUYAMA2011-11-131-35/+36
| | | | | | Simplified Chinese translation for 1.2.2 updated by Steven Wong. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7800 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merge r7795 from trunkToshi MARUYAMA2011-11-131-3/+3
| | | | | | | | | | Simplified Chinese translation changed by Steven Wong. * field_due_date * permission_rename_wiki_pages * button_rename git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7799 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merge r6699 from trunkToshi MARUYAMA2011-11-131-20/+19
| | | | | | remove trailing white-spaces from config/locales/zh.yml git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7793 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merge r6698 from trunkToshi MARUYAMA2011-11-131-1/+1
| | | | | | Ruby 1.9: fix parsing error of zh.yml with psych yaml library git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7792 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r7776 from trunk.Jean-Philippe Lang2011-11-112-8/+27
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7777 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r7774 from trunk (#8615).Jean-Philippe Lang2011-11-111-1/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7775 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r7772 from trunk (#8615).Jean-Philippe Lang2011-11-112-1/+77
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7773 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r6308 from trunk (#8884).Jean-Philippe Lang2011-11-112-0/+10
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7770 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r6311 from trunk (#8880).Jean-Philippe Lang2011-11-112-8/+22
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7769 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r6298 from trunk (#8865).Jean-Philippe Lang2011-11-112-2/+19
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7768 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r6300 and r6302 from trunk (#8836).Jean-Philippe Lang2011-11-113-14/+16
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7767 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r6324 and r6325 from trunk (#8651).Jean-Philippe Lang2011-11-113-1/+251
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7766 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r6314 from trunk (#8633).Jean-Philippe Lang2011-11-112-2/+16
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7765 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r7731 from trunkToshi MARUYAMA2011-11-051-1/+1
| | | | | | Spanish translation updated by Ismael G Marin C. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7732 e93f8b46-1217-0410-a6f0-8f06a7374b81
* merge r7707 from trunkToshi MARUYAMA2011-11-021-0/+7
| | | | | | | | add unit test of escaping image urls Contributed by Holger Just. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7709 e93f8b46-1217-0410-a6f0-8f06a7374b81
* merge r6759 from trunkToshi MARUYAMA2011-11-021-18/+18
| | | | | | remove trailing white-spaces from test/unit/lib/redmine/wiki_formatting/textile_formatter_test.rb git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7708 e93f8b46-1217-0410-a6f0-8f06a7374b81
* backed out previous 1.2-stable dummy commitToshi MARUYAMA2011-10-301-2/+0
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7703 e93f8b46-1217-0410-a6f0-8f06a7374b81
* dummy commit to run test on CI serverToshi MARUYAMA2011-10-301-0/+2
| | | | | | | Tests fail on CI Server, but I don't know the reason. http://www.redmine.org/builds/build_1.2-stable-1.8.7-sqlite3_82.html git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7702 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r7699 from trunkToshi MARUYAMA2011-10-301-9/+9
| | | | | | Dutch translation updated by Pieter Nicolai git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7700 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r7660 from trunkToshi MARUYAMA2011-10-271-1/+1
| | | | | | scm: git: fix typo of comments about fetching revisions git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7661 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r7658 from trunkToshi MARUYAMA2011-10-271-0/+11
| | | | | | | scm: git: recovery and improve comments of fetching from 1.1 about harmful influence that git does not have the revision number. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7659 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r7650 from trunkToshi MARUYAMA2011-10-253-23/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm: mercurial: drop supporting below Mercurial 1.1 On November 1st 2011, Mercurial 2.0 will be released. On Mercurial 1.1.2, unit lib test fails with following error. <pre> Traceback (most recent call last): File "/WEB-DOWN/hg-repo/hg-crew/hg", line 20, in <module> mercurial.dispatch.run() File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 20, in run sys.exit(dispatch(sys.argv[1:])) File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 29, in dispatch return _runcatch(u, args) File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 45, in _runcatch return _dispatch(ui, args) File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 367, in _dispatch ret = _runcommand(ui, options, cmd, d) File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 416, in _runcommand return checkargs() File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 376, in checkargs return cmdfunc() File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 361, in <lambda> d = lambda: util.checksignature(func)(ui, *args, **cmdoptions) File "/WEB-DOWN/hg-repo/hg-crew/mercurial/util.py", line 715, in check return func(*args, **kwargs) File "/REDMINE-1/hg-workdir/redmine-bb-all/lib/redmine/scm/adapters/mercurial/redminehelper.py", line 149, in rhlog if hg.util.version() >= '1.6': AttributeError: 'module' object has no attribute 'version' 1) Error: test_nodes_in_branch(MercurialAdapterTest): Redmine::Scm::Adapters::MercurialAdapter::HgCommandAborted: hg exited with non-zero status: 1 lib/redmine/scm/adapters/mercurial_adapter.rb:306:in `hg' lib/redmine/scm/adapters/mercurial_adapter.rb:234:in `nodes_in_branch' test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb:311:in `test_nodes_in_branch' test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb:304:in `each' test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb:304:in `test_nodes_in_branch' </pre> git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7651 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r7643 from trunkToshi MARUYAMA2011-10-241-2/+4
| | | | | | | | scm: mercurial: skip failing unit model tests on below Mercurial 1.5 Tests of non ASCII nor alphabetic nor numeric *named branch* fails on below Mercurial 1.5. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7647 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r7642 from trunkToshi MARUYAMA2011-10-241-10/+14
| | | | | | | | scm: mercurial: skip failing unit lib tests on below Mercurial 1.5 Tests of non ASCII nor alphabetic nor numeric *named branch* fails on below Mercurial 1.5. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7646 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r7641 from trunkToshi MARUYAMA2011-10-241-2/+5
| | | | | | | | | | | | | | | scm: mercurial: switch rev parameter of extension rhlog() if above Mercurial 1.6 or not On Mercurial 1.5, following error raises. <pre> hg --config extensions.redminehelper=lib/redmine/scm/adapters/mercurial/redminehelper.py \ --rhbranch default --from default --to 0 abort: unknown revision '"default"'! </pre> git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7645 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r7640 from trunkToshi MARUYAMA2011-10-241-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm: mercurial: fix extension cmdtable on Mercurial 1.5 Before Mercurial revision "40c06bbf58be":http://www.selenic.com/repo/hg-stable/rev/40c06bbf58be , following error raises. <pre> Traceback (most recent call last): File "/WEB-DOWN/hg-repo/hg-crew/hg", line 27, in <module> mercurial.dispatch.run() File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 16, in run sys.exit(dispatch(sys.argv[1:])) File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 30, in dispatch return _runcatch(u, args) File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 47, in _runcatch return _dispatch(ui, args) File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 398, in _dispatch cmd, func, args, options, cmdoptions = _parse(lui, args) File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 277, in _parse args = fancyopts.fancyopts(args, c, cmdoptions, True) File "/WEB-DOWN/hg-repo/hg-crew/mercurial/fancyopts.py", line 62, in fancyopts for short, name, default, comment in options: ValueError: too many values to unpack 1) Error: test_nodes_in_branch(MercurialAdapterTest): Redmine::Scm::Adapters::MercurialAdapter::HgCommandAborted: hg exited with non-zero status: 1 lib/redmine/scm/adapters/mercurial_adapter.rb:306:in `hg' lib/redmine/scm/adapters/mercurial_adapter.rb:234:in `nodes_in_branch' test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb:311:in `test_nodes_in_branch' test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb:304:in `each' test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb:304:in `test_nodes_in_branch' </pre> git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7644 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r7579 from trunk.Toshi MARUYAMA2011-10-041-1/+24
| | | | | | | | | | | Restrict anonymous read access with Redmine.pm Redmine.pm now also checks for public projects whether the anonymous user has the browse_repository right for a read operation. Contributed by Holger Just. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7580 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r7570 from trunk (#9245).Etienne Massip2011-10-041-1/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7578 e93f8b46-1217-0410-a6f0-8f06a7374b81