Harry Bomrah 5f9190db39 few updates with fb integration and some other changes in user and supports data to android ... Conflicts: vendor/built_in_modules/gallery/app/controllers/panel/gallery/back_end/albums_controller.rb		2013-07-30 16:43:11 +08:00
..
attribute.rb	member role edit	2013-01-14 19:00:08 +08:00
attribute_field.rb	member roles edit	2013-01-14 17:02:51 +08:00
attribute_value.rb	disable data transform when switching attribute field type. new member stable	2012-11-22 21:10:35 +08:00
info.rb	Change role structure	2011-12-10 18:12:39 +08:00
role.rb	New UI changes(tags, categories, authorisations, module index…)	2013-07-02 16:46:44 +08:00
role_category.rb	user id set & user fields set & role set & member frontend list & user translation & create new member bug fix	2013-04-25 19:59:59 +08:00
role_filter.rb	user id set & user fields set & role set & member frontend list & user translation & create new member bug fix	2013-04-25 19:59:59 +08:00
role_status.rb	user id set & user fields set & role set & member frontend list & user translation & create new member bug fix	2013-04-25 19:59:59 +08:00
status.rb	for user new interface, member role is working.	2012-10-26 11:27:37 +08:00
sub_role.rb	basic function	2012-09-17 13:32:52 +08:00
user.rb	few updates with fb integration and some other changes in user and supports data to android	2013-07-30 16:43:11 +08:00
user_action.rb	user action	2013-05-23 11:55:57 +08:00