Commit Graph

138 Commits

Author SHA1 Message Date
Jean-Philippe Lang f4def66c58 Merged r11518 from trunk (#8529).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11570 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-03-09 10:19:39 +00:00
Jean-Philippe Lang 504116bfca Add login to /users/:id API for current user (#13155).
Patch by Jérôme Bataille.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11437 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-02-18 17:24:54 +00:00
Jean-Philippe Lang 7b8ebb7e3f Auto-populate fields while creating a new user with LDAP (#10286).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11080 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-12-26 11:23:53 +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 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 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 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
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 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 6a2ca5e034 JQuery in, Prototype/Scriptaculous out (#11445).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10068 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-07-22 13:29:26 +00:00
Jean-Philippe Lang 47e496f049 Removes RJS from UsersController.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10059 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-07-21 06:35:49 +00:00
Jean-Philippe Lang 7b3aaca83c Removes a call to link_to_remote.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10025 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-07-18 16:28:07 +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 dd9c2cafa7 REST Api for Groups (#8981).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9758 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-06-03 10:40:32 +00:00
Etienne Massip 121ce2a390 Use time_zone_select specific helper.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9744 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-06-01 13:38:03 +00:00
Toshi MARUYAMA e1268faa4a code layout cleanup app/views/users/_mail_notifications.html.erb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9735 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-05-28 08:24:46 +00:00
Toshi MARUYAMA cfaa0fc23e fix project list is not shown on Email notifications (#11032)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9734 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-05-28 08:24:31 +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
Toshi MARUYAMA d7692b2575 code layout cleanup app/views/users/show.html.erb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8921 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-22 14:36:16 +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 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
Toshi MARUYAMA f9b0cfb63e code layout clean up app/views/users/_memberships.html.erb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8611 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-01-10 08:43:32 +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 3dcd71a082 REST urls for user memberships.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8146 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-12-10 08:37:48 +00:00
Jean-Philippe Lang ede9a03405 Removed TabularFormBuilder references in views.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8142 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-12-09 18:40: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 26313afd5a [#9489] added invisible label for mail notification, linked label where possible
Contributed by Romano Licker.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7692 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-29 01:22:31 +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
Etienne Massip 4ecd65c465 Remove unecessary page title HTML escaping from views (#9252).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7565 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-02 18:45:17 +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 bcd3a9bf6f replace tabs to spaces at app/views/users/_memberships.html.erb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7366 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-09-17 23:11:25 +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 397652321d replace tabs to spaces at app/views/users/new.html.erb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7361 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-09-17 23:09:15 +00:00
Toshi MARUYAMA efbd527692 replace tabs to spaces at app/views/users/_general.html.erb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7271 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-09-17 01:12:56 +00:00
Toshi MARUYAMA d0155bba61 replace tabs to spaces at app/views/users/show.html.erb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7270 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-09-17 01:11:56 +00:00
Toshi MARUYAMA 205369616a replace tabs to spaces and remove trailing white-spaces at app/views/users/_form.html.erb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7260 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-09-16 23:55:07 +00:00
Toshi MARUYAMA cfb020a066 remove trailing white-spaces from app/views/users/show.api.rsb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7254 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-09-16 14:10:40 +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
Toshi MARUYAMA 6b298ca377 rename .rhtml to .html.erb of app/views/users/show.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@7054 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-09-02 04:41:44 +00:00
Toshi MARUYAMA 265810bab8 rename .rhtml to .html.erb of app/views/users/edit.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@7053 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-09-02 04:41:12 +00:00
Toshi MARUYAMA 9d7a93349c rename .rhtml to .html.erb of app/views/users/_memberships.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@7049 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-09-02 04:19:50 +00:00
Toshi MARUYAMA 8285ede0b1 rename .rhtml to .html.erb of app/views/users/_form.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@7048 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-09-02 04:19:02 +00:00
Toshi MARUYAMA 7bdce08d70 rename .rhtml to .html.erb of app/views/users/_general.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@7047 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-09-02 04:18:20 +00:00
Toshi MARUYAMA c3c6e6f405 rename .rhtml to .html.erb of app/views/users/_groups.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@7046 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-09-02 04:17:32 +00:00
Toshi MARUYAMA 4a291287d9 HTML escape at app/views/users/show.rhtml.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6387 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-08-02 13:16:08 +00:00
Toshi MARUYAMA 187a39a84c HTML escape at app/views/users/edit.rhtml.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6386 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-08-02 13:15:24 +00:00