 lizanle
|
4efb660214
|
全站搜索
|
2015-11-26 09:57:53 +08:00 |
 cxt
|
2cd1c07028
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-11-25 16:05:13 +08:00 |
|
cxt
|
c7cf34500c
|
老师若未设置测验的发布时间则提交后立即发布
|
2015-11-25 16:05:02 +08:00 |
 huang
|
c8b1cae947
|
建立贡献榜表及相关关联
部分页面
按总分排序（英雄榜）
部分页面（未完成）
|
2015-11-25 15:16:33 +08:00 |
 Tim
|
bd7ee66e77
|
新建测验样式调整
|
2015-11-25 15:02:32 +08:00 |
|
cxt
|
7fb78e4816
|
新建测验标题等内容时 点击取消应还原编辑框中的内容
|
2015-11-25 10:38:43 +08:00 |
|
cxt
|
3e0609afe3
|
测验时长和题目分数增加数字验证
|
2015-11-25 10:24:46 +08:00 |
|
Tim
|
d1f16a0851
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
db/schema.rb
|
2015-11-25 10:15:12 +08:00 |
|
Tim
|
ec42cd2d7f
|
系统自动生成文件
|
2015-11-25 10:12:20 +08:00 |
|
Tim
|
394d60049d
|
系统自动生成改动
|
2015-11-25 09:48:20 +08:00 |
|
cxt
|
1ae514ca48
|
测验的发布日期和测验时长做成可选的
|
2015-11-25 09:38:13 +08:00 |
 ouyangxuhua
|
2dc31637d8
|
项目和课程中加入组织时，如果已经加入了某组织，就不要重复加入。
|
2015-11-24 17:29:58 +08:00 |
|
huang
|
85515befc4
|
实现工具栏数字大于0显示，小于0隐藏
|
2015-11-24 17:29:57 +08:00 |
|
Tim
|
3a66b1859c
|
reserved修改
|
2015-11-24 16:47:31 +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 |
|
Tim
|
64d4789150
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/users/user_organizations.html.erb
|
2015-11-24 15:06:19 +08:00 |
|
Tim
|
269d2f992e
|
组织列表搜索框调整后注释
|
2015-11-24 15:02:25 +08:00 |
|
ouyangxuhua
|
a3146c66ae
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-11-24 12:51:12 +08:00 |
|
ouyangxuhua
|
ccfbc1e0bd
|
1.组织翻页增加type参数；
2.删除组织表中冗余的项目动态和课程动态。
|
2015-11-24 12:50:43 +08:00 |
|
cxt
|
b46561dac1
|
提交作业时若作品名称和作品描述为空，则不弹出作品校验弹框
|
2015-11-24 10:34:23 +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 |
|
cxt
|
9b033c3adf
|
数据日志
|
2015-11-24 10:08:51 +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
|
1426557b6d
|
解决密码500问题
|
2015-11-23 22:10:28 +08:00 |
|
huang
|
591984ba63
|
密码问题
|
2015-11-23 21:54:40 +08:00 |
|
huang
|
3af96c96e7
|
finalize the commit_counts problems by hx
|
2015-11-23 21:07:43 +08:00 |
|
huang
|
a174cade83
|
commit by hx , 2015/11/13
|
2015-11-23 20:35:37 +08:00 |
|
houxiang
|
c3bbf3490f
|
modify show
|
2015-11-23 19:50:12 +08:00 |
|
houxiang
|
b3d36705d2
|
modify the commit_count by hx
|
2015-11-23 19:48:20 +08:00 |
|
ouyangxuhua
|
68bb142278
|
解决组织bug:动态过滤，点击“展开更多”，有通知等其他动态
|
2015-11-23 17:29:55 +08:00 |
|
huang
|
85a219f7e9
|
项目动态\清除
|
2015-11-23 17:16:05 +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 |
|
ouyangxuhua
|
71e98c873d
|
组织回复框中，默认图片颜色为灰色，当焦点放在输入框时，图片颜色变亮。
|
2015-11-23 16:40:21 +08:00 |
|
ouyangxuhua
|
1914639bc3
|
成功添加某成员后，在搜索框中输入的该成员关键字就要自动清空
|
2015-11-23 10:17:20 +08:00 |
|
ouyangxuhua
|
65548cd8c3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-11-23 09:32:21 +08:00 |
|
ouyangxuhua
|
d2a87127da
|
我的组织搜索功能显示
|
2015-11-23 09:32:03 +08:00 |
|
cxt
|
f262a7cc13
|
cffd
|
2015-11-20 22:05:31 +08:00 |
|
huang
|
fd03e62957
|
添加字段迁移
|
2015-11-20 22:04:07 +08:00 |
|
huang
|
bd07fea850
|
Merge branch 'szzh' into develop
|
2015-11-20 21:51:51 +08:00 |
|
huang
|
17f85c1b1b
|
Merge branch 'sw_new_course' into szzh
|
2015-11-20 21:51:29 +08:00 |
|
huang
|
83c7e981af
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-11-20 21:50:35 +08:00 |
|
cxt
|
dbe236032b
|
新建题目时必须先保存标题
|
2015-11-20 21:50:27 +08:00 |
|
huang
|
95e8173e0b
|
Merge branch 'szzh' into sw_new_course
|
2015-11-20 21:50:25 +08:00 |
|
huang
|
6c87908886
|
Merge branch 'develop' into szzh
|
2015-11-20 21:49:55 +08:00 |
|
huang
|
1df8c94b98
|
解决字符过长不能保存成功的问题
|
2015-11-20 21:49:36 +08:00 |
|
huang
|
3083f683b9
|
修改删除的时候顺序乱的问题
添加相应的参数
|
2015-11-20 21:14:09 +08:00 |