 Tim
|
7f59902a23
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-14 14:57:53 +08:00 |
 cxt
|
5d8ebad25c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-14 14:20:10 +08:00 |
|
cxt
|
20ff1430fc
|
动态回复默认显示3个，“收起回复”、“展开更多”后去掉回复数
|
2015-10-14 14:19:59 +08:00 |
 lizanle
|
d012820a54
|
显示用户的真姓名
|
2015-10-14 12:04:07 +08:00 |
|
cxt
|
ea66ca5e00
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
public/javascripts/init_activity_KindEditor.js
|
2015-10-14 11:41:30 +08:00 |
|
cxt
|
8abc97ae84
|
个人主页添加个人留言动态
|
2015-10-14 11:38:16 +08:00 |
|
Tim
|
edbcb534c5
|
加入课程弹窗修改
|
2015-10-14 11:34:23 +08:00 |
|
lizanle
|
e5808f3fe8
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-10-14 11:10:27 +08:00 |
|
lizanle
|
918c6f46ba
|
资源全站搜索出现bug
|
2015-10-14 11:10:19 +08:00 |
|
Tim
|
58c8851a99
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-14 09:26:20 +08:00 |
|
Tim
|
64ec465126
|
意见反馈窗口调整
|
2015-10-14 09:25:54 +08:00 |
 huang
|
8ab04c652f
|
Merge branch 'develop' into gitlab_guange
|
2015-10-14 09:06:11 +08:00 |
 guange
|
6472367b68
|
firefox粘贴图片只能一张的bug
|
2015-10-13 21:47:55 +08:00 |
|
guange
|
bdecea83ca
|
js中edit报错
|
2015-10-13 21:37:41 +08:00 |
|
huang
|
1ab291353f
|
Merge branch 'szzh' into develop
|
2015-10-13 17:17:54 +08:00 |
|
guange
|
f2dd1c9467
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-13 17:11:30 +08:00 |
|
guange
|
af03d6c00c
|
IE11乱码问题
|
2015-10-13 17:10:46 +08:00 |
|
huang
|
881367a638
|
Merge branch 'szzh' into develop
|
2015-10-13 17:07:27 +08:00 |
|
huang
|
9eb498dbc4
|
版本库 文件目录（未完成--）
|
2015-10-13 17:05:47 +08:00 |
|
lizanle
|
bd8f2f20a5
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-10-13 17:03:49 +08:00 |
|
lizanle
|
a227e37598
|
取消掉贴吧字符长度的限制
|
2015-10-13 17:03:40 +08:00 |
|
cxt
|
3ebbcedf1b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-13 16:51:57 +08:00 |
|
cxt
|
b9b7f6fa9e
|
个人主页留言动态的实现
|
2015-10-13 16:51:44 +08:00 |
|
guange
|
3a98224f6a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-13 16:29:54 +08:00 |
|
guange
|
5b2fb66468
|
解决ie11下载乱码问题
|
2015-10-13 16:29:25 +08:00 |
|
lizanle
|
2d60555041
|
单个帖子的回复全部展示
|
2015-10-13 16:06:36 +08:00 |
|
lizanle
|
c9b23c5597
|
贴吧 项目符号 应该显示
|
2015-10-13 15:59:02 +08:00 |
|
lizanle
|
26e0f7db0b
|
是老师，就都能编辑，有id，就是只能编辑资源里的tag
|
2015-10-13 15:48:44 +08:00 |
 ouyangxuhua
|
d006c2691b
|
issue模块中，搜索问题时，给出提示信息“请输入问题名称”
|
2015-10-13 13:54:31 +08:00 |
|
cxt
|
78e552ddee
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-13 11:04:26 +08:00 |
|
cxt
|
53a7b1dda4
|
课程讨论区动态按最后更新时间排序
|
2015-10-13 11:03:56 +08:00 |
|
cxt
|
a77f7e6f75
|
课程讨论区单个帖子页面的功能实现
|
2015-10-13 11:03:22 +08:00 |
|
huang
|
73898953d9
|
project表添加字段，记录project对应gitlba中project id
|
2015-10-13 10:58:22 +08:00 |
|
ouyangxuhua
|
d1da996539
|
Merge branch 'szzh' into dev_hjq
|
2015-10-13 09:43:37 +08:00 |
|
lizanle
|
e1c5c02c0d
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-10-13 09:37:49 +08:00 |
|
lizanle
|
71c55667ac
|
forum tag双击可编辑的函数错误，导致编辑器在火狐浏览器插入图片bug
|
2015-10-13 09:37:30 +08:00 |
|
lizanle
|
1c72d59f71
|
forum tag双击可编辑的函数错误，导致编辑器在火狐浏览器插入图片bug
|
2015-10-13 09:25:52 +08:00 |
|
cxt
|
03e8c3802d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-12 17:20:11 +08:00 |
|
cxt
|
ebb7ed1f1a
|
讨论区单个帖子页面的二级回复
|
2015-10-12 17:19:55 +08:00 |
|
ouyangxuhua
|
4d2215646a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-12 16:47:01 +08:00 |
|
ouyangxuhua
|
57475f3420
|
作业截止时间快到时，由“某用户发布的作业”，改为“某老师发布的作业”
|
2015-10-12 16:46:40 +08:00 |
|
lizanle
|
f024723f8c
|
去掉js的调试语句
|
2015-10-12 16:28:18 +08:00 |
|
lizanle
|
d3590b6a6e
|
提交作品 那里 也有引入资源库的需求，也需要分页多选。
|
2015-10-12 16:26:47 +08:00 |
|
lizanle
|
9a7b1c78ae
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-10-12 16:15:35 +08:00 |
|
lizanle
|
44b148b32f
|
act有可能为空，导致500错误
|
2015-10-12 16:15:27 +08:00 |
|
Tim
|
752494e35e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-12 16:08:51 +08:00 |
|
Tim
|
d33a6b763d
|
引用资源库弹窗外观调整
|
2015-10-12 16:08:33 +08:00 |
|
lizanle
|
cb4d62d3b6
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-10-12 15:51:56 +08:00 |
|
lizanle
|
c85e1401f0
|
引用资源支持多页选择
|
2015-10-12 15:51:47 +08:00 |
|
ouyangxuhua
|
155dff7e27
|
1.增加消息列表对应的图标；
|
2015-10-12 15:08:01 +08:00 |