Commit Graph

6 Commits

Author SHA1 Message Date
daiao 3dc0e8407a Merge branch 'develop' into dev_shcool
Conflicts:
	app/views/organizations/_org_member_list.html.erb
	app/views/organizations/setting.html.erb
	app/views/users/_project_news.html.erb
2016-09-05 13:47:39 +08:00
daiao 27ad94eac2 组织配置界面,成员列表分页 2016-09-02 13:25:01 +08:00
Tim ea0211c9ca 组织搜索成员时,页数过多折行问题 2016-08-29 16:39:13 +08:00
ouyangxuhua 84703a3e01 组织配置中的添加成员,链接使用https://www形式 2016-03-18 16:35:36 +08:00
lizanle e265047ba9 搜索成员翻页靠右 2015-11-12 19:37:28 +08:00
ouyangxuhua a3443ba968 组织模块功能实现 2015-11-12 09:32:00 +08:00