Commit Graph

7853 Commits

Author SHA1 Message Date
Jean-Philippe Lang 7fa18cad57 Prevent ActiveRecord::StaleObjectError in Issue#reschedule_after (#7920).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8864 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-12 19:41:42 +00:00
Jean-Philippe Lang d289619c75 Fixed potential error when sorting members without role (#10053).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8863 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-12 14:54:30 +00:00
Jean-Philippe Lang 10a462369b Adds a css class (noborder) for making borderless tables text formatting.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8862 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-12 14:23:08 +00:00
Jean-Philippe Lang 83458ee824 Updated test against r8860.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8861 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-12 14:18:32 +00:00
Jean-Philippe Lang 0ede069d2c Allows custom styles in textile formatting using a white list of styles (#2416).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8860 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-12 14:00:43 +00:00
Jean-Philippe Lang e14a9f5503 Adds Estonian translation by Kaitseministeerium (#10208).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8859 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-12 10:56:45 +00:00
Jean-Philippe Lang 96757857c4 Removed "clear:both" divs that break the issue form with long sidebar content.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8858 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-12 10:50:41 +00:00
Toshi MARUYAMA 58996e891e scm: git: explicitly return string as default branch (#10207)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8857 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-12 08:26:31 +00:00
Toshi MARUYAMA 2fa19441a7 scm: git: use default branch from HEAD (#10207)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8856 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-12 06:22:59 +00:00
Toshi MARUYAMA 804482ef2b scm: git: update test repository (#10207)
New "master-20120212" branch is added.
Git branch is the reference to the specific revision.
This branch points the same revision with "master" branch.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8855 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-12 06:22:33 +00:00
Jean-Philippe Lang 8ddcc4caf5 Adds a News#commentable? method to easily specific additional rules.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8854 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-11 17:14:56 +00:00
Etienne Massip 9678e335a4 Moved revision graph holder div out of the table structure.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8853 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-11 15:32:24 +00:00
Etienne Massip 2da8e97268 Included scm stylesheet in changes page.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8852 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-11 15:31:11 +00:00
Etienne Massip ec537f6ea4 Use of local variable for consistency.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8851 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-11 14:59:57 +00:00
Etienne Massip 1ad977f712 Integrated revision graph into scmid column.
Allow wrapping of comment text so that the width doesn't overlap the sidebar while using multiple repositories.
Some code cleanup also.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8850 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-11 14:57:44 +00:00
Jean-Philippe Lang 627754366c Prevent random failures due to params order.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8849 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-11 14:53:31 +00:00
Jean-Philippe Lang b5fabd052b Adds a test for changeset/issue relations deletion.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8848 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-11 14:19:16 +00:00
Jean-Philippe Lang 8f92121606 Fixed that changesets parents associations are not deleted when deleting a repository.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8847 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-11 14:17:47 +00:00
Jean-Philippe Lang 17d5118de6 Move the calendar in front of the modal box.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8846 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-11 13:12:30 +00:00
Jean-Philippe Lang 60b9e59d15 Displays the full form when creating a version from the issue form so that required custom fields can be filled (#7398).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8845 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-11 13:05:41 +00:00
Jean-Philippe Lang 2ec55c5337 Only show statuses that can be applied to all issues on the bulk edit form (#10181).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8844 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-11 12:03:48 +00:00
Jean-Philippe Lang 004968caf3 Removed extra argument from SubversionAdapter#diff.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8843 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-11 11:33:17 +00:00
Jean-Philippe Lang 1e66a0c069 POP3 task only recognizes Message-ID header, not Message-Id (#10198).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8842 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-11 10:06:14 +00:00
Jean-Philippe Lang 686430ee36 Fixed: wrong section edit links when a heading contains inline code (#10199).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8841 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-11 10:02:24 +00:00
Toshi MARUYAMA 165327a074 scm: git: reduce saving heads times in fetching revisions (#8857, #9472)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8840 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-11 05:42:43 +00:00
Toshi MARUYAMA 1e5f16722f scm: git: call "git log" only once instead of per branch in fetching revisions (#8857)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8839 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-11 05:42:06 +00:00
Toshi MARUYAMA c2943ffd29 code layout cleanup app/views/repositories/committers.html.erb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8838 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-11 03:37:09 +00:00
Toshi MARUYAMA d90cdb1b10 scm: git: raise exception if "git log" is error and block is given in lib revision method (#8857)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8837 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-10 22:56:54 +00:00
Toshi MARUYAMA c5c8cd43c0 Traditional Chinese translation updated by ChunChang Lo (#10195)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8836 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-10 22:56:28 +00:00
Jean-Philippe Lang c0491d298b Makes error class more specific to prevent clashes with syntax highlight (#10193).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8835 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-10 18:03:10 +00:00
Jean-Philippe Lang 71f3589238 Removed unused style.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8834 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-10 17:49:40 +00:00
Toshi MARUYAMA a2c362a88d Ruby1.9: move setting Encoding.default_external after boot (#4050, #4796)
"ruby test/functional/repositories_git_controller_test.rb" fails
on Japanese Windows and Mingw Ruby 1.9.3p0
because "Rails" is not defined.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8833 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-10 13:08:53 +00:00
Toshi MARUYAMA 4d5d51e322 scm: git: clarify the purpose of the unit model test to fetch history editing revisions
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8832 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-10 07:25:27 +00:00
Toshi MARUYAMA 2cfdb8306d remove tailing white spaces from public/javascripts/application.js
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8831 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-10 00:36:21 +00:00
Toshi MARUYAMA 30a9cf0f03 replace tabs to spaces and fix indents public/javascripts/application.js
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8830 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-10 00:35:58 +00:00
Jean-Philippe Lang daacea11dc Do not hide context menu when clicking on a folder menu item.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8829 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-09 20:25:01 +00:00
Jean-Philippe Lang e1072a3c4f Slight change to the context menu style.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8828 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-09 20:18:21 +00:00
Jean-Philippe Lang 8c38510ee5 Use #reduce instead of #inject for getting the intersection of arrays.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8827 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-09 20:06:36 +00:00
Jean-Philippe Lang 8b3ed4175d Code cleanup.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8826 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-09 19:51:38 +00:00
Jean-Philippe Lang 07a93c2731 Only show allowed statuses in context menu (#10181).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8825 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-09 19:34:56 +00:00
Jean-Philippe Lang 5e0c1cc5ce Bulk-edit custom fields through context menu (#6296).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8824 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-09 18:22:11 +00:00
Jean-Philippe Lang de7c49c6ca Moved #context_menu_link to a new helper.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8823 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-09 18:00:22 +00:00
Toshi MARUYAMA c94426d21e scm: git: add explicit :excludes option to calling revision method in "test_revisions_includes_master_two_revs_from_origin" of unit lib test (#8857)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8822 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-09 15:07:11 +00:00
Toshi MARUYAMA 7f70d2faaa scm: git: add test of get revisions from disjointed histories to unit lib test (#8857)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8821 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-09 08:34:24 +00:00
Toshi MARUYAMA e34dab7443 scm: git: update test repository (#8857)
New disjointed history revisions are added.
This test repository has two origins.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8820 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-09 08:20:37 +00:00
Toshi MARUYAMA a9ad2a4dcc scm: git: remove redundant comma from test_revisions_includes_master_two_revs_from_origin of unit lib test
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8819 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-09 07:39:27 +00:00
Toshi MARUYAMA f4de82510a scm: git: code cleanup "test_branches" of unit lib test
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8818 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-09 06:43:42 +00:00
Toshi MARUYAMA 19909bc4c8 scm: git: add lib test to get master branch revisions from origin (#8857)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8817 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-09 06:05:10 +00:00
Toshi MARUYAMA 693191e8bf scm: git: add model method to get heads from extra_info branches hash (#8857)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8816 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-09 00:11:03 +00:00
Toshi MARUYAMA 34b3a9851f scm: git: add includes and excludes options to lib revisions method (#8857)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8815 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-08 23:38:35 +00:00