 huang
|
41b99af7dd
|
Merge branch 'develop' into sw_new_course
|
10 years ago |
 Tim
|
06ca4c8f4b
|
作品列表样式调整
|
10 years ago |
 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 |
Gan Yi.ang
|
ee85cc35ed
|
Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange
|
10 years ago |
|
Gan Yi.ang
|
1115d54d9a
|
非trustie用户changesets_latest_coimmit
|
10 years ago |
|
Tim
|
2d14b66336
|
作品列表样式调整
|
10 years ago |
|
huang
|
042b197767
|
课程英雄榜界面调整
动作触发的时候更新总分
更换迁移顺序
|
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
|
f8621cac76
|
未设置考试时长时，只要还未到截止时间就可以一直提交试卷。
|
10 years ago |
|
ouyangxuhua
|
9c3aed8028
|
增加组织加入课程功能
|
10 years ago |
|
Tim
|
a0c73a5a54
|
单选题样式调整
|
10 years ago |
|
huang
|
c8b1cae947
|
建立贡献榜表及相关关联
部分页面
按总分排序（英雄榜）
部分页面（未完成）
|
10 years ago |
|
cxt
|
1ae514ca48
|
测验的发布日期和测验时长做成可选的
|
10 years ago |
|
huang
|
85515befc4
|
实现工具栏数字大于0显示，小于0隐藏
|
10 years ago |
|
Tim
|
269d2f992e
|
组织列表搜索框调整后注释
|
10 years ago |
|
huang
|
dd148fb7c5
|
Merge branch 'szzh' into sw_new_course
Conflicts:
db/schema.rb
|
10 years ago |
|
Tim
|
e3d78bf4f0
|
组织样式更改
|
10 years ago |
|
cxt
|
acaac93da1
|
tijiao
|
10 years ago |
 lizanle
|
dffabce806
|
Merge branch 'dev_zanle' into szzh
Conflicts:
db/schema.rb
|
10 years ago |
|
ouyangxuhua
|
af981f841e
|
添加组织时，翻页提醒功能改善
|
10 years ago |
|
ouyangxuhua
|
219774afab
|
将课程动态加入组织动态中
|
10 years ago |
|
lizanle
|
47bae2dd79
|
去掉段落的字符之间的间距
|
10 years ago |
|
ouyangxuhua
|
b231b44e81
|
1.项目和课程中，添加翻页提醒；
2.项目和课程中，删除组织关联时，给出弹窗，确认是否删除。
|
10 years ago |
|
ouyangxuhua
|
fc7e41ebf9
|
1.在项目和课程在关联和删除关联组织后，翻页能链接到正确的位置
|
10 years ago |
|
cxt
|
265fe08b2c
|
在线测验
|
10 years ago |
|
lizanle
|
7c1e9f0042
|
MathJax这些资源不能少。少了会在一些浏览器上出bug
|
10 years ago |
|
cxt
|
cc08e5e32e
|
保存测验信息
|
10 years ago |
|
ouyangxuhua
|
71bf80c7a5
|
1.创建组织课程关联表，建立相应模型及控制器；
2.在课程设置中，添加加入组中功能；
3.解决添加项目后，组织列表的上一页和下一页链接问题。
|
10 years ago |
|
lizanle
|
291868ba43
|
Merge branch 'szzh' into dev_zanle
Conflicts:
db/schema.rb
|
10 years ago |
|
lizanle
|
94831443a5
|
MathJax的js
|
10 years ago |
|
cxt
|
034a92bb7b
|
新建测验页面
|
10 years ago |
|
ouyangxuhua
|
687c0c8306
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/org_document_comments/edit.html.erb
|
10 years ago |
|
cxt
|
c50bcf9331
|
对于提交已截止的作业，作业状态由“作品提交中”改为“作品补交中”
|
10 years ago |
|
lizanle
|
56613b6358
|
增加项目的显示
|
10 years ago |
|
ouyangxuhua
|
b6d785bda0
|
修改编辑组织文章样式问题
|
10 years ago |
|
ouyangxuhua
|
78e1ae4188
|
Merge branch 'szzh' into dev_hjq
Conflicts:
db/schema.rb
|
10 years ago |
|
ouyangxuhua
|
71e6a8b135
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
ouyangxuhua
|
3451ced888
|
添加我的组织页面及修改bug
|
10 years ago |
|
lizanle
|
c2e783d78b
|
设置 删除 编辑按钮做成项目一样的
|
10 years ago |
|
lizanle
|
b24fadea05
|
设置 删除 编辑按钮做成项目一样的
|
10 years ago |
|
ouyangxuhua
|
21275e8b7b
|
组织模块功能缺陷修改
|
10 years ago |
|
cxt
|
7a93fddb83
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
ab868d7b65
|
课程通知增加置顶
|
10 years ago |
|
lizanle
|
6b7dd81509
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
506709b474
|
个人资源库，课程 资源文件上传
1.单个上传
2.给出明确的提示
3.按钮联动
|
10 years ago |
