 cxt
|
85aade79ce
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
Conflicts:
public/stylesheets/courses.css
|
10 years ago |
|
cxt
|
f7ac2b0ef5
|
老师查看学生的答卷结果
|
10 years ago |
 huang
|
501a8f905b
|
Merge branch 'develop' into szzh
Conflicts:
db/schema.rb
public/stylesheets/courses.css
|
10 years ago |
|
huang
|
36b1649fbd
|
Merge branch 'szzh' into gitlab_guange
Conflicts:
db/schema.rb
|
10 years ago |
|
huang
|
2ec78d07fa
|
Merge branch 'szzh' into hjq_new_course
|
10 years ago |
|
huang
|
1cc6e305ed
|
完成新功能模块开发：
1、如果没有成绩则不显示
2、工具框展开没有则不显示
|
10 years ago |
 ouyangxuhua
|
e0f4050779
|
1.修改组织中关联项目和课程的内容和样式
|
10 years ago |
|
ouyangxuhua
|
b05708f6e8
|
解决一下三个bug:
1.新建组织文章时，置标题和描述为空，点击取消按钮，却弹出“标题不能为空”的提示信息
2.课程/项目关联组织：点击取消按钮不应该直接收起关联组织列表
3.组织详情页面内再编辑组织，点击确定编辑的按钮后又返回组织列表页面，应返回组织详情页面
|
10 years ago |
|
cxt
|
1f2675020b
|
学生答题未完成时可保存试卷
|
10 years ago |
|
ouyangxuhua
|
58365e8892
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/new_user.css
2.组织增加项目功能
|
10 years ago |
|
cxt
|
cc0ff6bbc0
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
10 years ago |
|
cxt
|
f8621cac76
|
未设置考试时长时，只要还未到截止时间就可以一直提交试卷。
|
10 years ago |
|
ouyangxuhua
|
9c3aed8028
|
增加组织加入课程功能
|
10 years ago |
|
cxt
|
ed9cef486f
|
测验列表页面的按钮调整
|
10 years ago |
|
cxt
|
f1bb1bb8c2
|
测验列表的创建时间改成截止时间，每个测验名字前增加序号，显示发布状态
|
10 years ago |
|
cxt
|
6b72b4bb17
|
非课程参与人员无法查看私有课程的测验列表
|
10 years ago |
|
cxt
|
c7cf34500c
|
老师若未设置测验的发布时间则提交后立即发布
|
10 years ago |
|
cxt
|
1ae514ca48
|
测验的发布日期和测验时长做成可选的
|
10 years ago |
|
ouyangxuhua
|
2dc31637d8
|
项目和课程中加入组织时，如果已经加入了某组织，就不要重复加入。
|
10 years ago |
|
cxt
|
0e7cf4b122
|
学生作品页面的批次列表只显示已发布的作业
|
10 years ago |
|
cxt
|
e89cb99743
|
添加学生测验结果页面的批次链接
|
10 years ago |
|
cxt
|
ec00b86c15
|
学生多次新建作品时提醒学生不能重复提交
|
10 years ago |
 houxiang
|
ad891aea39
|
分支合并
|
10 years ago |
|
houxiang
|
6b481c8961
|
mute the fork function by hx
|
10 years ago |
|
huang
|
55ff5f4931
|
Merge branch 'develop' into gitlab_guange
Conflicts:
app/views/projects/settings/_join_org.html.erb
db/schema.rb
处理冲突
|
10 years ago |
|
huang
|
3af96c96e7
|
finalize the commit_counts problems by hx
|
10 years ago |
|
houxiang
|
b3d36705d2
|
modify the commit_count by hx
|
10 years ago |
|
huang
|
39455f9f8a
|
作业重复提交问题
|
10 years ago |
|
houxiang
|
56519389d2
|
add binarysearch for commit_count by hx
|
10 years ago |
|
cxt
|
89f8f5f383
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
cxt
|
b10fbcde8c
|
取消发布和发布测验
|
10 years ago |
|
huang
|
dd148fb7c5
|
Merge branch 'szzh' into sw_new_course
Conflicts:
db/schema.rb
|
10 years ago |
|
huang
|
2435f06f44
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
huang
|
8b29002a0f
|
修改得分规则
|
10 years ago |
|
cxt
|
c36ec99ff6
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
cxt
|
9ca336a70a
|
发布和取消发布
|
10 years ago |
|
huang
|
c0dfc17b19
|
修改状态更新
|
10 years ago |
|
huang
|
da55b00da7
|
删除插入问题
|
10 years ago |
|
huang
|
a3122a9a2c
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
huang
|
aa36c927d3
|
0
|
10 years ago |
|
cxt
|
c07e2fe2d2
|
发布试卷
|
10 years ago |
|
cxt
|
98297da226
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
cxt
|
c9ba57f64b
|
去掉关闭、导入等功能
|
10 years ago |
|
huang
|
bb726e3475
|
提交答案验证
|
10 years ago |
|
huang
|
d1e0e0fd30
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
huang
|
97485ca221
|
修改show逻辑
提交问卷后学生页面显示
|
10 years ago |
|
cxt
|
332ace0f34
|
列表
|
10 years ago |
|
cxt
|
d4d2adddb2
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
app/controllers/exercise_controller.rb
|
10 years ago |
|
cxt
|
eee63b2495
|
提交前验证数据不为空
|
10 years ago |
|
huang
|
ed86e3ee5a
|
三种类型题目计算总分
|
10 years ago |
