 huang
|
4a7d3c9072
|
系统消息增加长度
|
2015-09-14 15:33:11 +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
|
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 |
|
huang
|
f1e0eed5a8
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-11 11:03:14 +08:00 |
|
sw
|
f4c19c0fb0
|
1、homework.js on改为live
2、导入作业之后，编程功能按钮消失
|
2015-09-11 10:50:16 +08:00 |
|
sw
|
527ff41d43
|
1、编程作业开启匿评之后提交作品的提示
2、匿评弹框不可关闭
|
2015-09-11 10:44:10 +08:00 |
|
sw
|
dfed4885de
|
新建作业，取消之后编程设置按钮消失
|
2015-09-11 10:36:16 +08:00 |
|
ouyangxuhua
|
36e9c20e59
|
系统消息
|
2015-09-11 10:30:01 +08:00 |
|
sw
|
30ebe9b2d5
|
1、编程作业可以开启匿评
2、取消扣分标准的显示
|
2015-09-11 09:59:34 +08:00 |
|
huang
|
08c222266a
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-09-11 09:54:10 +08:00 |
|
huang
|
4ea20b707c
|
定义消息标题类型方法
|
2015-09-11 09:53:18 +08:00 |
|
ouyangxuhua
|
9e61ceefa9
|
系统消息修改
|
2015-09-11 09:48:16 +08:00 |
|
sw
|
a94521f2e1
|
编辑普通作业功能完成
|
2015-09-11 09:36:44 +08:00 |
|
sw
|
948a6c9138
|
隐藏教师节相关信息
|
2015-09-11 09:20:43 +08:00 |
|
sw
|
6730c4da84
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-11 09:17:08 +08:00 |
|
sw
|
66636efda9
|
修改普通作业
|
2015-09-11 09:15:54 +08:00 |
|
lizanle
|
2beb85561a
|
上传资源后，全选按钮和已选择资源数清空
|
2015-09-11 09:08:05 +08:00 |
|
sw
|
f0bd113a5e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-10 17:11:38 +08:00 |
|
sw
|
93b179c958
|
修改普通作业
|
2015-09-10 17:11:16 +08:00 |
|
lizanle
|
80e38287dd
|
所有baselayout都引入prttefy.css .js
调整资源库宽度
|
2015-09-10 16:38:45 +08:00 |
|
ouyangxuhua
|
06fea1bf1d
|
系统消息显示
|
2015-09-10 15:47:51 +08:00 |
|
lizanle
|
cc6fe754d4
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-09-10 15:45:46 +08:00 |
|
lizanle
|
756aae0cf2
|
发布issue编辑器可以上传代码并高亮显示了
|
2015-09-10 15:45:08 +08:00 |
 cxt
|
e6d5d17859
|
轻抚展开更多->展开更多
|
2015-09-10 15:08:10 +08:00 |
|
cxt
|
5f0aac9265
|
点击打开编辑资料，显示保存的性别
|
2015-09-10 15:01:59 +08:00 |
|
sw
|
fce5405c41
|
发布作业界面样式调整
|
2015-09-10 14:44:25 +08:00 |
|
ouyangxuhua
|
fb155c8458
|
系统消息注释
|
2015-09-10 11:42:53 +08:00 |
|
ouyangxuhua
|
596c512d0a
|
系统消息
|
2015-09-10 11:39:53 +08:00 |
|
sw
|
97a944ff27
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-09-10 10:28:55 +08:00 |
|
sw
|
97f9d4fa60
|
增加教师节祝福语
|
2015-09-10 10:26:16 +08:00 |