 sw
|
f2c87f198d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/base_projects.html.erb
|
2015-06-13 09:24:32 +08:00 |
 yutao
|
499a6b31f9
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-06-13 09:23:39 +08:00 |
|
yutao
|
b42d5e3667
|
...
|
2015-06-13 09:23:26 +08:00 |
|
sw
|
a600d93630
|
111
|
2015-06-13 09:23:04 +08:00 |
 huang
|
3854ef3610
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-06-12 17:50:27 +08:00 |
|
huang
|
2acab1719e
|
修改附件上传上面被截取问题
|
2015-06-12 17:50:05 +08:00 |
|
yutao
|
d9157965e9
|
...
|
2015-06-12 17:49:06 +08:00 |
|
huang
|
3d53c4930a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-06-12 17:27:47 +08:00 |
|
yutao
|
ab64b38cee
|
留言提交之后清除编辑框内容
|
2015-06-12 17:26:40 +08:00 |
|
huang
|
5d88de3e6e
|
解决bug：加入项目对齐及注释
|
2015-06-12 17:26:36 +08:00 |
|
sw
|
cd7bb85f2f
|
资源列表多了一个c
|
2015-06-12 17:25:39 +08:00 |
|
sw
|
2a2b93c97d
|
导出问卷时，多行主观的答案有html代码
|
2015-06-12 16:58:43 +08:00 |
|
yutao
|
5ac4d2afe3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-06-12 16:53:10 +08:00 |
|
yutao
|
482df88d70
|
...
|
2015-06-12 16:52:49 +08:00 |
|
huang
|
94877bb353
|
修改版本格式
|
2015-06-12 16:48:43 +08:00 |
|
sw
|
1810a3eb41
|
111
|
2015-06-12 16:46:07 +08:00 |
|
sw
|
21a9a67bfc
|
移除bid
|
2015-06-12 16:45:23 +08:00 |
|
sw
|
418f75fd1f
|
注释无用代码
|
2015-06-12 16:43:52 +08:00 |
|
sw
|
90bd3bad58
|
Merge branch 'develop' into szzh
|
2015-06-12 16:36:54 +08:00 |
|
sw
|
b7c04207e1
|
课程通知评论显示
|
2015-06-12 16:36:08 +08:00 |
|
sw
|
c07f66776c
|
课程留言列表，拉长时显示不正确
|
2015-06-12 16:34:25 +08:00 |
|
yutao
|
e138292f2a
|
...
|
2015-06-12 16:31:29 +08:00 |
|
sw
|
6d8f0e728d
|
课程 作业、通知模块，新版编辑器相关BUG
|
2015-06-12 16:26:24 +08:00 |
|
yutao
|
46da84cd81
|
...
|
2015-06-12 15:56:28 +08:00 |
|
sw
|
0d6c4a9984
|
Merge branch 'szzh' into develop
|
2015-06-12 15:18:42 +08:00 |
|
sw
|
0a09e73042
|
Merge branch 'guange_dev' into szzh
|
2015-06-12 15:18:09 +08:00 |
|
huang
|
f489512c6f
|
Merge branch 'dev_hjq' into szzh
|
2015-06-12 15:17:43 +08:00 |
|
huang
|
4da4d54d92
|
Merge branch 'szzh' into dev_hjq
|
2015-06-12 15:14:07 +08:00 |
|
sw
|
8fc0e3cfe9
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-06-12 15:05:52 +08:00 |
|
huang
|
881d66103b
|
去掉注释掉的代码
|
2015-06-12 14:59:06 +08:00 |
|
yutao
|
e8369b2f25
|
...
|
2015-06-12 14:49:50 +08:00 |
|
sw
|
9938c9f83a
|
课程首页通知不显示附件
|
2015-06-12 14:41:02 +08:00 |
|
yutao
|
0ca913bc83
|
...
|
2015-06-12 11:55:29 +08:00 |
|
yutao
|
dbb6c9f54c
|
...
|
2015-06-12 11:21:49 +08:00 |
|
yutao
|
3c515dd077
|
...
|
2015-06-12 10:52:15 +08:00 |
|
yutao
|
f7e0ad9fc3
|
...
|
2015-06-12 10:09:47 +08:00 |
|
yutao
|
6929694fb4
|
个人主页留言换编辑器
|
2015-06-11 18:16:23 +08:00 |
|
yutao
|
e99206ff4a
|
项目留言换编辑器
|
2015-06-11 17:31:47 +08:00 |
|
sw
|
d74edbcf54
|
Merge branch 'szzh' into develop
|
2015-06-11 16:42:06 +08:00 |
|
huang
|
9c0454d4fa
|
Merge branch 'dev_hjq' into szzh
|
2015-06-11 16:37:46 +08:00 |
|
huang
|
5c36cf5c9d
|
Merge branch 'szzh' into dev_hjq
|
2015-06-11 16:36:19 +08:00 |
|
huang
|
2a74509fd9
|
邮件显示页面项目括号颜色
|
2015-06-11 16:33:33 +08:00 |
|
huang
|
a4f1edcdee
|
更新：wiki项目其它成员可以收到；
项目、课程留言其它成员可以收到
邮件显示页面国际化
|
2015-06-11 16:30:14 +08:00 |
|
yutao
|
de3bb64fd9
|
课程讨论区换编辑器
|
2015-06-11 16:24:09 +08:00 |
|
sw
|
b44f5ef522
|
弹出框显示为作业名称
|
2015-06-11 15:47:55 +08:00 |
|
sw
|
f956b27953
|
作业积分显示平均分
|
2015-06-11 15:31:22 +08:00 |
|
huang
|
7bf4cfd218
|
修改个人留言在按天发送中查询条件
|
2015-06-11 10:40:55 +08:00 |
|
huang
|
15697e05ed
|
按天发送中添加项目留言
|
2015-06-11 10:02:27 +08:00 |
|
sw
|
5d5159f4c7
|
助教也可在个人首页关闭课程
|
2015-06-10 16:58:48 +08:00 |
|
huang
|
c72f522493
|
邮件按天发送中添加wiki
|
2015-06-10 16:58:22 +08:00 |