 huang
|
fa563b60d5
|
项目issue添加周报功能
|
2015-05-20 11:12:25 +08:00 |
|
huang
|
6c6ae38f7a
|
课程主页私有样式
|
2015-05-19 10:19:49 +08:00 |
 yutao
|
df24007dbb
|
修复bug(#2525) :项目--邀请：收起“邀请”下拉框，刷新页面后又自动打开
|
2015-05-18 11:16:41 +08:00 |
 sw
|
a44cba2e6a
|
Merge branch 'develop' into guange_dev
|
2015-05-15 17:36:44 +08:00 |
 guange
|
d2a7d41963
|
头像加入大小限制
|
2015-05-15 17:35:24 +08:00 |
|
sw
|
659ff254e1
|
background背景图片拉伸
|
2015-05-15 17:12:01 +08:00 |
|
guange
|
66e2bc5ef2
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
2015-05-15 16:19:13 +08:00 |
|
guange
|
588d96a0c0
|
头像上传只允许图片
|
2015-05-15 16:18:44 +08:00 |
|
sw
|
a8e7590b16
|
Merge branch 'szzh' into guange_dev
|
2015-05-15 16:13:47 +08:00 |
|
sw
|
99e3d09e83
|
IE浏览器中li前面有个点
|
2015-05-15 15:17:47 +08:00 |
|
guange
|
907d89e1cc
|
merge
|
2015-05-15 13:39:26 +08:00 |
|
yutao
|
233c68e965
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-05-15 11:47:57 +08:00 |
|
yutao
|
68cf5fa55e
|
修复:当1个页面存在多个上传控件时的各种bug
|
2015-05-15 11:45:15 +08:00 |
|
huang
|
7db9e2eb7f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-05-15 11:28:59 +08:00 |
|
huang
|
2fb5871058
|
缺陷显示新界面
|
2015-05-15 11:26:50 +08:00 |
|
guange
|
e5a9d87ce1
|
新建贴吧如果放个图片就会撑坏版面
|
2015-05-15 11:18:58 +08:00 |
 alan
|
372bf71ca5
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2015-05-15 10:08:12 +08:00 |
|
alan
|
cc5738c12f
|
课程讨论区回复样式错误
Signed-off-by: alan <547533434@qq.com>
|
2015-05-15 10:07:52 +08:00 |
|
sw
|
a77a572a4d
|
Merge branch 'szzh' into guange_dev
|
2015-05-14 17:46:08 +08:00 |
|
guange
|
06b17581b1
|
图片撑出在firefox上的问题
|
2015-05-14 17:45:02 +08:00 |
|
sw
|
9bbae3d7ac
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/application.css
|
2015-05-14 16:59:27 +08:00 |
|
sw
|
3dc1b2642a
|
发布竞赛日期选择图标有问题
|
2015-05-14 16:53:36 +08:00 |
|
sw
|
c241fc00e9
|
测试版--课程--课程作业：如图作业附件显示与图标重叠
|
2015-05-14 16:48:08 +08:00 |
|
sw
|
c129e767e5
|
测试版：公共贴吧：显示页数应该与虚线分开
|
2015-05-14 16:26:01 +08:00 |
|
huang
|
574e79ff57
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-05-14 16:06:41 +08:00 |
|
huang
|
725a6e4238
|
解决发布竞赛日历问题
|
2015-05-14 16:03:37 +08:00 |
|
alan
|
0708279c5e
|
Signed-off-by: alan <547533434@qq.com>
|
2015-05-14 15:42:20 +08:00 |
|
alan
|
8a52225f4d
|
Signed-off-by: alan <547533434@qq.com>
|
2015-05-14 15:19:15 +08:00 |
|
alan
|
f9d9ffe4d9
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2015-05-14 15:11:36 +08:00 |
|
alan
|
72ef4e1db4
|
修改讨论区编辑是主题，内容为空时报错以及动态页面跳转问题
Signed-off-by: alan <547533434@qq.com>
|
2015-05-14 15:11:20 +08:00 |
|
sw
|
963a21283f
|
1、修改作业打分插件星星移位
2、修改返还批改结果显示不正确
|
2015-05-14 15:09:15 +08:00 |
|
guange
|
52217efcb6
|
issue中图片超出边框
|
2015-05-14 14:12:50 +08:00 |
|
guange
|
d88b5dbbed
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
2015-05-14 12:44:56 +08:00 |
|
guange
|
69afe8809e
|
经测试，转到rspec各方面成熟一点。
|
2015-05-14 11:41:50 +08:00 |
|
huang
|
d60639f557
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-05-14 09:58:08 +08:00 |
|
huang
|
aef91be36c
|
修复新建缺陷样式冲突
|
2015-05-14 09:57:13 +08:00 |
|
alan
|
0af8c1cc38
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2015-05-13 17:25:49 +08:00 |
|
alan
|
bd77ad9ac1
|
展开。收起
Signed-off-by: alan <547533434@qq.com>
|
2015-05-13 17:25:31 +08:00 |
|
guange
|
bb506b2ab4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
# Conflicts:
# db/schema.rb
|
2015-05-13 16:22:44 +08:00 |
|
guange
|
9f4d7fc033
|
merge
|
2015-05-13 16:00:35 +08:00 |
|
guange
|
80d44e4f4c
|
新版项目的上传图标问题解决
|
2015-05-12 17:46:54 +08:00 |
|
alan
|
fe92b05026
|
讨论区编辑添加附件
Signed-off-by: alan <547533434@qq.com>
|
2015-05-12 17:14:07 +08:00 |
|
guange
|
092af28476
|
修正编辑器在火狐下粘贴不成功
|
2015-05-11 20:57:59 +08:00 |
|
alan
|
ee18ba7051
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
app/views/boards/_course_show.html.erb
app/views/boards/_project_show.html.erb
Signed-off-by: alan <547533434@qq.com>
|
2015-05-11 16:25:17 +08:00 |
|
alan
|
25bcc676b9
|
增加附件功能以及修改路由跳转
Signed-off-by: alan <547533434@qq.com>
|
2015-05-11 16:23:15 +08:00 |
|
sw
|
6a31a99c93
|
编辑课程讨论区回复时的问题
|
2015-05-08 16:14:46 +08:00 |
|
sw
|
25e80cefb8
|
Merge branch 'szzh' into guange_dev
|
2015-05-08 15:44:47 +08:00 |
|
sw
|
d4f73ae472
|
111
|
2015-05-08 15:43:55 +08:00 |
|
sw
|
5f6f7b7cdf
|
引用功能图片显示不正常
|
2015-05-08 15:31:13 +08:00 |
|
sw
|
ee051f6a37
|
1、课程讨论区回复取消功能
2、课程讨论区回复时不现实主题
|
2015-05-08 14:55:56 +08:00 |