 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 |
 huang
|
69bd89761d
|
解决编码问题
|
2016-11-03 16:19:04 +08:00 |
|
huang
|
21c6a0ad0d
|
导出所有用户13---all
|
2016-11-03 15:59:59 +08:00 |
|
huang
|
c69b89da96
|
Merge branch 'dev_newproject' into develop
|
2016-11-03 15:50:11 +08:00 |
|
huang
|
fb2f1b3859
|
点击导出添加提醒
|
2016-11-03 15:42:40 +08:00 |
|
huang
|
ef43488861
|
admin添加导出用户所有代码提交量
|
2016-11-03 15:35:09 +08:00 |
|
yuanke
|
7064e5b413
|
注册优化
|
2016-11-03 11:19:00 +08:00 |
|
yuanke
|
08e9b8d563
|
.
|
2016-11-03 11:11:52 +08:00 |
|
yuanke
|
4451ac80a0
|
.
|
2016-11-03 10:53:55 +08:00 |
|
yuanke
|
a075b6d237
|
.调试
|
2016-11-03 10:41:51 +08:00 |
|
cxt
|
4575b8274e
|
不限定匿评人数
|
2016-11-03 10:25:53 +08:00 |
|
yuanke
|
8bf6ef4371
|
.
|
2016-11-03 10:21:41 +08:00 |
|
yuanke
|
7d81a52308
|
注册时候加点日志调试用
|
2016-11-03 10:16:34 +08:00 |
|
yuanke
|
22f4fbf089
|
Merge branch 'develop' into yuanke_youhua
|
2016-11-03 09:51:35 +08:00 |
|
huang
|
1afc3fe4d0
|
超级管理员界面提供导出每个用户提交次数代码次数
|
2016-11-02 21:30:14 +08:00 |
|
huang
|
a9e62618f1
|
Merge branch 'develop' into dev_newproject
|
2016-11-02 17:30:18 +08:00 |
|
huang
|
fee436a7d4
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-11-02 17:19:07 +08:00 |
|
huang
|
22dff9245d
|
0
|
2016-11-02 17:17:33 +08:00 |
|
cxt
|
fea07e07c1
|
分组作业：基本作业编辑为分组作业后，组长提交作品的时候不能添加组员
|
2016-11-02 17:17:12 +08:00 |
|
cxt
|
ecae600546
|
启动匿评、关闭匿评的提示
|
2016-11-02 16:46:47 +08:00 |
|
huang
|
e0027c0e00
|
解决wechat引起的项目申请拒绝问题
|
2016-11-02 16:36:08 +08:00 |
|
huang
|
928412e83d
|
admin中添加导出所有项目统计
|
2016-11-02 15:33:42 +08:00 |
|
cxt
|
54f45f18a5
|
匿评设置的调整
|
2016-11-02 15:19:17 +08:00 |
|
huang
|
9d15052486
|
隐藏非项目的时候图像中禁掉我的课程
|
2016-11-02 15:10:21 +08:00 |
|
huang
|
9da165b2b7
|
issue查看差别界面
|
2016-11-02 14:18:17 +08:00 |