chris b40d4702d5 Merge branch 'master' into various_bugs ... Conflicts: config/locales/en.yml config/locales/zh_tw.yml vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_form.html.erb vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_form.html.erb		2012-11-06 11:44:00 +08:00
..
attribute.rb	add new member with role interface. add more not usable.	2012-11-04 20:42:58 +08:00
attribute_field.rb	Fixing bugs	2012-11-05 11:30:15 +08:00
attribute_value.rb	Fixing bugs	2012-11-05 11:30:15 +08:00
info.rb	Change role structure	2011-12-10 18:12:39 +08:00
role.rb	for user new interface, member role is working.	2012-10-26 11:27:37 +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	Merge branch 'master' into various_bugs	2012-11-06 11:44:00 +08:00