Commit Graph

15 Commits

Author SHA1 Message Date
Jean-Philippe Lang 4710cd8e6f Merged r12265, r12268, r12272 (#15307).
git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12282 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-11-16 07:48:27 +00:00
Jean-Philippe Lang b7d8913459 Code cleanup, use named routes.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11078 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-12-23 16:10:07 +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 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 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
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
Jean-Philippe Lang 7b40767428 Deprecated :confirm => 'Text' option.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9937 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-07-07 14:36:49 +00:00
Jean-Philippe Lang dc7569ecae Fixed that group filter is escaped on users index.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9679 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-05-13 08:38:35 +00:00
Jean-Philippe Lang 5e57a1a9d9 Merged rails-3.2 branch.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9528 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-04-25 17:17:49 +00:00
Jean-Philippe Lang 091de63f30 Use explicit path name.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8504 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-01-04 18:24:28 +00:00
Jean-Philippe Lang 35e8f0d25d User forms cleanup.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7889 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-11-22 21:43:11 +00:00
Toshi MARUYAMA 21d74ecead [#9489] linked labels to their element
Contributed by Romano Licker.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7688 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-29 01:20:28 +00:00
Toshi MARUYAMA 6b7f4a21a6 remove trailing white-spaces from app/views/users/index.html.erb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7375 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-09-18 01:57:49 +00:00
Toshi MARUYAMA 8b9f0c290a replace tabs to spaces at app/views/users/index.html.erb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7365 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-09-17 23:11:01 +00:00
Toshi MARUYAMA b3869e00fc rename .rhtml to .html.erb of app/views/users/index.rhtml.
:rhtml and :rxml were finally removed as template handlers at Rails 3.1 RC4.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7055 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-09-02 04:42:28 +00:00