binling
/
trustieforge
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
18,034 Commits 86 Branches 0 Tags 114 MiB
Commit Graph

356 Commits

Author SHA1 Message Date
siteen 5dc27a7acc redis缓存优化（课程动态500问题，初次查询性能优化） 2016-12-14 14:59:11 +08:00
huang c88d214bb9 处理冲突 
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into dev_cache

Conflicts:
	app/views/courses/_course_activity.html.erb
	app/views/courses/_course_heroes.html.erb
	app/views/users/_message_contents.html.erb
 2016-12-12 16:38:15 +08:00
cxt abdbfd87b0 班级的邀请码增加“停用”和“启用”功能，停用的邀请码不允许用户主动加入班级 2016-12-08 13:40:11 +08:00
yuanke 2d5fbdfaaa Merge branch 'develop' into yuanke_objectcache 
Conflicts:
	app/views/projects/_project_message_contents.html.erb
 2016-11-22 17:07:35 +08:00
yuanke 0efd386475 修改删除班级、项目时缓存的BUG 2016-11-22 13:27:05 +08:00
cxt 5510df165d Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-11-18 15:45:06 +08:00
cxt 1fcb1db27c 课程大纲下的班级归档 2016-11-18 15:34:53 +08:00
cxt efd0bf6707 删除学生/退出班级时隐藏学生作品、退出班级按钮位置调整 2016-11-17 10:23:13 +08:00
yuanke 5908f243bc Merge branch 'develop' into yuanke_objectcache 2016-11-15 10:40:18 +08:00
cxt d8906db1aa 班级学生列表：“未分班”列表对成员分班，成员显示未自动刷新；具体分班列表对成员编辑分班，分班成员数统计未自动刷新 2016-11-15 10:34:14 +08:00
cxt b06dcc9db4 780班级访问分班报500 2016-11-14 15:38:00 +08:00
cxt 0ed878e718 404、403、500页面 2016-11-14 15:36:36 +08:00
yuanke cec157944b Merge branch 'develop' into yuanke_objectcache 
Conflicts:
	app/models/homework_common.rb
	app/views/courses/_course_activity_users.html.erb
	app/views/users/_course_message.html.erb
 2016-11-14 10:11:27 +08:00
cxt d1bfdde261 班级名称命名和显示规范调整 2016-11-11 15:19:22 +08:00
cxt 07b97c8eb9 学生列表增加删除功能、删除学生时删除其对应的作品 2016-11-11 13:58:07 +08:00
yuanke e00b174a07 . 2016-11-11 09:05:59 +08:00
yuanke bdfd313e97 . 2016-11-11 08:55:30 +08:00
yuanke 895cb77323 缓存修改 2016-11-09 09:19:36 +08:00
yuanke 7debb74164 Merge branch 'develop' into yuanke_objectcache 
Conflicts:
	app/models/news.rb
	app/views/users/_message_contents.html.erb
	app/views/users/_news_contents.html.erb
 2016-11-08 09:51:32 +08:00
cxt 78ca68b5e3 Merge branch 'cxt_course' into develop 
Conflicts:
	public/stylesheets/css/moduel.css
	public/stylesheets/css/public.css
 2016-11-04 16:15:56 +08:00
cxt 4e267c22b3 班级学生列表-导出列表：作业积分统计错误 2016-11-01 17:25:02 +08:00
yuanke 2c912eac5b 对象缓存增加 2016-11-01 13:30:15 +08:00
huang 72f75b41d0 Merge branch 'cxt_course' into develop 2016-10-28 18:06:12 +08:00
cxt 21655565ea 班级分班进行删除时，根据是否有成员，做不同的提示 2016-10-28 17:49:09 +08:00
yuanke 93ed72fb59 Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-10-28 15:57:53 +08:00
yuanke 7f1863c3d0 班级相关缓存 2016-10-25 17:03:52 +08:00
cxt fcb1d4d115 打开分班名称编辑框后，点击其他分班名称或全部、未分班，数据刷新，但是编辑框未收起，应该收起 2016-10-24 14:02:09 +08:00
yuanke 5811f3944e 小班导出列表500BUG 2016-10-21 19:25:09 +08:00
yuanke f785fe4fbd 修改路由 2016-10-21 19:14:07 +08:00
cxt 4da113dc19 讨论区增加“添加子栏目”按钮跳到设置页面的添加子栏目 2016-10-21 17:40:19 +08:00
cxt 3d29eb2be0 分班批量添加学生、小班页面 2016-10-21 17:34:02 +08:00
cxt ceb0913568 学生列表报500 2016-09-30 18:35:08 +08:00
cxt e5204112d0 教师列表报500 2016-09-30 17:19:57 +08:00
cxt b5782bae39 班级左侧导航的“分班” 2016-09-30 17:12:40 +08:00
cxt 23f1c3175c 学生列表的导出 2016-09-30 17:04:19 +08:00
cxt f6296377bd 班级内的分班 2016-09-29 11:29:37 +08:00
cxt 03fac1900e 分班 2016-09-28 10:00:01 +08:00
huang a309bf4f73 课程首页show方法优化 2016-09-14 11:31:48 +08:00
cxt 877d1930f0 超级管理员应该有权限查看不公开学生列表班级的学生列表 2016-09-02 15:35:20 +08:00
cxt e3d538c3fa Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/layouts/_course_base_info.html.erb
	db/schema.rb
 2016-07-29 19:39:42 +08:00
cxt 335b82c046 加入班级的弹框 2016-07-29 19:19:58 +08:00
cxt 848c56d54e 班级主页身份切换、成员管理页面的多重身份 2016-07-29 14:34:42 +08:00
guange 6a871e2116 . 2016-07-25 17:09:14 +08:00
cxt 808b553e43 班级动态只有10条，底部却显示“点击展开更多” 2016-07-22 16:50:32 +08:00
yuanke cdb7782849 除了issue 和news都增加了二级回复显示 2016-07-22 15:37:25 +08:00
cxt 9422e2886c 新版班级主页 2016-07-22 15:32:37 +08:00
cxt 71b5fe1273 Merge branch 'develop' into cxt_course 
Conflicts:
	app/controllers/issues_controller.rb
	app/views/issues/_issue_replies.html.erb
	app/views/issues/_issue_reply_ke_form.html.erb
	db/schema.rb
 2016-07-21 14:31:43 +08:00
cxt a9ee1d10cd 新增班级成员的消息通知，跳转至该班级的成员配置页面 2016-07-18 11:19:56 +08:00
yuanke 0a1ecd65e8 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/schema.rb
 2016-07-15 16:31:42 +08:00
yuanke 1e8f496718 代码查重结果 不显示未提交的作品 2016-07-14 10:06:37 +08:00