Commit Graph

3934 Commits

Author SHA1 Message Date
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 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 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 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
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 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 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 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 adb81b1ff6 scm: git: split fetch_changesets method
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8814 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-08 11:10:46 +00:00
Jean-Philippe Lang cdcf813fa7 Adds membership ids to /users/:id API response.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8805 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-06 16:32:50 +00:00
Jean-Philippe Lang dfbab5d61e Fixed "can't convert Fixnum into String" error on projects with numerical identifier (#10135).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8804 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-06 14:44:40 +00:00
Jean-Philippe Lang be246de161 Adds a simple API for listing roles (#9725).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8799 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-06 10:06:32 +00:00
Jean-Philippe Lang c5665276b7 REST API for project memberships (#7420).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8798 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-06 09:47:10 +00:00
Toshi MARUYAMA 2ef86a2f0a code layout cleanup app/views/repositories/_related_issues.html.erb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8794 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-05 23:51:26 +00:00
Toshi MARUYAMA d360ca4e14 code layout cleanup app/views/wiki/edit.html.erb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8793 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-05 23:51:03 +00:00
Toshi MARUYAMA 297d4f8bab replace tabs to spaces at app/views/wiki/edit.html.erb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8792 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-05 23:50:36 +00:00
Toshi MARUYAMA e0b0f1315b replace tabs to spaces at app/views/issues/_conflict.html.erb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8791 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-05 23:50:01 +00:00
Toshi MARUYAMA adbe4097b3 replace tabs to spaces at app/views/issues/_edit.html.erb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8790 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-05 23:49:19 +00:00
Jean-Philippe Lang 78bd24c6f7 Resourcified project memberships.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8789 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-05 16:35:27 +00:00
Jean-Philippe Lang 001b255b08 Ability to edit a wiki page's parent on the edit page (#6449).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8787 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-05 14:35:27 +00:00
Jean-Philippe Lang 967f42aa98 Adds a X-Redmine-Sender header to email notifications (#5643).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8785 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-05 12:57:19 +00:00
Jean-Philippe Lang f52f18c281 Removed unsafe attributes assignment.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8784 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-05 12:21:21 +00:00
Jean-Philippe Lang 9f6496b0bc Fixed registration form broken by r8479.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8782 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-05 12:17:29 +00:00
Toshi MARUYAMA 232fca78a2 scm: rename JavaScript "branchGraph" function name to "revisionGraph"
"Branch" is not a common concept in the SCMs.

Mercurial "branch" has three terms.
* named branch
* unnamed branch (multiple heads)
* big-picture branch (cloning repository)

Git "branch" is a reference to a specific revision.

It is popular that Mercurial GUI shows all revisions on the top page.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8779 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-05 11:51:43 +00:00
Jean-Philippe Lang a00f04886f Increase username length limit from 30 to 60 (#2719).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8778 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-05 11:50:53 +00:00
Jean-Philippe Lang 1d4ef8964d Adds a "Manage related isses" permission to add/remove commits/issues relations manually from the changeset view (#2009).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8777 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-05 10:56:27 +00:00
Jean-Philippe Lang fb3b904b8f Better handling of issue update conflicts (#8691).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8774 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-04 17:36:15 +00:00
Etienne Massip b9c26d6ddc Revision graph code cleanup.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8773 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-04 14:02:31 +00:00
Jean-Philippe Lang 06f8c4b27a Removed useless code.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8771 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-04 11:41:43 +00:00
Jean-Philippe Lang 333a6cc370 Fixed rounding issue on spent hours column in CSV export (#10150).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8764 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-04 11:03:44 +00:00
Toshi MARUYAMA 2789cf2506 attachment: fix that diff type is not saved in user preference (#10152)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8761 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-04 06:23:38 +00:00
Toshi MARUYAMA 7574ab730d code layout cleanup app/controllers/sys_controller.rb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8756 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-02 23:26:54 +00:00
Jean-Philippe Lang 46ab7b45d7 Permissions report: display role names on each permission group (#10119).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8755 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-02 22:31:00 +00:00
Jean-Philippe Lang e4ef0b04ef Adds specific css class for information in forms.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8754 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-02 20:07:37 +00:00
Jean-Philippe Lang 73f9b825f0 Replaced ruby-net-ldap with net-ldap 0.2.2 gem.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8751 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-02 19:30:01 +00:00
Jean-Philippe Lang d02f6a8e32 Adds a setting that allows to reference/fix issues of all projects (#3087).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8750 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-02 18:09:37 +00:00
Jean-Philippe Lang 3dc73dcb88 Fixed: associated changesets from other projects are not visible if the current project doesn't have the repository module enabled (#3087).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8749 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-02 17:43:36 +00:00
Jean-Philippe Lang b13f85e456 Adds custom field in TimeEntry API responses (#10131).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8748 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-01 21:15:13 +00:00