 ouyangxuhua
|
3abc3f7af0
|
组织文章编辑，返回对应界面
|
2015-11-27 15:25:49 +08:00 |
Gan Yi.ang
|
79656aa205
|
Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange
|
2015-11-27 15:22:18 +08:00 |
|
Gan Yi.ang
|
c3a27151ca
|
修复_revision
|
2015-11-27 15:21:58 +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 |
 lizanle
|
e710f443c2
|
全站搜索
|
2015-11-27 15:17:17 +08:00 |
 huang
|
eb84434b50
|
Merge branch 'szzh' into develop
|
2015-11-27 14:57:32 +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
|
959be1ccd9
|
Merge branch 'gitlab_guange' into szzh
|
2015-11-27 14:50:17 +08:00 |
|
huang
|
36b1649fbd
|
Merge branch 'szzh' into gitlab_guange
Conflicts:
db/schema.rb
|
2015-11-27 14:49:49 +08:00 |
|
huang
|
d59c7608cd
|
Merge branch 'hjq_new_course' into szzh
|
2015-11-27 14:47:42 +08:00 |
|
huang
|
2ec78d07fa
|
Merge branch 'szzh' into hjq_new_course
|
2015-11-27 14:47:16 +08:00 |
|
ouyangxuhua
|
25b66b5dbb
|
取消弹窗
|
2015-11-27 14:43:08 +08:00 |
|
lizanle
|
3d9f632105
|
全站搜索
|
2015-11-27 14:42:25 +08:00 |
|
huang
|
1cc6e305ed
|
完成新功能模块开发：
1、如果没有成绩则不显示
2、工具框展开没有则不显示
|
2015-11-27 13:52:40 +08:00 |
|
ouyangxuhua
|
365349878d
|
组织加入项目或者课程，刷新项目列表和课程列表；同时，弹窗给出关联成功的提示
|
2015-11-27 13:17:23 +08:00 |
|
lizanle
|
c28b8bab14
|
全站搜索
|
2015-11-27 13:09:20 +08:00 |
|
lizanle
|
0992ddd0f6
|
全站搜索
|
2015-11-27 13:07:25 +08:00 |
|
lizanle
|
bf1c1cf0a1
|
全站搜索
|
2015-11-27 13:07:09 +08:00 |
|
ouyangxuhua
|
e0f4050779
|
1.修改组织中关联项目和课程的内容和样式
|
2015-11-27 12:34:02 +08:00 |
|
lizanle
|
6be917e052
|
全站搜索
|
2015-11-27 11:34:42 +08:00 |
|
Gan Yi.ang
|
ee85cc35ed
|
Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange
|
2015-11-27 11:27:03 +08:00 |
|
Gan Yi.ang
|
1115d54d9a
|
非trustie用户changesets_latest_coimmit
|
2015-11-27 11:25:16 +08:00 |
|
lizanle
|
768aff89da
|
全站搜索
|
2015-11-27 11:09:01 +08:00 |
|
ouyangxuhua
|
4aa827eb4a
|
组织页面中，点击项目收起项目列表，再点击展开列表；点击课程同样如此。
|
2015-11-27 11:02:48 +08:00 |
|
lizanle
|
f448b5f8e2
|
全站搜索
|
2015-11-27 11:00:06 +08:00 |
 Tim
|
2d14b66336
|
作品列表样式调整
|
2015-11-27 10:56:46 +08:00 |
|
huang
|
042b197767
|
课程英雄榜界面调整
动作触发的时候更新总分
更换迁移顺序
|
2015-11-27 10:49:41 +08:00 |
|
ouyangxuhua
|
b05708f6e8
|
解决一下三个bug:
1.新建组织文章时，置标题和描述为空，点击取消按钮，却弹出“标题不能为空”的提示信息
2.课程/项目关联组织：点击取消按钮不应该直接收起关联组织列表
3.组织详情页面内再编辑组织，点击确定编辑的按钮后又返回组织列表页面，应返回组织详情页面
|
2015-11-27 10:43:21 +08:00 |
|
lizanle
|
7cb39d1754
|
全站搜索
|
2015-11-27 10:40:58 +08:00 |
|
cxt
|
1f2675020b
|
学生答题未完成时可保存试卷
|
2015-11-27 10:15:25 +08:00 |
 houxiang
|
ee746b2d64
|
Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange
need it
|
2015-11-27 10:12:00 +08:00 |
|
houxiang
|
c6b5abba4e
|
hide the the count of project'repo
|
2015-11-27 10:10:59 +08:00 |
|
lizanle
|
ee47187a61
|
全站搜索
|
2015-11-27 09:52:51 +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 |
|
huang
|
8c83bbfff3
|
课程英雄榜数据
|
2015-11-27 00:48:08 +08:00 |
|
huang
|
061a1f602a
|
效果实现
|
2015-11-26 21:17:04 +08:00 |
|
huang
|
aca7684414
|
课程英雄榜
各模块动作 触发加分
|
2015-11-26 18:22:03 +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
|
c9f844b9ba
|
Merge branch 'sw_new_course' into develop
|
2015-11-26 17:22:26 +08:00 |
|
cxt
|
dec5980443
|
截止时间一到立即提交试卷
|
2015-11-26 17:20:17 +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 |
|
Gan Yi.ang
|
0cd954f9ea
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2015-11-26 15:55:23 +08:00 |
|
cxt
|
ed9cef486f
|
测验列表页面的按钮调整
|
2015-11-26 15:21:46 +08:00 |
|
cxt
|
b690fa0b05
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-11-26 14:48:01 +08:00 |
|
cxt
|
b602e1c85d
|
学生答题页面显示试卷截止时间
|
2015-11-26 14:47:52 +08:00 |
|
Tim
|
5bdcdc607f
|
测验列表格式更改
|
2015-11-26 14:45:35 +08:00 |
|
cxt
|
f1bb1bb8c2
|
测验列表的创建时间改成截止时间，每个测验名字前增加序号，显示发布状态
|
2015-11-26 14:36:19 +08:00 |