Commit Graph

172 Commits

Author SHA1 Message Date
Jean-Philippe Lang 63212e5c16 Merged r12915 to 12918 (#16107).
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@12923 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-23 08:20:42 +00:00
Toshi MARUYAMA 35cc911192 update copyright year (#15977)
Contributed by Daniel Felix.

git-svn-id: http://svn.redmine.org/redmine/trunk@12736 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-29 22:45:39 +00:00
Toshi MARUYAMA ea8febad03 remove unneeded Relation#all from Principal model
git-svn-id: http://svn.redmine.org/redmine/trunk@12731 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-27 02:19:03 +00:00
Jean-Philippe Lang e391be4086 Adds settings for disabling browser language detection and language preference (#2691).
git-svn-id: http://svn.redmine.org/redmine/trunk@12691 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-24 10:28:12 +00:00
Jean-Philippe Lang 6e6c6fac5c Adds firstname initials+lastname user format.
git-svn-id: http://svn.redmine.org/redmine/trunk@12690 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-24 09:23:11 +00:00
Toshi MARUYAMA ecda4d33e8 Rails4: replace deprecated Relation#update_all at User model
git-svn-id: http://svn.redmine.org/redmine/trunk@12544 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-09 02:37:06 +00:00
Toshi MARUYAMA 2b36ff7016 Rails4: replace deprecated Relation#update_all at User model
git-svn-id: http://svn.redmine.org/redmine/trunk@12524 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-08 06:58:33 +00:00
Toshi MARUYAMA e9470e5585 explicitly define fix has_and_belongs_to_many join_table at Group and User
Rails4 cannot resolve automatically.

git-svn-id: http://svn.redmine.org/redmine/trunk@12471 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-12-27 23:33:15 +00:00
Jean-Philippe Lang b764e39847 Option to force a user to change his password (#3872).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12081 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-08-05 17:58:33 +00:00
Jean-Philippe Lang 888c3581eb Role based custom queries (#1019).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11994 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-07-11 17:45:10 +00:00
Toshi MARUYAMA edb6e245cf gender neutral source comment at app/models/user.rb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11989 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-07-06 00:04:58 +00:00
Jean-Philippe Lang 2f53246c13 Code cleanup.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11967 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-06-13 19:31:43 +00:00
Jean-Philippe Lang 07d88851bf Fixed tests broken by r11965.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11966 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-06-12 21:55:39 +00:00
Jean-Philippe Lang e978b3ace0 Adds User#builtin_role.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11965 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-06-12 19:38:43 +00:00
Toshi MARUYAMA cb140248ea remove trailing white-space from app/models/user.rb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11954 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-06-10 08:48:49 +00:00
Jean-Philippe Lang 4bd874ab46 Adds a way for a registered user to get a new action email (#14228).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11946 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-06-09 10:01:56 +00:00
Jean-Philippe Lang 4a59b869c0 Update notified_project_ids while saving record.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11840 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-05-13 17:11:38 +00:00
Jean-Philippe Lang 447e15d6cb Prevent one query per User#member_of? call after r11508 (#13301).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11605 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-03-12 17:08:50 +00:00
Jean-Philippe Lang 6803d95a32 Performance: avoid querying all memberships in User#roles_for_project (#13301).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11508 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-03-01 10:24:23 +00:00
Jean-Philippe Lang 5c1e1ee4bb Fixed that #reload raises a Stack too deep error with ruby 2.0.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11497 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-02-28 18:47:25 +00:00
Jean-Philippe Lang fac4a79d4c Option to generate a random password on user creation/update.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11456 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-02-23 16:50:07 +00:00
Toshi MARUYAMA f76dcf33ef fix typo at app/models/user.rb (#5719)
Contributed by Tom Copeland.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11427 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-02-18 11:00:21 +00:00
Jean-Philippe Lang 3c3ac3c6ee Code cleanup.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11375 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-02-14 22:13:49 +00:00
Jean-Philippe Lang b3a2d07257 Code cleanup.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11313 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-02-03 08:23:20 +00:00
Jean-Philippe Lang 9e0723c11b Refactors methods for searching a user by token.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11296 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-02-02 08:46:58 +00:00
Jean-Philippe Lang 9bf98bce26 Skip callbacks when updating last_login_on.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11294 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-02-01 18:32:12 +00:00
Jean-Philippe Lang 134b66cb29 Always notify project members about news unless they turned off all notifications (#4700).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11271 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-01-26 18:07:57 +00:00
Jean-Philippe Lang e53a5de918 Adds "sorted" scope to Principal and User and sort users/groups properly.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11259 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-01-23 17:44:28 +00:00
Jean-Philippe Lang 5741d007f6 Code cleanup.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11222 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-01-20 13:57:29 +00:00
Jean-Philippe Lang e396a0eebe Copyright for 2013 (#12788).
Patch by Daniel Felix.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11169 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-01-12 09:29:31 +00:00
Jean-Philippe Lang 147e7a8d61 Use \A and \z in validation regexps.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10960 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-12-08 10:59:31 +00:00
Jean-Philippe Lang df0b91e238 Moved user status constants to Principal model.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10958 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-12-08 10:44:42 +00:00
Jean-Philippe Lang 7222e4012d Rewrites named scopes with ARel queries.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10950 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-12-07 17:59:20 +00:00
Jean-Baptiste Barth 4896d5c7e8 Use lambda form in model scopes (#12499)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10949 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-12-07 10:12:47 +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 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 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 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 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 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
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 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 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 bd927eea88 Perf: don't load preferences for the anonymous user.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9917 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-07-05 13:05:11 +00:00
Jean-Philippe Lang 2ceb6b8230 Moved logic relative to project status from User to Project model (#3640).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9886 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-06-25 18:44:25 +00:00
Jean-Philippe Lang ac56c0c99c Ability to close projects (read-only) (#3640).
A new permission (Close/reopen project) is available to give non-admin users the ability to close their projects.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9883 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-06-25 17:49:35 +00:00
Jean-Philippe Lang 4d12bea397 Make sure we look for a feeds token.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9801 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-06-10 13:29:47 +00:00