 sw
|
09f6a67577
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-11 17:17:33 +08:00 |
 cxt
|
9dc3f43af1
|
修改迁移文件
|
2015-09-11 17:15:05 +08:00 |
|
sw
|
d04fc37de1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2015-09-11 17:13:59 +08:00 |
|
sw
|
4ee4bb6e9d
|
编辑作业
|
2015-09-11 17:07:30 +08:00 |
|
sw
|
b31104007a
|
Merge branch 'szzh' into develop
|
2015-09-11 16:59:10 +08:00 |
|
sw
|
b1a17f1b6b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-11 16:58:38 +08:00 |
|
sw
|
b6452bb652
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-11 16:58:05 +08:00 |
|
sw
|
ecf2ac5e19
|
课程内发布作业增加提示
|
2015-09-11 16:57:49 +08:00 |
|
cxt
|
86f0889f5b
|
"我的动态"显示当前用户的个人动态
|
2015-09-11 16:53:09 +08:00 |
|
sw
|
295a3332c6
|
schema.rb文件错误
|
2015-09-11 16:47:53 +08:00 |
 lizanle
|
6c06dfeb3d
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-09-11 16:46:20 +08:00 |
|
cxt
|
7e5093d0d2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-11 16:45:58 +08:00 |
|
lizanle
|
c701eefb42
|
暂时不添加 我要回复
|
2015-09-11 16:45:57 +08:00 |
|
cxt
|
312955e5dc
|
迁移文件
|
2015-09-11 16:45:50 +08:00 |
|
lizanle
|
b99663a773
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-09-11 16:44:28 +08:00 |
|
lizanle
|
9f871ababb
|
添加 我要回复
|
2015-09-11 16:44:19 +08:00 |
|
cxt
|
35ccb23566
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-11 16:44:08 +08:00 |
|
cxt
|
dbdd68f45d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2015-09-11 16:43:59 +08:00 |
|
cxt
|
585818fe7a
|
讨论区动态重复出现
|
2015-09-11 16:42:24 +08:00 |
 huang
|
b75247177c
|
Merge branch 'dev_hjq' into szzh
|
2015-09-11 16:38:32 +08:00 |
|
huang
|
27fde3f642
|
Merge branch 'szzh' into dev_hjq
|
2015-09-11 16:37:50 +08:00 |
|
huang
|
dc564c37f1
|
修改系统消息参数
输入内容JS控制
|
2015-09-11 16:36:10 +08:00 |
|
sw
|
a3d628dc17
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-11 16:29:55 +08:00 |
|
sw
|
760b70971a
|
取消导入编程作业时对homework_type的赋值
|
2015-09-11 16:27:34 +08:00 |
|
sw
|
90a52aa01b
|
导入编程作业后、测试集数量不显示的问题
|
2015-09-11 16:26:35 +08:00 |
|
sw
|
37f235c2ab
|
导入编程作业
|
2015-09-11 16:22:35 +08:00 |
 ouyangxuhua
|
b053a1e43c
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
Conflicts:
app/models/system_message.rb
app/views/admin/messages.html.erb
处理冲突、发布系统消息JS提醒！
|
2015-09-11 16:11:34 +08:00 |
|
ouyangxuhua
|
67dcb025aa
|
系统消息-修改
|
2015-09-11 16:05:02 +08:00 |
|
huang
|
3da6593720
|
查看别人的页面时不显示“全部设为已读”
|
2015-09-11 15:55:51 +08:00 |
|
huang
|
4d4b48ef99
|
Merge branch 'szzh' into dev_hjq
Conflicts:
db/schema.rb
|
2015-09-11 15:50:10 +08:00 |
|
huang
|
6209250e6d
|
内容长度提醒
|
2015-09-11 15:45:25 +08:00 |
|
huang
|
8c0f9d24f8
|
系统消息没保存成功添加验证
系统消息样式修改
|
2015-09-11 15:39:46 +08:00 |
|
sw
|
96405d7c0c
|
取消之后编程按钮无效
|
2015-09-11 15:38:58 +08:00 |
 Tim
|
a8cef78ccc
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2015-09-11 15:11:11 +08:00 |
|
Tim
|
ccd8bd1141
|
自动修改的内容
|
2015-09-11 15:09:45 +08:00 |
|
sw
|
4405a31c9c
|
Merge branch 'guange_homework' into szzh
|
2015-09-11 15:07:59 +08:00 |
 guange
|
e9f9dd44b9
|
编程作业的修改功能搞定
|
2015-09-11 14:59:30 +08:00 |
|
huang
|
64bce0261d
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-11 14:54:18 +08:00 |
|
huang
|
3bfdff81ba
|
去掉项目组织
|
2015-09-11 14:53:42 +08:00 |
|
lizanle
|
dc32bba5fd
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-09-11 14:44:59 +08:00 |
|
lizanle
|
17b4b31449
|
隐藏个人中心的回复 textarea编辑框
|
2015-09-11 14:44:50 +08:00 |
|
ouyangxuhua
|
22e2510482
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-11 14:43:14 +08:00 |
|
ouyangxuhua
|
3044b07df7
|
系统消息颜色
|
2015-09-11 14:43:04 +08:00 |
|
huang
|
c0437ae992
|
作业截止时间提醒界面！
|
2015-09-11 14:41:23 +08:00 |
|
sw
|
487f46bb32
|
上传图片后大小问题
|
2015-09-11 11:46:12 +08:00 |
|
guange
|
37e1b6d2a1
|
Merge remote-tracking branch 'origin/szzh' into guange_homework
|
2015-09-11 11:43:29 +08:00 |
|
cxt
|
7d6b9005a4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-11 11:41:45 +08:00 |
|
cxt
|
2da3454bc5
|
暂时屏蔽课程复制功能
|
2015-09-11 11:41:31 +08:00 |
|
cxt
|
1855adb037
|
未登录用户不能访问新建课程页面
|
2015-09-11 11:40:07 +08:00 |
|
sw
|
6004fe1b4d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-11 11:36:59 +08:00 |