 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 |
|
lizanle
|
590a2480ba
|
没有资源的情况下不要显示全部
|
2015-10-12 10:49:07 +08:00 |
|
lizanle
|
122145dbb2
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-10-12 10:34:39 +08:00 |
|
lizanle
|
e9055dd113
|
发布作业的时候引入资源的情况，分页列表中的文字被遮挡
|
2015-10-12 10:34:30 +08:00 |
|
huang
|
8c5bef724f
|
Merge branch 'szzh' into dev_hjq
|
2015-10-10 16:57:29 +08:00 |
|
huang
|
7ce1e4e4b7
|
Merge branch 'szzh' into develop
|
2015-10-10 16:21:37 +08:00 |
|
huang
|
0205fd62d9
|
Merge branch 'dev_hjq' into szzh
|
2015-10-10 16:20:34 +08:00 |
|
huang
|
fbeb6585d2
|
去掉初始化输出提示
|
2015-10-10 16:18:05 +08:00 |
|
ouyangxuhua
|
8133ba33c7
|
将消息分类为：课程消息、项目消息等
|
2015-10-10 16:18:03 +08:00 |
|
huang
|
7c1bb8b9ed
|
Merge branch 'szzh' into gitlab_guange
Conflicts:
Gemfile
app/models/user.rb
db/schema.rb
lib/trustie.rb
解决冲突
|
2015-10-10 16:09:05 +08:00 |
|
ouyangxuhua
|
491e4d12c6
|
1.增加课程问卷、项目讨论、项目新闻对应界面的标题
2.将下拉菜单放在一个局部页面中，以便User_messages页面和User_system_messages都调用它，避免代码重复。
|
2015-10-10 16:03:31 +08:00 |
|
ouyangxuhua
|
3d993304e3
|
1.修复作业消息的一些代码bug;
2.调整消息下拉单间距
|
2015-10-10 15:27:13 +08:00 |
|
lizanle
|
5ea5cada00
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-10-10 15:12:11 +08:00 |
|
lizanle
|
d80dffb31c
|
只有课程里才用到了tag 云，
|
2015-10-10 15:12:04 +08:00 |
|
ouyangxuhua
|
3955075d03
|
消息中，将用户留言前面的空行去掉
|
2015-10-10 15:00:49 +08:00 |
|
huang
|
17d83db3e2
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2015-10-10 14:33:17 +08:00 |
|
huang
|
b053f16f0f
|
Merge branch 'szzh' into develop
|
2015-10-10 14:33:03 +08:00 |
|
huang
|
950a62d532
|
Merge branch 'dev_hjq' into szzh
|
2015-10-10 14:32:16 +08:00 |
|
ouyangxuhua
|
1fc7bed486
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-10-10 14:30:42 +08:00 |
|
ouyangxuhua
|
3957ca5dc2
|
邮件中，让用户留言以html格式显示
|
2015-10-10 14:30:23 +08:00 |
|
huang
|
a7b14e973d
|
Merge branch 'szzh' into dev_hjq
|
2015-10-10 14:21:31 +08:00 |
|
ouyangxuhua
|
a9456ca82f
|
让项目留言的内容以html形式显示
|
2015-10-10 14:14:36 +08:00 |
|
ouyangxuhua
|
2752512471
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-10-10 14:00:37 +08:00 |