 huang
|
9d970036f6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
aa19f5f8d5
|
Merge branch 'gitlab_guange' into develop
Conflicts:
app/views/layouts/base_courses.html.erb
处理冲突
|
10 years ago |
|
huang
|
582a7c47a4
|
修改英雄版为0显示的问题
|
10 years ago |
 lizanle
|
7eb5d2a8fa
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
8bd9c0c7af
|
tip
|
10 years ago |
|
huang
|
364c9a3a9e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
合并
|
10 years ago |
|
lizanle
|
29a8d1b9f5
|
tip
|
10 years ago |
|
lizanle
|
62399b6d72
|
资源课程搜索结果添加 标签
|
10 years ago |
|
lizanle
|
d266237590
|
kaminari分页添加上一页下一页
|
10 years ago |
|
lizanle
|
3c946c034a
|
Merge branch 'szzh' into dev_zanle
Conflicts:
db/schema.rb
kaminari分页添加上一页下一页
|
10 years ago |
|
lizanle
|
1c3bff0007
|
资源库的删除bug
和右键菜单的bug
和变背景色的bug
|
10 years ago |
|
huang
|
d67fc18988
|
英雄榜、贡献榜显示真实姓名
为零的时候不显示
|
10 years ago |
|
lizanle
|
582cd6f5d4
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/models/attachment.rb
db/schema.rb
|
10 years ago |
|
huang
|
cb51545a31
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
10 years ago |
|
huang
|
aefab8abf3
|
Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange
|
10 years ago |
 cxt
|
b616612032
|
测验取消按钮的还原功能暂时隐藏
|
10 years ago |
|
huang
|
a6d3ff2b14
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
41b99af7dd
|
Merge branch 'develop' into sw_new_course
|
10 years ago |
|
lizanle
|
cb910b8d4a
|
系统消息添加logo
|
10 years ago |
 ouyangxuhua
|
edea776b03
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
89d01679a7
|
组织中，重复的项目和组织不显示
|
10 years ago |
|
huang
|
ee7fb11acc
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
10 years ago |
|
huang
|
e3e0f4ab37
|
鼠标移动+号显示留言
|
10 years ago |
Gan Yi.ang
|
79656aa205
|
Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange
|
10 years ago |
|
Gan Yi.ang
|
c3a27151ca
|
修复_revision
|
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 |
|
ouyangxuhua
|
25b66b5dbb
|
取消弹窗
|
10 years ago |
|
huang
|
1cc6e305ed
|
完成新功能模块开发：
1、如果没有成绩则不显示
2、工具框展开没有则不显示
|
10 years ago |
|
ouyangxuhua
|
365349878d
|
组织加入项目或者课程，刷新项目列表和课程列表；同时，弹窗给出关联成功的提示
|
10 years ago |
|
ouyangxuhua
|
e0f4050779
|
1.修改组织中关联项目和课程的内容和样式
|
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 |
|
ouyangxuhua
|
4aa827eb4a
|
组织页面中，点击项目收起项目列表，再点击展开列表；点击课程同样如此。
|
10 years ago |
 Tim
|
2d14b66336
|
作品列表样式调整
|
10 years ago |
|
huang
|
042b197767
|
课程英雄榜界面调整
动作触发的时候更新总分
更换迁移顺序
|
10 years ago |
|
ouyangxuhua
|
b05708f6e8
|
解决一下三个bug:
1.新建组织文章时，置标题和描述为空，点击取消按钮，却弹出“标题不能为空”的提示信息
2.课程/项目关联组织：点击取消按钮不应该直接收起关联组织列表
3.组织详情页面内再编辑组织，点击确定编辑的按钮后又返回组织列表页面，应返回组织详情页面
|
10 years ago |
|
cxt
|
1f2675020b
|
学生答题未完成时可保存试卷
|
10 years ago |
 houxiang
|
ee746b2d64
|
Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange
need it
|
10 years ago |
|
houxiang
|
c6b5abba4e
|
hide the the count of project'repo
|
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 |
|
huang
|
8c83bbfff3
|
课程英雄榜数据
|
10 years ago |
|
huang
|
061a1f602a
|
效果实现
|
10 years ago |
|
cxt
|
dec5980443
|
截止时间一到立即提交试卷
|
10 years ago |
|
cxt
|
f8621cac76
|
未设置考试时长时，只要还未到截止时间就可以一直提交试卷。
|
10 years ago |
|
ouyangxuhua
|
9c3aed8028
|
增加组织加入课程功能
|
10 years ago |
|
cxt
|
ed9cef486f
|
测验列表页面的按钮调整
|
10 years ago |
