Commit Graph

4829 Commits

Author SHA1 Message Date
Jean-Philippe Lang 33549495c9 Code cleanup.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10939 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-12-03 23:03:33 +00:00
Jean-Philippe Lang 2844e90902 Code cleanup.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10933 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-12-03 21:52:32 +00:00
Jean-Philippe Lang e9018553e5 Removed unused helper.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10932 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-12-03 21:46:11 +00:00
Jean-Philippe Lang ea296a109a Replaces find(:first/:all) calls.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10931 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-12-03 21:30:10 +00:00
Jean-Philippe Lang 31c33f462d Replaces find(:first) calls.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10928 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-12-03 18:21:32 +00:00
Jean-Philippe Lang 30787e9cd2 Preserve the "from" parameter in activity links.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10926 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-12-02 21:41:03 +00:00
Jean-Philippe Lang 85b5b1c7f0 Replaces find(:all) calls.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10925 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-12-02 21:28:19 +00:00
Jean-Philippe Lang 9230628953 Adds helpers for retrieving my page data.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10922 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-12-02 21:08:03 +00:00
Jean-Philippe Lang 45ea24ecad Replaces find(:all) calls.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10921 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-12-02 20:43:16 +00:00
Jean-Philippe Lang 536747b747 Replaces find(:all) calls.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10917 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-12-02 20:23:48 +00:00
Jean-Philippe Lang 96fca0b08f Replaces find(:all) calls.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10916 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-12-02 19:16:32 +00:00
Jean-Philippe Lang 5b21efd4a4 Replaces find(:all) calls.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10914 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-12-02 19:09:42 +00:00
Jean-Philippe Lang 1951c6a3fd Removed unused instance variable.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10913 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-12-02 19:00:00 +00:00
Jean-Philippe Lang 9507b448b2 Makes User.current thread safe (#12097).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10911 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-12-02 18:15:46 +00:00
Jean-Philippe Lang e97a3ab97b Fixed find_issues logic.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10905 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-12-02 10:25:30 +00:00
Jean-Philippe Lang 6e1ff5bba6 Code cleanup.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10904 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-12-02 09:59:22 +00:00
Jean-Philippe Lang 88d5663ad2 Code cleanup.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10903 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-12-01 17:57:30 +00:00
Jean-Philippe Lang 16441b4938 Code cleanup.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10902 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-12-01 16:25:20 +00:00
Jean-Philippe Lang 65d3bffad7 Moved duplicate #options_for_membership_project_select to ApplicationHelper.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10901 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-12-01 16:19:52 +00:00
Jean-Philippe Lang a1d156d794 Fixed that roles API should accept API auth for when authentication is required (#12472).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10893 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-30 07:48:47 +00:00
Toshi MARUYAMA 0a675c7c77 remove trailing white-spaces from app/models/repository.rb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10891 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-28 10:46:10 +00:00
Toshi MARUYAMA f4cf7bc6f5 code layout cleanup app/models/issue_relation.rb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10889 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-28 01:11:32 +00:00
Jean-Philippe Lang c3817e620f Code cleanup.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10888 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-27 22:16:33 +00:00
Jean-Philippe Lang 9a270c46c0 Code cleanup.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10887 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-27 22:13:14 +00:00
Jean-Philippe Lang 6c0f3cd5d4 Validate email only if changed.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10883 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-27 19:25:56 +00:00
Jean-Philippe Lang 04dcdb3290 Code cleanup.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10882 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-27 19:24:22 +00:00
Jean-Philippe Lang 457f0bb337 Code cleanup.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10881 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-27 19:21:21 +00:00
Jean-Philippe Lang 96e01c6d4a Fixed the behaviour for when rescheduling a parent task (#4590).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10880 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-24 15:09:51 +00:00
Jean-Philippe Lang b94c971755 Precede-Follow relation should move following issues earlier when rescheduling issue earlier (#4590).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10878 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-24 13:43:52 +00:00
Jean-Philippe Lang 29fc292b18 Respond with 404 instead of 500 when requesting a wiki diff with invalid versions (#12434).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10877 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-24 12:27:00 +00:00
Jean-Philippe Lang dc68be983a Use Project.rebuild_tree! instead of .rebuild! in migration.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10868 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-23 17:53:12 +00:00
Jean-Philippe Lang 25c63ec747 Adds a Project.rebuild_tree! method to force the rebuild of the nested set.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10867 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-23 17:50:46 +00:00
Toshi MARUYAMA f6367b8ba7 scm: git: fix tests fail when extra_info is nil (#12409)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10857 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-21 08:17:56 +00:00
Toshi MARUYAMA 5d8d38aa60 scm: git: fix changesets aren't read after clear_changesets call (#12409)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10856 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-21 07:44:29 +00:00
Toshi MARUYAMA 6740f441c4 fix non ASCII attachment filename encoding broken (MOJIBAKE) in receiving mail on Ruby 1.8 (#12399)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10852 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-21 05:37:22 +00:00
Toshi MARUYAMA adcf54a92b remove trailing white-space from app/controllers/trackers_controller.rb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10851 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-18 23:15:45 +00:00
Jean-Philippe Lang a829bfa755 Fixed that MailHandler raises an error when email has no subject header (#12396).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10850 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-18 23:09:45 +00:00
Jean-Philippe Lang a49de1c39d Cache languages names to avoid loading all translations files.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10844 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-18 18:01:24 +00:00
Jean-Philippe Lang f36b3fff60 Code cleanup.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10842 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-18 16:01:07 +00:00
Jean-Philippe Lang 46d27348fd Eager-load authors.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10841 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-18 14:37:37 +00:00
Jean-Philippe Lang 5f36e1fff2 Removed the limit of 75 pages when exporting wiki pages (#12274).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10838 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-18 10:18:30 +00:00
Jean-Philippe Lang aa45516a02 Fixed that repository identifier may not be displayed in project settings (#12332).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10837 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-18 10:10:09 +00:00
Jean-Philippe Lang 72ea1851b9 'None' grouped issue list section should be translated (#12358).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10829 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-17 11:18:54 +00:00
Jean-Philippe Lang dd96ef4248 Issue "Update" link broken focus (#12356).
Patch by Alexander Oryol.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10818 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-17 08:48:08 +00:00
Toshi MARUYAMA 617cb7ac53 fix receiving mail subject broken which does not begin with encoding name (#12375)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10812 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-16 06:19:42 +00:00
Jean-Philippe Lang 8b527ce247 Fixed version date validation (#12359).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10810 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-15 22:43:10 +00:00
Jean-Philippe Lang b880020527 Code cleanup.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10804 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-13 22:15:47 +00:00
Jean-Philippe Lang 547b85c4ef Adds table name to the SQL clause used by Principale.like scope.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10803 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-13 22:13:39 +00:00
Jean-Philippe Lang d21cfe6bb4 Code cleanup.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10802 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-13 22:03:42 +00:00
Jean-Philippe Lang ce04c41830 Fixed that Principal#like scope does not work with cyrillic characters and Postgresql (#12349).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10801 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-13 22:01:31 +00:00
Toshi MARUYAMA cb68851eac remove trailing white-space from app/controllers/timelog_controller.rb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10797 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-13 03:58:38 +00:00
Jean-Philippe Lang d6b1ad38a7 Adds a div that wraps everything except the footer.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10794 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-08 18:26:48 +00:00
Jean-Philippe Lang c8b722456c Fixed that watchers receive notifications for private comments without permission (#12286).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10789 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-11-05 15:49:07 +00:00
Jean-Philippe Lang b5f8290f4c Fixed source indentation (#8106).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10772 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-30 15:17:11 +00:00
Jean-Philippe Lang f909a8c006 Issues by Category should show tasks without category (#8106).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10771 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-30 14:24:33 +00:00
Jean-Philippe Lang 399223daba New user name format: firstname + first letter of lastname (#12085).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10770 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-30 08:40:12 +00:00
Jean-Philippe Lang d62ef6b9b1 Changes how relative date filters work and adds specific filters for filtering dates in past/next n days (#11426).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10768 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-30 08:21:15 +00:00
Jean-Philippe Lang b9c72bf590 Validate value for date filters.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10767 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-30 07:53:14 +00:00
Jean-Philippe Lang 9f148e098b Ability to sort issues by grouped column (#3511).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10765 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-29 18:32:41 +00:00
Jean-Philippe Lang 1f55907f83 Display non working days on gantt according to settings (#2161).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10750 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-29 10:21:00 +00:00
Jean-Philippe Lang 5fe4aae7ba Non working days is an array of strings (#2161).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10749 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-29 10:19:40 +00:00
Jean-Philippe Lang b71355f10b Ignore non-working days when rescheduling an issue (#2161).
Weekly non-working days can be configured in application settings (set to saturday and sunday by default).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10747 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-29 10:06:30 +00:00
Jean-Philippe Lang 48d83884c3 Hard-coded "Back" on 404 view (#12231).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10745 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-28 20:42:18 +00:00
Jean-Philippe Lang fe690dcf20 Use page parameter instead of p for pagination.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10744 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-28 20:27:50 +00:00
Jean-Philippe Lang beb2610650 REST API for deleting wiki pages (#7082).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10743 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-28 20:17:38 +00:00
Toshi MARUYAMA d840837563 remove trailing white-space from app/controllers/repositories_controller.rb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10736 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-28 01:12:00 +00:00
Jean-Philippe Lang 29a474b641 Wrap issue description and its contextual menu in a div (#12211).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10728 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-27 08:35:19 +00:00
Jean-Philippe Lang 113f8b5cf2 Adds a textual css class for issue priorities (#12216).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10720 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-26 01:25:23 +00:00
Jean-Philippe Lang a679d19709 Adds last edit comments on the wiki page (#7082).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10719 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-25 21:17:46 +00:00
Jean-Philippe Lang 03062394fc Adds ?include=attachments option when retrieving a wiki page with the REST API (#7082).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10718 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-25 20:44:37 +00:00
Jean-Philippe Lang eff874b29a REST API for creating/updating wiki pages (#7082).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10717 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-25 20:38:29 +00:00
Jean-Philippe Lang 9e31308720 REST API for retrieving wiki pages (#7082).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10716 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-25 19:44:04 +00:00
Jean-Philippe Lang b2e035fa96 Don't show confirmation message when disabled delete link in the context menu (#12199).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10715 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-24 21:24:40 +00:00
Toshi MARUYAMA e0811bc80d scm: use nil instead of @rev at revision text box of "View all revisions" page
@rev is set as default branch at controller.
On Git, in most cases it is "master".
And it is set on revision text box of "View all revisions" page.
"master" branch is NOT revision, so clicking OK button causes error.
It is very confused.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10713 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-24 11:12:05 +00:00
Toshi MARUYAMA c4ce048970 fix "Page not found" on OK button in SCM "View all revisions" page (#12196)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10709 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-24 09:24:30 +00:00
Jean-Philippe Lang 6cccdce06e Ability to delete a version from a wiki page history (#10852).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10705 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-23 18:45:14 +00:00
Jean-Philippe Lang d66b3452db Wiki page versions routes cleanup.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10687 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-21 18:46:26 +00:00
Jean-Philippe Lang 61d8e8f1f4 Don't show watch, lock/unlock, delete links on previous wiki page versions.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10685 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-21 04:56:58 +00:00
Jean-Philippe Lang 9796d18609 Handle deleted wiki page versions (#10852).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10684 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-21 04:43:15 +00:00
Jean-Philippe Lang 251f263abd Let the attachment filename be specified on upload (#12125).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10678 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-18 21:06:35 +00:00
Jean-Philippe Lang 79c1ec7adc Reverts r10676 that broke a test.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10677 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-18 18:11:42 +00:00
Jean-Philippe Lang e7dfc30c2f Code cleanup.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10676 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-18 17:15:26 +00:00
Jean-Philippe Lang 9b702971bf Use named route.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10675 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-18 17:12:22 +00:00
Jean-Philippe Lang 2b4389466f Use named route.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10674 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-18 17:10:00 +00:00
Jean-Philippe Lang 7729178d9d Adds links to locked users when current user is admin.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10673 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-18 17:08:42 +00:00
Jean-Philippe Lang 1a9d482fc9 Code cleanup.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10671 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-18 16:47:41 +00:00
Jean-Philippe Lang 1737552eca Fixed that invalid start date is ignored (#12092).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10670 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-18 16:43:14 +00:00
Jean-Philippe Lang d62b90db73 Makes enumerations available through the REST API.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10664 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-17 17:29:27 +00:00
Jean-Philippe Lang fcb22595d0 Use named route (#12113).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10663 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-17 17:01:07 +00:00
Jean-Philippe Lang ef1f14905b Use parent tracker as the default tracker when adding a subtask (#12113).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10662 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-17 17:00:24 +00:00
Jean-Philippe Lang b8fbb41d5f Adds a helper for displaying a link to add a subtask (#12113).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10661 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-17 16:58:44 +00:00
Jean-Philippe Lang 0a000921f8 Use a local variable.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10660 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-17 16:54:26 +00:00
Jean-Philippe Lang 4b6b568635 Fixed that entering #nnn as parent task should validate (#11979).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10658 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-14 14:35:57 +00:00
Jean-Philippe Lang 8a6ce3a646 Make sure that custom field format cannot be changed.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10624 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-13 07:40:07 +00:00
Toshi MARUYAMA 3bda16f825 remove trailing white-spaces from app/controllers/issue_categories_controller.rb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10622 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-12 22:57:15 +00:00
Jean-Philippe Lang ad94777d9c Expose roles details via REST API (#11502).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10620 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-12 17:22:52 +00:00
Jean-Philippe Lang 2b797fa82f Fixed: No validation errors when entering an invalid "Parent task" (#11979).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10615 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-12 13:40:41 +00:00
Jean-Philippe Lang 8358dc1cc5 Fixed that User#allowed_to? should return true or false (#12078).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10614 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-12 09:12:03 +00:00
Jean-Philippe Lang 3e706adddd Preserve username when authentification failed (#11846).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10609 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-11 17:17:30 +00:00
Jean-Philippe Lang 5344a35f72 Adds an optional X-Redmine-Switch-User header to let admin users swicth user in API calls (#11755).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10608 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-11 17:07:24 +00:00
Jean-Philippe Lang 83bcc1f043 Adds a setting to allow subtasks to belong to other projects (#5487).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10587 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-10 17:38:17 +00:00
Jean-Philippe Lang 5a02dcf0a9 Fixed that issue notes preview is broken by r10547 (#1554).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10585 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-09 19:11:49 +00:00
Jean-Philippe Lang 3a178a42cf Add "last 2 weeks" preset to time entries reporting (#11862).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10583 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-09 17:40:00 +00:00
Jean-Philippe Lang 7626b21a1e Fixed that export: links are broken (#12050).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10580 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-09 17:02:22 +00:00
Jean-Philippe Lang 6f13f2b842 Restyles the issue counts.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10569 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-07 13:42:40 +00:00
Toshi MARUYAMA 6d6f42c6a9 remove trailing white-spaces from app/controllers/application_controller.rb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10566 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-05 00:30:52 +00:00
Jean-Philippe Lang 9d8c0f9a63 Adds label_any string for filters.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10562 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-04 18:50:43 +00:00
Jean-Philippe Lang 5411f93a9a Passing the format in the template name is deprecated.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10561 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-04 18:15:05 +00:00
Jean-Philippe Lang b9d7c22297 Adds no_issue_in_project operator for relations filter (#3265).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10559 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-04 18:10:41 +00:00
Toshi MARUYAMA 88e1587b08 sort custom field issue filter by type and position (#12018)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10555 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-04 04:48:48 +00:00
Toshi MARUYAMA fb4210b6d9 move CustomFieldsHelper tabs variable to model constant for common use (#12018)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10554 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-04 04:48:20 +00:00
Toshi MARUYAMA 7c0c699f95 change "is_private" issue filter order from 15 to 16 (#12018)
Order 15 is duplicate with "watcher_id" filter.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10552 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-04 04:09:41 +00:00
Toshi MARUYAMA eaf46c5512 change "status" issue filter order from 1 to 0 (#12018)
Order 1 is duplicate with "project" filter.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10551 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-04 04:09:14 +00:00
Toshi MARUYAMA b571c3dbc9 split QueriesHelper filters_options_for_select method and add new unit test (#12018)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10550 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-04 04:08:38 +00:00
Jean-Philippe Lang 0178b5a2fe Private issue notes (#1554).
Adds 2 new permissions for viewing/adding private comments to issues.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10547 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-03 21:36:19 +00:00
Toshi MARUYAMA 1d4c8abe96 code layout cleanup Query available_filters method
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10545 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-02 10:29:18 +00:00
Toshi MARUYAMA ef988ba17c code cleanup r10542 changes (#10937)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10544 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-01 07:19:11 +00:00
Toshi MARUYAMA a29854707b add new user format "lastname" (#10937)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10543 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-01 07:08:04 +00:00
Toshi MARUYAMA de0e0f09a3 pin user format order at setting panel (#10937)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10542 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-01 07:07:49 +00:00
Jean-Philippe Lang 81782f2408 Call sort for array with more than one element only.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10519 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-29 15:28:26 +00:00
Jean-Philippe Lang 99662fa18e Test failure.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10518 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-29 15:26:52 +00:00
Jean-Philippe Lang c292971390 Display visible relations in API response.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10514 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-29 13:01:09 +00:00
Jean-Philippe Lang 1b6da80e16 Makes related issues available for display and filtering on the issue list (#3239, #3265).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10513 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-29 12:57:38 +00:00
Jean-Philippe Lang f1fdbf8d80 Do not link copied issues when copying a project (#6899).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10495 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-27 22:27:37 +00:00
Jean-Philippe Lang f58ed6c206 Fixed that issue author is assigned with current user when the edit form is updated (#11975).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10494 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-27 22:12:11 +00:00
Jean-Philippe Lang d255f7f5b0 Don't display the dropdown if no transition is allowed.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10493 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-27 22:03:38 +00:00
Jean-Philippe Lang cc4cff9f11 Adds a "Copied from/to" relation when copying issue(s) (#6899).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10491 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-27 19:09:30 +00:00
Toshi MARUYAMA c3e055bd70 explicitly define route at scm diff view (#11966)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10490 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-27 16:05:33 +00:00
Toshi MARUYAMA d1d8640822 code layout cleanup app/views/issues/_list.html.erb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10470 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-25 23:32:39 +00:00
Toshi MARUYAMA 49c2f316c2 remove trailing white-spaces from app/models/query.rb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10469 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-25 23:32:15 +00:00
Toshi MARUYAMA 95fe4d61c9 replace tab to space at app/models/query.rb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10468 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-25 23:31:49 +00:00
Jean-Philippe Lang 917a89fbf7 Fixed JSON escaping of filters (#11929).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10465 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-25 18:23:11 +00:00
Jean-Philippe Lang 18d1c62ca8 Use eager loaded #principal association instead of #user (#11904).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10442 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-22 10:12:59 +00:00
Jean-Philippe Lang 5ce2f4f81c Use eager loaded #principal association instead of #user (#11904).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10441 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-22 09:48:38 +00:00
Jean-Philippe Lang 7c8ac2eecc Avoid to run one SQL query per member on Project#assignable_users (#11904).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10440 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-22 09:33:30 +00:00
Jean-Philippe Lang 838025372d Potential can't dup NilClass error in UserPreference (#11905).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10438 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-22 06:16:53 +00:00
Jean-Philippe Lang 5328c4adcb Anonymous users should always see public issues only (#11872).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10437 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-20 19:26:58 +00:00
Jean-Philippe Lang 30b3e796ff New relation form Cancel link is broken with Chrome 21 (#11036).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10436 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-20 16:59:37 +00:00
Jean-Philippe Lang 59d8ae61ef Anonymous users should not see private issues with anonymous author (#11872).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10433 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-19 21:48:33 +00:00
Toshi MARUYAMA 0af04b8ae0 use radio buttons instead of a select at attachment as same as r10426 repository
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10427 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-18 23:48:52 +00:00
Jean-Philippe Lang 3586e44c1d Use radio buttons instead of a select.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10426 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-18 20:51:31 +00:00
Jean-Philippe Lang 12de6a177a Fixed that git diff displays deleted files as /dev/null (#11868).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10424 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-18 19:32:58 +00:00
Toshi MARUYAMA f9208d7c5c scm: bazaar: use log encoding as path encoding (#11834)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10420 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-18 09:30:11 +00:00
Toshi MARUYAMA cbe28d75d0 fix deprecation warning of the format in the template name
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10419 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-18 03:15:00 +00:00
Jean-Philippe Lang 187d5db6b4 Fixed #onthefly_creation_failed broken by r9940 (#11850).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10412 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-17 18:31:20 +00:00
Jean-Philippe Lang ca4f2c59b6 Attachments should be available to the text formatter when previewing an existing news.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10400 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-16 14:18:43 +00:00
Toshi MARUYAMA 2058c66d73 scm: bazaar: remove unused scm.revisions ":with_paths => true" option from fetch_changesets method
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10399 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-16 14:15:07 +00:00
Jean-Philippe Lang a81da3491e Do not consider that versions that are due today are completed.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10397 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-16 14:09:41 +00:00
Toshi MARUYAMA 72af2730ff remove unused "require 'redmine/codeset_util'" from RepositoriesHelper
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10383 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-15 15:40:58 +00:00
Toshi MARUYAMA 5441f8de4d remove redundant empty lines from RepositoriesHelper
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10382 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-15 15:08:28 +00:00
Toshi MARUYAMA e659aff468 remove unused "require 'iconv'" from RepositoriesHelper
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10381 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-15 15:07:29 +00:00
Etienne Massip 597fbf0e04 Fixed comment.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10377 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-12 21:30:30 +00:00
Jean-Philippe Lang 40302566a8 Code cleanup (#11814).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10373 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-11 17:26:42 +00:00
Jean-Philippe Lang 6d0aed1f44 Set the first day of week in the date picker according to settings (#11814).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10372 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-11 17:15:54 +00:00
Jean-Philippe Lang a3d0e82552 Use javascript_tag.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10371 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-11 17:01:45 +00:00
Jean-Philippe Lang 818f3564fa Moved the javascript includes in html head.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10370 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-11 16:59:30 +00:00
Toshi MARUYAMA 7d8db59dae do not show estimated time if it is nil on issue page
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10364 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-11 14:13:30 +00:00
Jean-Philippe Lang 3b5fd45fae Log current user on each request.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10339 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-09 14:54:22 +00:00
Jean-Philippe Lang 972a991a92 Code cleanup.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10337 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-09 11:34:35 +00:00
Jean-Philippe Lang 197a14a82e Fixed that the reminder email excludes issues assigned to groups (#11723).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10335 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-09 11:02:13 +00:00
Jean-Philippe Lang ff86c37ed3 Fixed: Issues associated with a locked version are not copied when copying a project (#11207).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10334 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-09 10:11:49 +00:00
Jean-Philippe Lang 5e9320137b Fixed that target version is lost on project copy for issues that are assigned to a shared version from another project.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10333 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-09 10:01:03 +00:00
Jean-Philippe Lang 18ed4cf373 Code cleanup.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10332 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-09 09:51:44 +00:00
Jean-Philippe Lang b72d40a429 Do not copy subtasks twice when copying an issue and its descendants (#6965).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10329 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-08 06:14:35 +00:00
Jean-Philippe Lang 6a37151b5c Adapt subtasks copy when copying a project (#6965).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10328 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-08 05:56:48 +00:00
Jean-Philippe Lang 5003927f13 Option to copy subtasks when copying issue(s) (#6965).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10327 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-08 05:34:07 +00:00
Toshi MARUYAMA ffcf1925e3 gantt: code layout cleanup html days headers
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10326 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-08 03:21:55 +00:00
Toshi MARUYAMA ad4ee1c8d8 gantt: code layout cleanup html weeks headers
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10325 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-08 03:21:17 +00:00
Toshi MARUYAMA d4fc347a8a gantt: use content_tag instead of html tag at days headers
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10324 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-08 02:47:27 +00:00
Toshi MARUYAMA c25d175623 gantt: use content_tag instead of html tag at gantt header outline
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10323 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-08 02:00:32 +00:00
Toshi MARUYAMA 47e375b271 gantt: code layout cleanup ruby code at head of show.html.erb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10322 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-08 02:00:17 +00:00
Toshi MARUYAMA eeedd287ad gantt: code layout cleanup html months headers
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10321 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-08 00:59:42 +00:00
Toshi MARUYAMA 2edb8d597a gantt: use content_tag instead of html tag at gantt subject
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10320 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-08 00:59:08 +00:00
Toshi MARUYAMA 23eae0bf3c gantt: code cleanup html today red line
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10319 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-08 00:58:41 +00:00
Toshi MARUYAMA 822a627c44 gantt: fix code indents of html today red line
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10318 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-08 00:57:57 +00:00
Toshi MARUYAMA 3431b860ad gantt: use content_tag instead of html tag at gantt today red line
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10317 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-07 23:03:40 +00:00
Toshi MARUYAMA 3483938185 gantt: use content_tag instead of html tag at gantt weeks headers
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10316 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-07 23:03:16 +00:00
Toshi MARUYAMA 2af4bb6a86 gantt: use content_tag instead of html tag at gantt months headers
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10315 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-07 14:35:33 +00:00
Toshi MARUYAMA b9586dd570 gantt: code layout cleanup html gantt days headers
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10314 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-07 14:35:20 +00:00
Toshi MARUYAMA 40df75243b code layout cleanup app/views/gantts/show.html.erb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10313 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-07 11:59:48 +00:00
Toshi MARUYAMA 0486ce9976 code layout cleanup gantt weeks headers
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10312 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-07 11:59:34 +00:00
Toshi MARUYAMA 621b15c923 code layout cleanup gantt months headers
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10311 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-07 11:59:19 +00:00
Toshi MARUYAMA d1eb07dd8b fix code indent of gantt days headers
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10310 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-07 11:59:05 +00:00
Toshi MARUYAMA 9c5f339efb code layout cleanup app/views/gantts/show.html.erb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10309 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-07 01:36:16 +00:00
Toshi MARUYAMA bbed770fa4 remove redundant empty lines from app/views/repositories/_revision_graph.html.erb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10308 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-07 01:35:18 +00:00
Jean-Philippe Lang bcb4c2cde4 Parse any heading level (#11789).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10294 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-06 17:03:13 +00:00
Toshi MARUYAMA 99913e80f0 show JQuery datepicker today button
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10291 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-05 17:22:08 +00:00
Jean-Philippe Lang ca7498c2d6 Create role by copy (#9258).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10285 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-03 17:04:28 +00:00
Jean-Philippe Lang 1b64e4be5e Set radio button when selecting a date with the date picker.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10284 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-02 17:24:29 +00:00
Jean-Philippe Lang 3a32edc3bd Adds a view for editing all trackers fields.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10283 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-02 16:55:16 +00:00
Jean-Philippe Lang 462c986452 Moved link to the contextual menu.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10282 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-02 15:13:40 +00:00
Toshi MARUYAMA 48b9b805b2 fix typo "MACROS_SUB_RE" (#11736)
Contributed by Anton Argirov.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10277 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-02 11:09:43 +00:00
Jean-Philippe Lang 8b72710d7e Fixed: New multi-line macros regexp is too eager (#11736).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10276 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-02 10:24:56 +00:00
Jean-Philippe Lang 265baa1b2c Upgrade to Rails 3.2.8 (#11758).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10275 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-02 10:08:51 +00:00
Toshi MARUYAMA 564de36c08 remove trailing white-space from app/controllers/wiki_controller.rb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10246 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-31 23:01:51 +00:00
Jean-Philippe Lang 3a77d543fd Code cleanup: removed the obsolete with_limit scope.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10243 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-27 10:54:01 +00:00
Jean-Philippe Lang d33fa1f8c8 Do not build a projects_by_role Hash that gets updated when accessing a key that is not present (#11662).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10242 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-27 10:11:20 +00:00
Jean-Philippe Lang 50506ef621 Make sure we don't build an empty IN () statement (#11662).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10241 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-27 10:09:08 +00:00
Jean-Philippe Lang c68ee7f545 Fixed that destroying a user from the edit page returns a 404 response (#11691).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10240 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-26 10:50:59 +00:00
Jean-Philippe Lang ebc979e9b1 Do not use escaped back_url param (#11691).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10239 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-26 10:40:09 +00:00
Jean-Philippe Lang 3cc6d5e815 Reverted r10234 and r10235 that broke redirect after login (#11691).
Tests in account_controller_test.rb should not have been changed.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10238 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-26 09:29:48 +00:00
Jean-Philippe Lang a2e59cc956 Don't use tag helper in layout (#11704).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10237 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-26 09:25:25 +00:00
Jean-Philippe Lang 5969df8142 MailHandler: Match assignee on the full display name (#11552).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10236 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-26 09:03:17 +00:00
Etienne Massip 70226f1833 Use a back_url parameter instead of referrer to refresh the page after user deletion (#11691).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10234 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-24 21:23:10 +00:00
Toshi MARUYAMA d1a52fd301 use Rails3 Active Record syntax in DocumentCategory model
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10228 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-22 00:13:31 +00:00
Toshi MARUYAMA 665a331cc4 force set default document category if it is not set on database (#11665)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10221 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-21 13:45:53 +00:00
Jean-Philippe Lang fc3a09e49a Let macros optionally accept a block of text (#3061).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10210 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-18 08:25:22 +00:00
Jean-Philippe Lang 73aece0baf Macros processing overhaul (#3061, #11633).
* macro arguments are no longer parsed by text formatters
* macro output is escaped unless it's html safe

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10209 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-17 14:46:55 +00:00
Toshi MARUYAMA 91a09bd474 fix unit test fails on JRuby 1.6.7.2 (#11577)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10207 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-14 00:30:23 +00:00
Jean-Philippe Lang 3673fbd881 Fixed: Can't use non-latin anchor in wiki (#11577).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10206 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-13 19:36:00 +00:00
Jean-Philippe Lang 327660eb7f Respond with 404 on ActionView::MissingTemplate (#11503).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10204 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-13 18:34:00 +00:00
Jean-Philippe Lang 3119d1996c Use abbr_day_name to get the first letter of the day name (#9839).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10202 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-13 18:13:10 +00:00
Jean-Philippe Lang 861ca78179 Fixed that roadmap anchor links can be ambigous (#11540).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10200 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-13 14:41:53 +00:00
Jean-Philippe Lang 8fb1a7e3cc Fixed that open scope on Project#issues raises an error (#11545).
Patch by Petr Pospisil.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10199 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-13 14:23:33 +00:00
Jean-Philippe Lang 91c875437d Adds a title to the issue link in the flash message.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10198 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-13 14:04:00 +00:00
Jean-Philippe Lang 145e5997b2 Removed duplicated helper (#11539).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10191 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-10 18:41:24 +00:00
Jean-Philippe Lang 32fcdff69f Removed p around ul.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10190 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-10 18:39:49 +00:00
Jean-Philippe Lang c0c491dd61 Display a projects tree instead of a flat list in notification preferences (#11539).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10189 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-10 17:30:35 +00:00
Jean-Philippe Lang 0a6c1d9c13 Extract code to render nested listed of projects in an helper (#11539).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10188 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-10 17:09:48 +00:00
Jean-Philippe Lang e52219f09d Fixed that projects are not ordered alphabetically after renaming project (#11508).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10187 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-10 16:50:15 +00:00
Jean-Philippe Lang 02b2a61e15 Reverted r10184 (#9365).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10186 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-10 16:35:58 +00:00
Jean-Philippe Lang 8b12702ebe Fixed that search results are escaped twice.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10185 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-10 16:22:26 +00:00
Jean-Philippe Lang cbfafcd5e2 Use SSL for gravatars according to the protocol in settings (#9365).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10184 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-09 18:04:54 +00:00
Jean-Philippe Lang e06bf0c464 Don't show the project dropdown when logging time on an issue.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10183 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-09 17:12:24 +00:00
Jean-Philippe Lang f1650b8ff4 Adds autocomplete to issue field on time logging form.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10182 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-09 16:58:36 +00:00
Jean-Philippe Lang f82a7a35b0 Adds autocomplete to "Related issue" field on revision (#11102).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10181 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-09 16:46:13 +00:00
Jean-Philippe Lang 908b960e71 Code cleanup.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10180 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-09 16:43:12 +00:00
Jean-Philippe Lang 0ce0b52342 Code cleanup.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10179 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-08 21:28:07 +00:00
Jean-Philippe Lang b907398788 Slight change to the macro regexp.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10178 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-08 18:54:01 +00:00
Jean-Philippe Lang 2e4f3d5a60 Code cleanup.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10177 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-08 18:47:52 +00:00
Jean-Philippe Lang e2d6f0af4e Adds an option to macro definition to disable arguments parsing (#11578).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10174 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-08 16:28:33 +00:00
Jean-Philippe Lang b6be9bff35 Log successful authentications.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10166 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-07 19:50:18 +00:00
Jean-Philippe Lang 3676783052 Ability to filter issues using project, author, assignee and target version custom fields (#8161).
Custom fields must be marked as "Used as filter" to show up in the filters list.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10164 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-07 19:17:59 +00:00
Jean-Philippe Lang 599736aca7 Update the new custom field form with remotely.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10163 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-07 16:58:51 +00:00
Jean-Philippe Lang 1749fbf3e6 Build issue filters using javascript.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10162 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-07 16:41:46 +00:00
Jean-Philippe Lang e9de6c1415 Removed csshover for IE6.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10161 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-07 16:16:19 +00:00
Jean-Philippe Lang 962134ab4f Prevent "Overwriting existing method User.active" warning, scope is already defined on the base class (#11545).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10160 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-07 16:14:24 +00:00
Jean-Philippe Lang 2e35a6800f Prevents "Overwriting existing method Issue.open" warning (#11545).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10159 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-07 16:13:04 +00:00
Jean-Philippe Lang 1949f61d0c Fixed: Custom fields of type version not proper handled in receiving e-mails (#11571).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10157 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-06 21:16:19 +00:00
Jean-Philippe Lang f8183429a9 Adjust the comment.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10153 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-02 16:48:23 +00:00
Jean-Philippe Lang 2275f46138 Makes Version#<=> consistent with SQL sort.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10152 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-02 16:47:53 +00:00
Jean-Philippe Lang 34cdac1669 Sort issues by scheduled versions first then unscheduled versions.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10151 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-02 16:47:06 +00:00
Jean-Philippe Lang b603aa74f9 Adds sharing attribute to the versions API (#11541).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10148 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-07-31 18:14:28 +00:00
Jean-Philippe Lang c57a2974d1 Fixed that Mailer.with_synched_deliveries does not use delivery settings (#11550).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10147 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-07-31 18:09:33 +00:00
Jean-Philippe Lang 77d94818a4 Removed AuthSourceLdap.human_attribute_name.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10146 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-07-31 17:30:01 +00:00
Jean-Philippe Lang a53894dd22 Set @previewed for rendering preview partial.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10145 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-07-31 17:22:17 +00:00
Jean-Philippe Lang d99dbe9f0c Eager loading and no extra count query.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10144 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-07-31 17:21:14 +00:00
Jean-Philippe Lang bc153cb61d Support for subforums (#3831).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10142 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-07-31 17:17:52 +00:00
Toshi MARUYAMA 96306f9dff replace tabs to spaces at app/views/repositories/_dir_list_content.html.erb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10136 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-07-30 01:32:31 +00:00
Jean-Philippe Lang 08f200c487 Fixed legend tag position.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10130 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-07-29 12:13:47 +00:00