 huang
|
419b3f4036
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-11-10 17:36:22 +08:00 |
 lizanle
|
2cf61ad74f
|
编辑的时候报500
|
2015-11-10 17:34:18 +08:00 |
|
huang
|
422d4569b8
|
Merge branch 'szzh' into develop
|
2015-11-10 17:13:20 +08:00 |
|
huang
|
bebda15582
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-11-10 17:12:41 +08:00 |
|
huang
|
74f2827a8b
|
Merge branch 'develop' into szzh
|
2015-11-10 17:12:29 +08:00 |
|
lizanle
|
db0978c657
|
编辑的时候报500
|
2015-11-10 17:07:37 +08:00 |
 cxt
|
91ef155b10
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-11-10 16:47:55 +08:00 |
|
lizanle
|
8d7a203411
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-11-10 16:03:25 +08:00 |
|
lizanle
|
463b6e91f5
|
添加邮箱验证
|
2015-11-10 16:03:06 +08:00 |
|
huang
|
5efd3fae48
|
Merge branch 'szzh' into develop
|
2015-11-10 15:32:26 +08:00 |
|
huang
|
0f32e7fe24
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-11-10 15:31:59 +08:00 |
|
huang
|
0051733956
|
Merge branch 'develop' into szzh
|
2015-11-10 15:31:44 +08:00 |
|
huang
|
ef74d8d956
|
添加任务--解决用户同步不成功的问题
|
2015-11-10 15:31:24 +08:00 |
|
cxt
|
ec6728df07
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-11-10 15:28:13 +08:00 |
|
cxt
|
6dd264990e
|
作品列表的“点击查看详情”
|
2015-11-10 15:27:59 +08:00 |
|
lizanle
|
94367eee82
|
Merge branch 'dev_zanle' into szzh
|
2015-11-10 15:26:48 +08:00 |
|
lizanle
|
d64b6cfad0
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-11-10 15:22:18 +08:00 |
|
lizanle
|
c20ff6980b
|
进度条不见了bug。
|
2015-11-10 15:22:10 +08:00 |
|
lizanle
|
82c377a60a
|
在导航处上传文件不可用
|
2015-11-10 15:18:13 +08:00 |
|
cxt
|
5218287419
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-11-10 14:51:56 +08:00 |
|
cxt
|
4be3b16b60
|
隐藏点击查看详情
|
2015-11-10 14:51:44 +08:00 |
|
lizanle
|
dcdffe5d04
|
上传文件的进度条不见了。
|
2015-11-10 14:37:16 +08:00 |
|
lizanle
|
8d94f57ec3
|
上传文件的进度条不见了。
|
2015-11-10 14:33:46 +08:00 |
|
cxt
|
0c43a703ed
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-11-10 14:18:53 +08:00 |
|
cxt
|
4adc6deabf
|
配置课程页面的开课学期不可更改，弹框提醒用户。
|
2015-11-10 14:18:39 +08:00 |
 Tim
|
679ec44f8a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/student_work/_evaluation_work.html.erb
|
2015-11-10 09:23:01 +08:00 |
|
Tim
|
d9610d2694
|
作品列表提示标签
|
2015-11-10 09:12:12 +08:00 |
|
cxt
|
2a82f33227
|
个人首页的留言动态显示不合理
|
2015-11-09 16:08:15 +08:00 |
|
lizanle
|
3c93103bc7
|
迟交提示，老师名称要给称呼
|
2015-11-09 15:59:24 +08:00 |
|
lizanle
|
7bd9c5b65c
|
更改时区设置
作业发布消息添加发布时间
|
2015-11-09 15:55:55 +08:00 |
|
lizanle
|
20b49385de
|
更改时区设置
作业发布消息添加发布时间
|
2015-11-09 15:36:32 +08:00 |
|
cxt
|
dc7a90cab5
|
助教无法打开学生作品
|
2015-11-09 15:07:33 +08:00 |
|
lizanle
|
0e42554ef9
|
引用资源和 直接上传资源的删除按钮应该在同一列上
|
2015-11-09 14:58:01 +08:00 |
|
lizanle
|
0c202a47bb
|
博客回复，点击取消去掉回复框的内容
|
2015-11-09 14:35:12 +08:00 |
|
lizanle
|
157ba12513
|
资源库虚线问题
|
2015-11-09 14:04:51 +08:00 |
|
cxt
|
6232bbb5e7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-11-09 11:55:05 +08:00 |
|
cxt
|
d461e1be0d
|
作品列表的提示信息“您尚未提交作品”
|
2015-11-09 11:54:33 +08:00 |
|
lizanle
|
2e092b0d04
|
论坛字符允许扩大为30000个字符，超过两万个字符不允许提交
|
2015-11-09 11:27:05 +08:00 |
|
lizanle
|
2d321d2dbc
|
论坛字符允许扩大为20000个字符，超过两万个字符不允许提交
|
2015-11-09 11:24:20 +08:00 |
|
cxt
|
463262e838
|
提交作品时立马弹框
|
2015-11-09 11:16:19 +08:00 |
|
lizanle
|
1edd87f9e0
|
论坛字符允许扩大为20000个字符
|
2015-11-09 11:15:01 +08:00 |
|
lizanle
|
4b272b6b9c
|
论坛字符允许扩大为40000个字符
|
2015-11-09 11:14:24 +08:00 |
|
lizanle
|
8e66bb8fe1
|
在课程 项目 上传资源后跳转到对应的资源库界面
|
2015-11-09 10:07:12 +08:00 |
|
lizanle
|
77741cf52c
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-11-09 10:03:31 +08:00 |
|
lizanle
|
f229d18776
|
在课程 项目 上传资源后跳转到对应的资源库界面
|
2015-11-09 10:03:06 +08:00 |
 guange
|
4e62dd1219
|
修改显示错误信息的格式
|
2015-11-07 19:58:19 +08:00 |
|
huang
|
e2f87a5b06
|
Merge branch 'szzh' into develop
|
2015-11-06 17:49:36 +08:00 |
|
huang
|
fe2d992ede
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-11-06 17:49:10 +08:00 |
|
huang
|
4c6dd4a7ab
|
Merge branch 'develop' into szzh
|
2015-11-06 17:49:00 +08:00 |
|
huang
|
48547f3e11
|
1/添加members迁移
2、过滤掉版本库identifier重复值的版本库
3、添加puts打印
|
2015-11-06 17:47:56 +08:00 |