 lizanle
|
3c946c034a
|
Merge branch 'szzh' into dev_zanle
Conflicts:
db/schema.rb
kaminari分页添加上一页下一页
|
2015-11-30 11:07:53 +08:00 |
|
lizanle
|
1c3bff0007
|
资源库的删除bug
和右键菜单的bug
和变背景色的bug
|
2015-11-30 10:39:50 +08:00 |
|
lizanle
|
582cd6f5d4
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/models/attachment.rb
db/schema.rb
|
2015-11-27 18:47:02 +08:00 |
 huang
|
a6d3ff2b14
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-11-27 17:18:31 +08:00 |
 ouyangxuhua
|
edea776b03
|
Merge branch 'szzh' into dev_hjq
|
2015-11-27 16:28:16 +08:00 |
|
ouyangxuhua
|
89d01679a7
|
组织中，重复的项目和组织不显示
|
2015-11-27 16:27:23 +08:00 |
|
ouyangxuhua
|
3abc3f7af0
|
组织文章编辑，返回对应界面
|
2015-11-27 15:25:49 +08:00 |
 cxt
|
85aade79ce
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
Conflicts:
public/stylesheets/courses.css
|
2015-11-27 15:21:32 +08:00 |
|
cxt
|
f7ac2b0ef5
|
老师查看学生的答卷结果
|
2015-11-27 15:19:13 +08:00 |
|
huang
|
501a8f905b
|
Merge branch 'develop' into szzh
Conflicts:
db/schema.rb
public/stylesheets/courses.css
|
2015-11-27 14:56:30 +08:00 |
|
huang
|
36b1649fbd
|
Merge branch 'szzh' into gitlab_guange
Conflicts:
db/schema.rb
|
2015-11-27 14:49:49 +08:00 |
|
huang
|
2ec78d07fa
|
Merge branch 'szzh' into hjq_new_course
|
2015-11-27 14:47:16 +08:00 |
|
huang
|
1cc6e305ed
|
完成新功能模块开发：
1、如果没有成绩则不显示
2、工具框展开没有则不显示
|
2015-11-27 13:52:40 +08:00 |
|
ouyangxuhua
|
e0f4050779
|
1.修改组织中关联项目和课程的内容和样式
|
2015-11-27 12:34:02 +08:00 |
|
ouyangxuhua
|
b05708f6e8
|
解决一下三个bug:
1.新建组织文章时，置标题和描述为空，点击取消按钮，却弹出“标题不能为空”的提示信息
2.课程/项目关联组织：点击取消按钮不应该直接收起关联组织列表
3.组织详情页面内再编辑组织，点击确定编辑的按钮后又返回组织列表页面，应返回组织详情页面
|
2015-11-27 10:43:21 +08:00 |
|
cxt
|
1f2675020b
|
学生答题未完成时可保存试卷
|
2015-11-27 10:15:25 +08:00 |
|
ouyangxuhua
|
58365e8892
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/new_user.css
2.组织增加项目功能
|
2015-11-27 09:50:17 +08:00 |
|
cxt
|
cc0ff6bbc0
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2015-11-26 17:22:46 +08:00 |
|
cxt
|
f8621cac76
|
未设置考试时长时，只要还未到截止时间就可以一直提交试卷。
|
2015-11-26 16:57:51 +08:00 |
|
lizanle
|
dcd441a9db
|
全站搜索
|
2015-11-26 16:43:10 +08:00 |
|
ouyangxuhua
|
9c3aed8028
|
增加组织加入课程功能
|
2015-11-26 16:29:50 +08:00 |
|
cxt
|
ed9cef486f
|
测验列表页面的按钮调整
|
2015-11-26 15:21:46 +08:00 |
|
cxt
|
f1bb1bb8c2
|
测验列表的创建时间改成截止时间，每个测验名字前增加序号，显示发布状态
|
2015-11-26 14:36:19 +08:00 |
|
cxt
|
6b72b4bb17
|
非课程参与人员无法查看私有课程的测验列表
|
2015-11-26 11:22:42 +08:00 |
|
lizanle
|
4efb660214
|
全站搜索
|
2015-11-26 09:57:53 +08:00 |
|
cxt
|
c7cf34500c
|
老师若未设置测验的发布时间则提交后立即发布
|
2015-11-25 16:05:02 +08:00 |
|
cxt
|
1ae514ca48
|
测验的发布日期和测验时长做成可选的
|
2015-11-25 09:38:13 +08:00 |
|
ouyangxuhua
|
2dc31637d8
|
项目和课程中加入组织时，如果已经加入了某组织，就不要重复加入。
|
2015-11-24 17:29:58 +08:00 |
|
cxt
|
0e7cf4b122
|
学生作品页面的批次列表只显示已发布的作业
|
2015-11-24 16:21:25 +08:00 |
|
cxt
|
e89cb99743
|
添加学生测验结果页面的批次链接
|
2015-11-24 16:20:29 +08:00 |
|
cxt
|
ec00b86c15
|
学生多次新建作品时提醒学生不能重复提交
|
2015-11-24 15:17:47 +08:00 |
 houxiang
|
ad891aea39
|
分支合并
|
2015-11-24 10:19:20 +08:00 |
|
houxiang
|
6b481c8961
|
mute the fork function by hx
|
2015-11-24 10:12:21 +08:00 |
|
huang
|
55ff5f4931
|
Merge branch 'develop' into gitlab_guange
Conflicts:
app/views/projects/settings/_join_org.html.erb
db/schema.rb
处理冲突
|
2015-11-24 09:55:26 +08:00 |
|
huang
|
3af96c96e7
|
finalize the commit_counts problems by hx
|
2015-11-23 21:07:43 +08:00 |
|
houxiang
|
b3d36705d2
|
modify the commit_count by hx
|
2015-11-23 19:48:20 +08:00 |
|
huang
|
39455f9f8a
|
作业重复提交问题
|
2015-11-23 17:08:17 +08:00 |
|
houxiang
|
56519389d2
|
add binarysearch for commit_count by hx
|
2015-11-23 16:51:12 +08:00 |
|
cxt
|
89f8f5f383
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-11-20 20:44:40 +08:00 |
|
cxt
|
b10fbcde8c
|
取消发布和发布测验
|
2015-11-20 20:44:27 +08:00 |
|
huang
|
dd148fb7c5
|
Merge branch 'szzh' into sw_new_course
Conflicts:
db/schema.rb
|
2015-11-20 20:25:17 +08:00 |
|
huang
|
2435f06f44
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-11-20 20:03:11 +08:00 |
|
huang
|
8b29002a0f
|
修改得分规则
|
2015-11-20 20:02:57 +08:00 |
|
cxt
|
c36ec99ff6
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-11-20 19:59:17 +08:00 |
|
cxt
|
9ca336a70a
|
发布和取消发布
|
2015-11-20 19:59:05 +08:00 |
|
huang
|
c0dfc17b19
|
修改状态更新
|
2015-11-20 19:35:32 +08:00 |
|
huang
|
da55b00da7
|
删除插入问题
|
2015-11-20 19:05:39 +08:00 |
|
huang
|
a3122a9a2c
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-11-20 18:39:44 +08:00 |
|
huang
|
aa36c927d3
|
0
|
2015-11-20 18:39:35 +08:00 |
|
cxt
|
c07e2fe2d2
|
发布试卷
|
2015-11-20 18:38:50 +08:00 |