 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 |
|
huang
|
6fccc7b50c
|
Merge branch 'develop' into dev_cache
Conflicts:
.gitignore
app/controllers/blogs_controller.rb
app/controllers/users_controller.rb
app/helpers/application_helper.rb
app/models/comment.rb
app/models/journals_for_message.rb
app/models/news.rb
app/views/courses/_course_activity_users.html.erb
app/views/layouts/new_base_user.html.erb
app/views/projects/_act_messages.html.erb
app/views/projects/_project_message_contents.html.erb
app/views/users/_course_homework.html.erb
app/views/users/_course_journalsformessage.html.erb
app/views/users/_course_message.html.erb
app/views/users/_course_news.html.erb
app/views/users/_homework_post_reply.html.erb
app/views/users/_message_contents.html.erb
app/views/users/_news_contents.html.erb
app/views/users/_project_message.html.erb
app/views/users/_user_blog.html.erb
app/views/users/_user_journalsformessage.html.erb
|
2016-12-12 16:35:20 +08:00 |
 cxt
|
b0559788db
|
班级作业的左侧“班级活跃度”、“班级英雄榜”“班级推荐”修改文字
|
2016-12-09 10:12:05 +08:00 |
|
cxt
|
abdbfd87b0
|
班级的邀请码增加“停用”和“启用”功能，停用的邀请码不允许用户主动加入班级
|
2016-12-08 13:40:11 +08:00 |
|
cxt
|
03b00f0af5
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-12-06 16:17:46 +08:00 |
|
cxt
|
9e9f1d44a1
|
具体班级页里的班级动态，不需要显示班级名称，直接显示栏目名称就可、具体作业的详情页，也不需要显示班级名称
|
2016-12-06 10:00:18 +08:00 |
|
cxt
|
b1356d00a0
|
学生列表、作品列表，中的学生姓名，应该增加超链接，现在不能通过这里进入学生的主页
|
2016-12-05 14:34:22 +08:00 |
|
cxt
|
bd458e1aef
|
班级的教师列表显示样式比较旧，更换样式
|
2016-12-05 14:17:33 +08:00 |
|
huang
|
d87620a758
|
作品列表总不显示，动态得分显示
|
2016-12-03 11:41:09 +08:00 |
|
huang
|
69ab80bf9e
|
对于设置了仅对自己显示的作业课程英雄榜显示方式
|
2016-12-03 11:20:50 +08:00 |
|
huang
|
20e07bb1ba
|
学生列表得分显示
|
2016-12-03 10:56:35 +08:00 |
|
cxt
|
c47f41307e
|
分班的学生列表，请将“导出成绩”直接显示出来，且不需要“成员管理”入口
|
2016-11-30 10:44:15 +08:00 |
|
cxt
|
f4ea4e2add
|
班级的学生列表，标题行显示的“导出列表”换成“导出成绩”
|
2016-11-30 10:40:53 +08:00 |
|
cxt
|
4814c1db3d
|
叠层中的回复、赞的显隐
|
2016-11-29 15:29:30 +08:00 |
|
cxt
|
fcadf65688
|
班级学生列表：删除成员时，成员列表未自动刷新
|
2016-11-29 11:14:35 +08:00 |
|
cxt
|
896f8a2ac7
|
班级活跃度个数为0时不显示
|
2016-11-29 11:03:05 +08:00 |
|
cxt
|
785f027a63
|
Merge branch 'cxt_course' into develop
|
2016-11-25 14:56:24 +08:00 |
|
cxt
|
3d63d2ae2c
|
老师反馈：学生列表中“导出列表”不显眼
|
2016-11-25 13:37:31 +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 |
|
cxt
|
f9d12758d4
|
班级分班：如图在某具体分班中，编辑某成员分班为“暂无”或其他分班，原始分班列表未自动刷新
|
2016-11-22 11:29:45 +08:00 |
|
cxt
|
eeacd76aa9
|
首页班级列表的归档
|
2016-11-22 10:27:56 +08:00 |
|
cxt
|
4388b7625e
|
首页班级列表的归档
|
2016-11-21 16:58:25 +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
|
6c8736bea8
|
加入班级时的提示修改
|
2016-11-17 11:10:48 +08:00 |
|
cxt
|
efd0bf6707
|
删除学生/退出班级时隐藏学生作品、退出班级按钮位置调整
|
2016-11-17 10:23:13 +08:00 |
|
cxt
|
2dc717df0c
|
Merge branch 'develop' into cxt_course
|
2016-11-15 16:57:33 +08:00 |
|
cxt
|
d8906db1aa
|
班级学生列表：“未分班”列表对成员分班，成员显示未自动刷新；具体分班列表对成员编辑分班，分班成员数统计未自动刷新
|
2016-11-15 10:34:14 +08:00 |
|
yuanke
|
1a45428189
|
缓存活跃度\英雄榜都改为6个
|
2016-11-14 10:29:31 +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
|
c352fb5604
|
学生列表的删除和编辑按钮的对齐显示、删除学生时刷新班级头部的学生数
|
2016-11-11 17:55:25 +08:00 |
|
cxt
|
ec36b07aab
|
分班名称编辑后，如图班级左侧导航处未自动刷新
|
2016-11-11 17:05:47 +08:00 |
|
cxt
|
7298e983fa
|
如图课程大纲中“加入班级”，输入错误的邀请码，提示“您加入的班级不存在”不合理，应该是“您输入的邀请码错误”
|
2016-11-11 16:59:15 +08:00 |
|
cxt
|
d1bfdde261
|
班级名称命名和显示规范调整
|
2016-11-11 15:19:22 +08:00 |
|
cxt
|
07b97c8eb9
|
学生列表增加删除功能、删除学生时删除其对应的作品
|
2016-11-11 13:58:07 +08:00 |
|
cxt
|
0d8d2fbc90
|
班级活跃度排行去除老师和教辅
|
2016-11-11 09:29:29 +08:00 |
|
yuanke
|
895cb77323
|
缓存修改
|
2016-11-09 09:19:36 +08:00 |
|
yuanke
|
bc0af58e6d
|
项目动态缓存
|
2016-11-08 15:20:55 +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 |
|
yuanke
|
f024ac6665
|
缓存修改
|
2016-11-08 09:17:44 +08:00 |
|
yuanke
|
0192f27053
|
.通知动态缓存修改
|
2016-11-07 14:54:28 +08:00 |
|
yuanke
|
5a309e8c76
|
讨论区动态缓存
|
2016-11-07 14:13:56 +08:00 |
|
cxt
|
94284e72a2
|
弹框样式调整、
课程大纲的提示，在操作文字的前后应该各空一格、
作品列表的各种提示未知需要对齐、
评分设置等新弹框：如图当鼠标移至右上角关闭图标，图标丢失、
|
2016-11-04 18:43:44 +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 |
|
yuanke
|
cc6098a629
|
班级推荐缓存修改
|
2016-11-02 17:02:00 +08:00 |
|
cxt
|
c1df689aa3
|
班级教师列表中，用户头像建议改为和学生列表中头像一致，及链接至用户主页
|
2016-11-01 16:34:04 +08:00 |
|
huang
|
d5e2ae9407
|
Merge branch 'cxt_course' into develop
|
2016-10-28 18:42:29 +08:00 |
|
cxt
|
557f5d4e26
|
新建班级、新建课程的提示
|
2016-10-28 18:36:35 +08:00 |
|
cxt
|
9f702bae1e
|
删除分班弹框的样式调整
|
2016-10-28 18:21:03 +08:00 |