sw
|
86f686efb3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-05-08 14:56:22 +08:00 |
sw
|
ee051f6a37
|
1、课程讨论区回复取消功能
2、课程讨论区回复时不现实主题
|
2015-05-08 14:55:56 +08:00 |
huang
|
89ea9ddc7b
|
项目讨论区代码还原
样式调整
|
2015-05-08 14:41:57 +08:00 |
guange
|
5c4ad1ce7d
|
merge
|
2015-05-08 14:31:23 +08:00 |
guange
|
eed39ef0ef
|
上传头像会进行压缩
|
2015-05-08 14:28:17 +08:00 |
sw
|
05c26aceb6
|
发布新贴按钮跳转
|
2015-05-08 14:27:59 +08:00 |
sw
|
34dbde442d
|
还原课程讨论区
|
2015-05-08 14:23:57 +08:00 |
sw
|
a24e4d345d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-05-08 14:03:08 +08:00 |
alan
|
c21f2c3927
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-05-08 14:02:46 +08:00 |
alan
|
2d93cd4bdc
|
Signed-off-by: alan <547533434@qq.com>
|
2015-05-08 13:33:18 +08:00 |
alan
|
23ef975c23
|
讨论区修改bug
Signed-off-by: alan <547533434@qq.com>
|
2015-05-08 13:04:25 +08:00 |
huang
|
30c6a71cbc
|
修正新建课程讨论区跳转
|
2015-05-08 11:25:25 +08:00 |
alan
|
07ca42b24d
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2015-05-08 10:59:30 +08:00 |
alan
|
63351fc049
|
Signed-off-by: alan <547533434@qq.com>
|
2015-05-08 10:59:11 +08:00 |
huang
|
e6fe010bd7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-05-08 10:56:33 +08:00 |
huang
|
5167cf374c
|
项目讨论区左侧新建按钮跳转页面修改
通过传参跳入(JS实现)
|
2015-05-08 10:56:02 +08:00 |
alanlong9278
|
087f46bf64
|
Signed-off-by: alanlong9278 <547533434@qq.com>
|
2015-05-08 10:24:26 +08:00 |
huang
|
39fe748da7
|
处理项目讨论区主题、描述内容过长
|
2015-05-08 10:10:35 +08:00 |
alanlong9278
|
358c9aa019
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2015-05-08 10:09:17 +08:00 |
alanlong9278
|
65c2c43dcb
|
展开收起回复
Signed-off-by: alanlong9278 <547533434@qq.com>
|
2015-05-08 10:09:01 +08:00 |
sw
|
559b5ce7ab
|
打开缺陷在新的页面打开
|
2015-05-08 10:02:14 +08:00 |
alanlong9278
|
f9a25373b0
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2015-05-08 09:55:33 +08:00 |
alanlong9278
|
f638dd6810
|
课程讨论区
Signed-off-by: alanlong9278 <547533434@qq.com>
|
2015-05-08 09:55:19 +08:00 |
sw
|
78f30344b9
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-05-08 09:55:00 +08:00 |
sw
|
db6218a487
|
教师列表界面增加角色显示、教师显示真实姓名
|
2015-05-08 09:54:40 +08:00 |
alanlong9278
|
3995c68b96
|
Signed-off-by: alanlong9278 <547533434@qq.com>
|
2015-05-08 09:50:58 +08:00 |
alanlong9278
|
3d74734607
|
Signed-off-by: alanlong9278 <547533434@qq.com>
|
2015-05-08 09:48:43 +08:00 |
alanlong9278
|
53124710d8
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2015-05-08 09:38:21 +08:00 |
sw
|
2749c4f890
|
课程配置页面,角色改为中文
|
2015-05-08 09:37:57 +08:00 |
alanlong9278
|
49fe15a666
|
论坛js冲突
Signed-off-by: alanlong9278 <547533434@qq.com>
|
2015-05-08 09:37:52 +08:00 |
huang
|
7755d54ef1
|
各处中文角色统一
|
2015-05-08 09:28:01 +08:00 |
sw
|
cfe3021391
|
用户收索国际化丢失
|
2015-05-08 09:16:11 +08:00 |
alanlong9278
|
336b59f606
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
.gitignore
Gemfile
app/views/issues/index.html.erb
app/views/layouts/_base_feedback.html.erb
app/views/tags/_tag_name.html.erb
Signed-off-by: alanlong9278 <547533434@qq.com>
|
2015-05-08 09:15:50 +08:00 |
huang
|
c6b1a4af59
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-05-08 09:12:52 +08:00 |
huang
|
3df8a99408
|
添加中文项目成员角色
|
2015-05-08 09:12:27 +08:00 |
lizanle
|
3035bf24fc
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-05-08 08:53:44 +08:00 |
lizanle
|
de921be762
|
学生列表老师列表报key not find:realname
|
2015-05-08 08:53:31 +08:00 |
alan
|
20cea86ae8
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2015-05-07 17:38:24 +08:00 |
alan
|
3b58810528
|
修改课程讨论区的js
Signed-off-by: alan <547533434@qq.com>
|
2015-05-07 17:38:08 +08:00 |
sw
|
3cb8962f01
|
登录后域名改为user.truestie.net
|
2015-05-07 17:16:09 +08:00 |
sw
|
ac976e59df
|
匿评可以打0分并给出提示
|
2015-05-07 16:27:26 +08:00 |
sw
|
b684f5b361
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-05-07 16:18:15 +08:00 |
sw
|
e884f58956
|
匿评可以打0分并给出提示
|
2015-05-07 16:12:56 +08:00 |
alan
|
4bf08e49da
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2015-05-07 16:10:22 +08:00 |
alan
|
08f1c39033
|
修改课程讨论区界面
Signed-off-by: alan <547533434@qq.com>
|
2015-05-07 16:10:07 +08:00 |
sw
|
5ea295f8b5
|
1、第一次进入作品列表界面 返回顶部按钮不显示
2、第一次点击返回顶部按钮无用
|
2015-05-07 15:58:41 +08:00 |
sw
|
5f6f937fcb
|
返回顶部浏览器不兼容
|
2015-05-07 14:38:02 +08:00 |
sw
|
f5e87451b9
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-05-07 11:47:43 +08:00 |
sw
|
0ec08f9361
|
打零分作品仍在未批作品列表显示
|
2015-05-07 11:47:34 +08:00 |
sw
|
31f224fd82
|
返回顶部动态显示
|
2015-05-07 11:43:11 +08:00 |