 huang
|
778ff80b55
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-10-15 17:02:40 +08:00 |
|
huang
|
94d60e4150
|
修改邮件配置文件
更新gem镜像路径
|
2015-10-15 17:02:16 +08:00 |
 cxt
|
c5b881cb43
|
发布帖子按钮的样式调整
|
2015-10-15 16:59:17 +08:00 |
|
cxt
|
0a43f462f5
|
帖子动态添加置顶显示
|
2015-10-15 16:44:49 +08:00 |
|
cxt
|
0f0351b343
|
解决冲突
|
2015-10-15 16:28:03 +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
|
0945fecee6
|
匿评开启后，显示“作品匿评”，点击进入匿评作业列表
|
2015-10-15 15:20:40 +08:00 |
|
huang
|
02d4a8383a
|
用户作品提交完成后，框框自动收起
|
2015-10-15 15:00:05 +08:00 |
|
huang
|
4917d5917b
|
解决缺陷 --匿评作品列表，点击下拉的区域不展开问题
|
2015-10-15 14:27:45 +08:00 |
 lizanle
|
0c1d7d420e
|
学校的查询与现实问题重做
|
2015-10-15 13:54:37 +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 |
|
huang
|
7c8525298c
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-10-15 10:08:00 +08:00 |
|
huang
|
554927d517
|
删除项目的时候，项目动态级联删除
|
2015-10-15 10:07: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
|
9399063886
|
创建版本库控制层及国际化
|
2015-10-15 09:18:56 +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 |
 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 |
|
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 |