Commit Graph

5842 Commits

Author SHA1 Message Date
sw b344bf3ea6 分页空间样式调整 2015-03-30 18:04:52 +08:00
sw a84af9d138 课程私有资源不显示在没有权限查看的用户上 2015-03-30 17:44:40 +08:00
sw 5954ced7a7 Merge branch 'develop' into szzh 2015-03-30 17:09:20 +08:00
sw 4817e2e1a7 新建课程取消后返回host_course 2015-03-30 17:04:36 +08:00
sw 94ecc3e59e 1、课程新增成员分页控件样式
2、课程老师列表翻页不可用
2015-03-30 17:03:20 +08:00
sw de0403580e 新增课程成员时增加默认选项 2015-03-30 16:03:24 +08:00
sw 5640eae39b 删除课程成员 2015-03-30 15:59:57 +08:00
sw ed02959e00 修改成员角色 2015-03-30 15:57:10 +08:00
sw 2af071a92e 课程添加成员后js提示 2015-03-30 14:55:41 +08:00
sw 083a3b9de6 1、课程成员列表显示昵称
2、添加课程成员功能
2015-03-30 13:47:19 +08:00
sw 98bf8dd494 课程成员列表显示 2015-03-30 11:20:16 +08:00
sw 046536230c 增加课程配置界面、成员的基本信息以及相关js 2015-03-30 10:47:23 +08:00
sw e7da022564 课程界面默认图片路径修改 2015-03-30 10:11:11 +08:00
sw ba518f0bd9 Merge branch 'szzh' into develop 2015-03-27 20:05:57 +08:00
sw cee08d9c58 修改加入课程弹出框样式 2015-03-27 20:05:00 +08:00
sw 72d683bdb7 加入课程与退出课程js刷新 2015-03-27 19:50:01 +08:00
sw 6cd56c339a Merge branch 'develop' into szzh 2015-03-27 19:03:56 +08:00
sw cc27fca8aa 加入当前分班按钮样式 2015-03-27 19:03:38 +08:00
sw 1315740e7b Merge branch 'szzh' into develop 2015-03-27 18:21:09 +08:00
guange f139427f03 Merge remote-tracking branch 'origin/szzh' into guange_dev
Conflicts:
	app/controllers/zipdown_controller.rb
	app/views/bids/_homework_list.html.erb
	config/routes.rb
	db/schema.rb
	public/javascripts/attachments.js
2015-03-27 18:17:46 +08:00
sw ef6526b4a7 Merge branch 'szzh' into develop 2015-03-27 17:45:56 +08:00
sw 21db854adb Merge branch 'develop' into szzh 2015-03-27 17:45:08 +08:00
sw fcc4275a36 Merge branch 'sw_new_course' into szzh 2015-03-27 17:44:29 +08:00
sw c0fc22ea72 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-27 17:44:14 +08:00
sw 20e80944a5 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-03-27 17:43:56 +08:00
sw 728f2896d8 windows下无法打断点 2015-03-27 17:43:19 +08:00
z9hang 9fcdaee0cc 课程讨论区回复后附件消失问题 2015-03-27 17:42:28 +08:00
whimlex cf4a8e08c5 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-27 17:00:42 +08:00
whimlex 54908423bc 课程--作业附件显示问题;问题跟踪附件显示问题 2015-03-27 17:00:23 +08:00
sw 10515adc5c 课程通知和讨论区回复样式不对 2015-03-27 17:00:21 +08:00
z9hang a89826f171 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-03-27 17:00:17 +08:00
z9hang 1c8b4c5bdd 去除导出ATOM 2015-03-27 16:59:52 +08:00
sw b55ef84c9c Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-03-27 16:55:37 +08:00
sw 7fa8ccad7c 课程通知和讨论区编辑、新建时宽度不对 2015-03-27 16:55:23 +08:00
z9hang a1e1e2dedf 课程讨论区,新建,编辑界面调整 2015-03-27 16:53:36 +08:00
sw dc4686d130 去掉跟踪功能 2015-03-27 16:45:47 +08:00
z9hang e10c747a5f 修改通知附件样式 2015-03-27 16:41:28 +08:00
huang 77241fd5ab Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-27 16:26:12 +08:00
huang 582c70a96c 修改项目讨论区未选择置顶/锁定选项时显示异常 2015-03-27 16:25:39 +08:00
sw 07de1f3de1 教师字体颜色不正确 2015-03-27 16:24:11 +08:00
z9hang 38b4967eb5 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-03-27 16:23:53 +08:00
z9hang 35e0f73345 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-03-27 16:23:19 +08:00
z9hang cc2cce22cf 讨论区附件样式修改 2015-03-27 16:23:09 +08:00
sw 61ddfc6363 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-03-27 16:13:20 +08:00
sw 6a9abf12b9 1、当问卷描述过长,显示超过页面
2、描述未对齐
2015-03-27 16:11:56 +08:00
sw 8374ba1995 配置课程是对齐单选框 2015-03-27 16:05:38 +08:00
z9hang acb01e452b Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-03-27 16:02:28 +08:00
z9hang 1c53731966 留言框样式调整 2015-03-27 16:02:06 +08:00
sw 1e3b28d4bd 修改上传图片样式 2015-03-27 15:57:47 +08:00
sw 9c8d402056 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-03-27 15:41:56 +08:00