 huang
|
82b21fd4ec
|
Merge branch 'dev_hjq' into szzh
|
2015-09-25 11:47:48 +08:00 |
|
huang
|
fa88e50bcd
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-25 11:47:13 +08:00 |
|
huang
|
d21ffcf7ff
|
Merge branch 'szzh' into dev_hjq
|
2015-09-25 11:46:54 +08:00 |
|
huang
|
8886bda790
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-25 11:46:15 +08:00 |
|
huang
|
44c097dbaf
|
1、issue回复添加新的编辑器
2、解决issue回复含有html问题
3、解决项目动态中含有html问题
|
2015-09-25 11:45:57 +08:00 |
 ouyangxuhua
|
4d1bc90161
|
匿名用户重新评阅作品，在消息显示中，需要正常显示
|
2015-09-25 11:40:57 +08:00 |
|
ouyangxuhua
|
c466ac876e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-25 11:22:50 +08:00 |
|
ouyangxuhua
|
123a6c862d
|
匿名用户评阅，修改样式
|
2015-09-25 11:22:35 +08:00 |
 lizanle
|
a763fc4860
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-09-25 11:17:38 +08:00 |
|
lizanle
|
e4e1a0818e
|
论坛样式问题
|
2015-09-25 11:17:31 +08:00 |
|
ouyangxuhua
|
dd7199623d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-25 11:13:55 +08:00 |
|
ouyangxuhua
|
3e857ba48f
|
作业消息：截止日期快到时，给出消息提醒。修改提醒内容及样式
|
2015-09-25 11:04:46 +08:00 |
 Tim
|
c675a4c227
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-25 10:43:42 +08:00 |
|
Tim
|
e8a7448a7c
|
资源库用户资源图标位置调整
|
2015-09-25 10:43:19 +08:00 |
|
lizanle
|
80bf8d83f3
|
项目资源和课程资源 js需要分开
|
2015-09-25 10:38:26 +08:00 |
|
lizanle
|
061d41e50a
|
课程资源 和 项目资源 页面通用，需要对js进行判断
|
2015-09-25 10:35:43 +08:00 |
|
Tim
|
7e3ae446f5
|
资源库头像替换
|
2015-09-25 10:35:04 +08:00 |
|
ouyangxuhua
|
c445e933bf
|
修改作业消息颜色
|
2015-09-25 10:18:43 +08:00 |
|
ouyangxuhua
|
892aa166ee
|
增加作业消息的截止日期为24点
|
2015-09-25 10:16:27 +08:00 |
 sw
|
dfc9d89a3d
|
Merge branch 'szzh' into develop
|
2015-09-25 10:13:34 +08:00 |
|
ouyangxuhua
|
9d25f58ee4
|
调整提交作业消息tips的颜色及标题字体
|
2015-09-25 10:13:34 +08:00 |
|
sw
|
68169a3832
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-25 10:09:12 +08:00 |
|
lizanle
|
924183b1cc
|
js合并错误
|
2015-09-25 10:04:56 +08:00 |
|
lizanle
|
f99ccf724c
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-09-25 09:44:29 +08:00 |
|
lizanle
|
c1bd17b07e
|
项目论坛发帖排序比较乱。 去掉置顶功能（发帖的功能里原来有置顶按钮。现在没有了。所以排序也要取消）
|
2015-09-25 09:44:15 +08:00 |
|
ouyangxuhua
|
72d1d12cef
|
修改发布作业的tips的内容及样式
|
2015-09-25 09:40:30 +08:00 |
|
sw
|
d6d9ffd87f
|
Merge branch 'szzh' into develop
|
2015-09-25 09:31:22 +08:00 |
|
ouyangxuhua
|
6e9d276d87
|
作业消息，老师对应的课程改成课程名称
|
2015-09-25 09:30:48 +08:00 |
|
sw
|
7a8a838ca2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-25 09:30:25 +08:00 |
|
sw
|
d564f1ea2e
|
Merge branch 'guange_homework' into szzh
|
2015-09-25 09:30:13 +08:00 |
 guange
|
08eecbd5ec
|
merge
|
2015-09-25 09:30:32 +08:00 |
|
ouyangxuhua
|
6433d223c6
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-25 09:27:22 +08:00 |
|
ouyangxuhua
|
8935d12602
|
修改作业消息显示内容
|
2015-09-25 09:27:03 +08:00 |
|
huang
|
993c7d8f41
|
Merge branch 'dev_hjq' into szzh
|
2015-09-25 09:26:16 +08:00 |
|
huang
|
69290c6ea2
|
Merge branch 'szzh' into dev_hjq
|
2015-09-25 09:25:34 +08:00 |
|
huang
|
e60119d6d3
|
解决匿名用户消息中实名评价的bug
|
2015-09-25 08:59:34 +08:00 |
|
sw
|
bd16bc9154
|
Merge branch 'szzh' into develop
|
2015-09-24 17:22:07 +08:00 |
|
sw
|
040f5ff645
|
Merge branch 'develop' into szzh
|
2015-09-24 17:21:53 +08:00 |
|
huang
|
698be56671
|
Merge branch 'dev_hjq' into szzh
|
2015-09-24 17:21:13 +08:00 |
|
huang
|
20465764a7
|
Merge branch 'szzh' into dev_hjq
|
2015-09-24 17:20:36 +08:00 |
|
huang
|
25309df83f
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-24 17:19:27 +08:00 |
|
huang
|
1e8cb91ab4
|
boards
|
2015-09-24 17:18:58 +08:00 |
|
ouyangxuhua
|
bc9a332be3
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-24 17:11:55 +08:00 |
|
ouyangxuhua
|
a3840ebad9
|
作业匿评开启失败对应页面显示
|
2015-09-24 17:11:39 +08:00 |
|
huang
|
b66de0ee9f
|
issue相关问题
|
2015-09-24 17:03:43 +08:00 |
|
huang
|
25a604d7b8
|
issue解决冲突
|
2015-09-24 16:59:19 +08:00 |
 cxt
|
15b45e6706
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/header.css
public/stylesheets/new_user.css
public/stylesheets/public_new.css
|
2015-09-24 16:46:08 +08:00 |
|
huang
|
fcf34b5918
|
修复项目配置中“私有” “公开”问题
|
2015-09-24 16:38:36 +08:00 |
|
cxt
|
bb0db1e21d
|
课程动态页面
|
2015-09-24 16:30:14 +08:00 |
|
lizanle
|
6b98b2a273
|
暂时不可点击的链接 不用手型光标
|
2015-09-24 16:17:50 +08:00 |