 huang
|
ce3bfee27c
|
甘特图一些修改
|
2016-11-07 17:18:00 +08:00 |
 cxt
|
85b1d145fe
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-11-07 17:13:10 +08:00 |
|
cxt
|
2bb018b0fe
|
导入问卷的弹框用新版样式
|
2016-11-07 17:12:29 +08:00 |
 daiao
|
e57e439210
|
新建，编辑issue时，上传附件尽课程展示全
|
2016-11-07 17:08:24 +08:00 |
|
daiao
|
83c801878d
|
问卷答题与查看页预览答题框的宽度设为一致
|
2016-11-07 16:20:46 +08:00 |
|
daiao
|
6dbf031d3b
|
问卷编辑icon显示效果调整
|
2016-11-07 16:03:04 +08:00 |
|
cxt
|
356fbfe792
|
班级问卷：新建问卷时，如图不输入标题及描述直接点击“取消”，再点击保存或发布，却提示保存成功和发布成功
|
2016-11-07 15:44:40 +08:00 |
 yuanke
|
788193f6e1
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-11-07 15:35:21 +08:00 |
|
yuanke
|
cb975d1cb2
|
组织一级帖子点击BUG
|
2016-11-07 15:35:02 +08:00 |
|
daiao
|
b6a58d9bea
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
|
2016-11-07 15:21:14 +08:00 |
|
daiao
|
3d2d526149
|
新建和编辑ISSUE，上传附件名称显示问题
|
2016-11-07 15:21:00 +08:00 |
|
cxt
|
87c443ab1e
|
Merge branch 'cxt_course' into develop
|
2016-11-07 14:45:08 +08:00 |
|
cxt
|
4c9a3b769e
|
分组作业老师评分时“组员同分”默认勾选
|
2016-11-07 14:43:45 +08:00 |
|
cxt
|
70a6a26819
|
班级作业：分组作业，开启了匿评后，某组再加了某组员，如图该组员看到的作业列表中不应该是“作品匿评”
|
2016-11-07 14:38:10 +08:00 |
|
yuanke
|
5ec5bc9a57
|
修改加入QQ群的链接
|
2016-11-07 14:25:41 +08:00 |
|
cxt
|
f8316ee1ee
|
分组作业的缺评扣分
|
2016-11-07 14:06:11 +08:00 |
|
huang
|
a7a25a4a2a
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
|
2016-11-07 13:52:47 +08:00 |
|
huang
|
6d6c268138
|
甘特图排序
|
2016-11-07 13:52:16 +08:00 |
|
daiao
|
e70c66b5ac
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
Conflicts:
app/views/projects/_act_issues.html.erb
|
2016-11-07 13:30:15 +08:00 |
|
daiao
|
8b5879217d
|
调整新建项目issue页面
|
2016-11-07 13:28:50 +08:00 |
|
cxt
|
e8d9cd4098
|
Merge branch 'develop' into cxt_course
|
2016-11-07 10:29:00 +08:00 |
|
yuanke
|
d41da99ac5
|
Merge branch 'develop' into yuanke_youhua
|
2016-11-07 08:48:41 +08:00 |
|
yuanke
|
04966115c4
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-11-04 21:09:03 +08:00 |
|
yuanke
|
44724c6905
|
弹框BUG修改
|
2016-11-04 21:07:57 +08:00 |
|
cxt
|
e25096e7e6
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-11-04 20:41:18 +08:00 |
|
cxt
|
3b34b87f7d
|
样式调整
|
2016-11-04 20:41:01 +08:00 |
|
yuanke
|
76a62af858
|
Merge branch 'yuanke_youhua' into develop
|
2016-11-04 20:30:44 +08:00 |
|
yuanke
|
d71ebb08b0
|
弹框BUG修复
|
2016-11-04 20:29:18 +08:00 |
|
cxt
|
f738f5571e
|
班级作业：多重角色（教辅、学生）、组长角色的成员，当前角色是教辅，如图“合作成员”入口应该隐藏
|
2016-11-04 20:12:42 +08:00 |
|
cxt
|
4377fc1f9e
|
班级作业：评分设置中最终得分“教师优先”、“教辅优先”轮流切换多次后，得分计算错误
|
2016-11-04 20:04:27 +08:00 |
|
cxt
|
15a88b76c2
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-11-04 19:18:53 +08:00 |
|
cxt
|
2f0ff68047
|
班级作业：多次打分，如图回复块的分数显示不能自动刷新
|
2016-11-04 19:18:39 +08:00 |
|
cxt
|
59a4514950
|
关闭匿评时出现比例大于100%的情况
|
2016-11-04 19:10:22 +08:00 |
|
yuanke
|
33386ecb50
|
Merge branch 'yuanke_youhua' into develop
|
2016-11-04 19:02:17 +08:00 |
|
yuanke
|
9ef8f0f612
|
弹框BUG修改
|
2016-11-04 18:59:48 +08:00 |
|
cxt
|
f921c8cccc
|
发布作业时默认教师优先、迟交扣分为0、缺评扣分为0
|
2016-11-04 18:54:51 +08:00 |
|
cxt
|
94284e72a2
|
弹框样式调整、
课程大纲的提示，在操作文字的前后应该各空一格、
作品列表的各种提示未知需要对齐、
评分设置等新弹框：如图当鼠标移至右上角关闭图标，图标丢失、
|
2016-11-04 18:43:44 +08:00 |
|
yuanke
|
9b13efd912
|
Merge branch 'develop' into yuanke_youhua
|
2016-11-04 18:41:05 +08:00 |
|
cxt
|
0bbccab616
|
样式调整
|
2016-11-04 16:59:33 +08:00 |
|
cxt
|
23edad0687
|
首页报500
|
2016-11-04 16:37:50 +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
|
6db223b35b
|
非老师不显示分组作品列表的“评分”按钮
|
2016-11-04 16:13:06 +08:00 |
|
cxt
|
d762c68f7b
|
分组作业的页面显示和评分处理调整
|
2016-11-04 16:10:13 +08:00 |
|
yuanke
|
3c81c4ccad
|
Merge branch 'yuanke_youhua' into develop
|
2016-11-04 14:55:26 +08:00 |
|
cxt
|
a9265f3b35
|
课程大纲缺少创建班级才能开展教学的引导说明
|
2016-11-04 13:55:29 +08:00 |
|
cxt
|
52ad68ffe1
|
不限定匿评人数时，也可调整缺评扣分
|
2016-11-04 13:37:20 +08:00 |
|
yuanke
|
fc19a468b7
|
优化留言速度
|
2016-11-04 11:30:11 +08:00 |
|
cxt
|
6f1c648770
|
班级作业：修改评分后，同一人的之前的评分，就不显示了
|
2016-11-04 11:27:15 +08:00 |
|
cxt
|
c9db4d6bba
|
子栏目讨论区的样式调整
|
2016-11-04 09:54:30 +08:00 |
|
cxt
|
20f112d5ad
|
作业评分设置的调整
|
2016-11-04 09:23:23 +08:00 |