Orbit/app/models/user
Matt Fu 9a40ecd1d9 Merge branch 'design_team' into ldap for NCCU 0229 demo on Redmine
Conflicts:
	app/views/devise/passwords/new.html.erb
	app/views/devise/sessions/new.html.erb
2012-02-29 13:07:21 +08:00
..
attribute.rb Embedded to referenced for users 2012-01-24 15:12:06 +08:00
attribute_field.rb Embedded to referenced for users 2012-01-24 15:12:06 +08:00
attribute_value.rb Users can now be saved with sub_roles 2011-12-20 14:35:28 +08:00
info.rb Change role structure 2011-12-10 18:12:39 +08:00
role.rb Embedded to referenced for users 2012-01-24 15:12:06 +08:00
sub_role.rb Embedded to referenced for users 2012-01-24 15:12:06 +08:00
user.rb Merge branch 'design_team' into ldap for NCCU 0229 demo on Redmine 2012-02-29 13:07:21 +08:00