 cxt
|
c5b881cb43
|
发布帖子按钮的样式调整
|
2015-10-15 16:59:17 +08:00 |
|
cxt
|
0a43f462f5
|
帖子动态添加置顶显示
|
2015-10-15 16:44:49 +08:00 |
|
cxt
|
caa278d9f5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/boards_controller.rb
db/schema.rb
|
2015-10-15 16:22:49 +08:00 |
|
cxt
|
8ea5d98b6c
|
课程讨论区发布帖子、编辑帖子的实现
|
2015-10-15 16:17:48 +08:00 |
 huang
|
464fc461ea
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-15 15:47:59 +08:00 |
|
huang
|
6b7800c36b
|
Merge branch 'dev_hjq' into szzh
|
2015-10-15 15:47:38 +08:00 |
|
huang
|
c11905707d
|
非课程成员 --课程动态中不显示 提交 ，匿评等信息
|
2015-10-15 15:43:40 +08:00 |
|
huang
|
e747599925
|
作品匿评不显示
|
2015-10-15 15:26:32 +08:00 |
|
huang
|
02d4a8383a
|
用户作品提交完成后，框框自动收起
|
2015-10-15 15:00:05 +08:00 |
|
huang
|
4917d5917b
|
解决缺陷 --匿评作品列表，点击下拉的区域不展开问题
|
2015-10-15 14:27:45 +08:00 |
 lizanle
|
e382cb5899
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-10-15 12:05:07 +08:00 |
|
lizanle
|
b3d15b886a
|
学校的查询与现实问题重做
|
2015-10-15 12:04:55 +08:00 |
|
huang
|
32b02f397a
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-10-15 11:08:56 +08:00 |
|
huang
|
8daecd3ead
|
解决作品提交者链接错误问题
|
2015-10-15 11:08:42 +08:00 |
 ouyangxuhua
|
c13558f78f
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-10-15 10:59:48 +08:00 |
|
ouyangxuhua
|
5f689090b8
|
完善作业消息的内容
|
2015-10-15 10:59:18 +08:00 |
|
huang
|
d0ea49d1e9
|
解决项目讨论区置顶功能不能使用问题
|
2015-10-15 10:48:46 +08:00 |
|
ouyangxuhua
|
9dc1b75fab
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-10-15 09:56:27 +08:00 |
|
ouyangxuhua
|
b261eed24c
|
提取作业评分消息的评分及评语，用适当的样式显示出来
|
2015-10-15 09:56:05 +08:00 |
|
huang
|
a45722b0f5
|
一个项目只能建一个版本库
|
2015-10-15 09:11:26 +08:00 |
|
ouyangxuhua
|
69ad8495c7
|
修改作业消息中，评阅了某作评的消息内容
|
2015-10-14 17:28:13 +08:00 |
 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 |
|
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 |
|
lizanle
|
2d60555041
|
单个帖子的回复全部展示
|
2015-10-13 16:06:36 +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
|
a77f7e6f75
|
课程讨论区单个帖子页面的功能实现
|
2015-10-13 11:03:22 +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
|
44b148b32f
|
act有可能为空，导致500错误
|
2015-10-12 16:15:27 +08:00 |