jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
9,071 Commits 98 Branches 0 Tags 0 B
Commit Graph

7635 Commits

Author SHA1 Message Date
sw e42b6d65db 导入作业之后显示所有的作业信息 2015-09-02 10:25:22 +08:00
huang 0e4019be2f 修复时间乱的问题 2015-09-02 10:23:22 +08:00
sw b0060fc03b 请选择发送的课程选择 2015-09-02 10:13:41 +08:00
huang 469293bc1f Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-09-02 10:09:13 +08:00
huang d980513551 添加查看通知/新闻的消息状态更新 2015-09-02 10:08:37 +08:00
ouyangxuhua 2fc337cb07 修改已读和未读消息样式 2015-09-02 09:25:34 +08:00
suntao f036b322b9 忘记密码页面提示位置调整 2015-09-02 09:05:52 +08:00
suntao e3b0eae427 作业界面展开更多间距 2015-09-01 17:38:42 +08:00
huang e89fbd2c8e 过滤条件改为同种类型过滤 2015-09-01 17:37:43 +08:00
suntao a7ba6b5da2 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-01 17:32:00 +08:00
suntao 7276b5685e 表情框按钮间距调整 2015-09-01 17:31:44 +08:00
sw dd3fe5915e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
9e7323539f923b5387b9ec9239b5aeb, reversing
changes made to da9c374ed9.

Conflicts:
	app/views/users/_user_homework_form.html.erb
 2015-09-01 17:24:17 +08:00
cxt 77349fc111 点击新建课程/项目时显示提示信息 2015-09-01 17:24:35 +08:00
cxt 80b97c5692 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-01 17:09:01 +08:00
cxt 21cb59a7ae 点击发布作业的取消按钮时收起输入框 2015-09-01 17:08:52 +08:00
lizanle a8652cbe43 Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-01 17:04:33 +08:00
lizanle 262f013b51 发送资源到项目课程 名称要显示完全 2015-09-01 17:04:26 +08:00
cxt 7aef734113 点击发布作业的取消按钮时还原截止日期和课程列表下拉框的默认值 2015-09-01 16:59:54 +08:00
sw d0743e4dbf 缺陷显示界面描述增加html_safe 2015-09-01 16:48:56 +08:00
cxt de1708b8df 选择框默认显示文字类似于“请选择发布作业的课程”，点击即弹出供选择的课程列表，课程名称后还需要显示开课学期 2015-09-01 16:41:49 +08:00
cxt d845b8373a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-01 16:37:53 +08:00
cxt 21565b74fe 冲突 2015-09-01 16:37:43 +08:00
guange fcd7506181 修正一个样式 2015-09-01 16:33:29 +08:00
sw e4559dce78 作业列表样式调整，作业列表取消自动加载，增加加载更多按钮 2015-09-01 16:30:39 +08:00
suntao 59bbfeb0b5 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-01 16:25:22 +08:00
suntao 56644ca173 点击展开更多样式 2015-09-01 16:25:05 +08:00
cxt 735c374f73 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/users/_user_activities.html.erb
 2015-09-01 16:23:44 +08:00
sw 5b073c5289 Merge branch 'guange_homework' into szzh 2015-09-01 16:21:35 +08:00
sw da9c374ed9 111 2015-09-01 16:21:00 +08:00
guange 8ad521d4ab merge 2015-09-01 16:19:48 +08:00
guange 41f9daed6d 编程作业放入到users controller 2015-09-01 16:18:03 +08:00
huang 7361f40b0c 修改项目资源时间显示跳转错误页面问题 2015-09-01 16:12:37 +08:00
sw c01b71739a 增加加载更多按钮 2015-09-01 16:01:00 +08:00
cxt d4dfd97b97 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-01 15:45:49 +08:00
cxt d0c4bb9470 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/users/_user_homework_form.html.erb
 2015-09-01 15:45:36 +08:00
sw eff6d6cafe Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-01 15:39:20 +08:00
sw edb7173d83 加入课程、新建课程、新建项目按钮样式 2015-09-01 15:39:02 +08:00
lizanle 4a1b2fbbd6 Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-01 15:34:31 +08:00
lizanle b2eb846a23 关于我们 
隐藏招聘信息
联系我们改为服务协议
 2015-09-01 15:34:22 +08:00
cxt 756d703b5a 选择框默认显示文字类似于“请选择发布作业的课程”，点击即弹出供选择的课程列表，课程名称后还需要显示开课学期 2015-09-01 15:34:08 +08:00
sw c09478c73f 作业列表界面和动态列表界面显示不一致 2015-09-01 15:32:56 +08:00
sw 5f42ce4c80 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/users/_course_message.html.erb
	app/views/users/_course_news.html.erb
	app/views/users/_project_issue.html.erb
	app/views/users/_project_message.html.erb
 2015-09-01 15:28:03 +08:00
huang 8b9ee2260a Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-09-01 15:24:51 +08:00
sw 0994ae9f07 项目讨论区回复功能 2015-09-01 15:24:37 +08:00
huang fede611fea 鼠标经过显示内容效果 
公共贴吧数据迁移
 2015-09-01 15:23:30 +08:00
sw 00a8dc94c3 缺陷的回复功能 2015-09-01 15:17:40 +08:00
lizanle a5e39a1049 Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-01 15:03:36 +08:00
lizanle 7223e6c91c 引用发送资源时刷新资源列表和统计 2015-09-01 15:03:24 +08:00
suntao acb46d520c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/users/_user_homework_form.html.erb
 2015-09-01 14:40:24 +08:00
cxt a008d9d834 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-01 14:37:59 +08:00
cxt 8a286bb8a8 去掉截止日期的标签 2015-09-01 14:37:46 +08:00
suntao ae3f56c758 提交作业界面对齐 2015-09-01 14:37:34 +08:00
sw b1de662338 讨论区回复功能，修改引用样式 2015-09-01 14:18:44 +08:00
lizanle a78128f5ac 搜不到资源的时候 改为没有数据可以展示 2015-09-01 14:11:04 +08:00
lizanle 798326d6ef Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-01 11:29:53 +08:00
lizanle b3e3737fb5 发布作业时从资源库选择资源功能 2015-09-01 11:29:43 +08:00
sw 62360175d1 课程通知回复时，所有回复框都会提交 2015-09-01 11:25:52 +08:00
cxt b89a80d04e 截止日期 2015-09-01 11:12:47 +08:00
sw 84ff3450d2 在动态中回复通知动态 2015-09-01 10:43:30 +08:00
cxt dd6e3e5f82 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-01 10:20:23 +08:00
cxt 1e320e63c6 底部导航的论坛反馈改为贴吧交流，帮助中心版权信息的换行修复 2015-09-01 10:20:12 +08:00
suntao a277322873 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-01 09:42:27 +08:00
suntao fe664b5e5c 回复模块调整 2015-09-01 09:42:03 +08:00
ouyangxuhua 86ced0e290 讨论区回帖消息应该在RE:后面显示回帖内容 2015-09-01 09:40:04 +08:00
cxt fdfcefd1ed 鼠标移到个人主页的课程列表时，显示tip：课程名，课程学期 2015-09-01 09:34:03 +08:00
cxt e128a0e033 当鼠标移到新建课程/项目的图标按钮上时，给出相应的tip 2015-09-01 09:22:44 +08:00
ouyangxuhua 284d33b096 讨论区回帖消息显示回帖内容 2015-09-01 09:18:30 +08:00
sw 147afc09a5 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-01 09:17:31 +08:00
cxt 5472f2d45f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-01 09:17:17 +08:00
sw b3919256fa 111 2015-09-01 09:17:12 +08:00
suntao 1d1d2f738d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-31 17:51:08 +08:00
suntao acf5db7067 placeholder显示等 2015-08-31 17:50:50 +08:00
cxt ac419cef87 去掉课程/项目搜索列表的搜索框 2015-08-31 17:49:18 +08:00
cxt 90b8d25424 鼠标点入“请输入作业标题”后，才显示kindeditor及其下面的内容，及导入作业右侧的时间框，应该显示“提交截止日期”的tip 2015-08-31 17:35:47 +08:00
cxt 1113a7938c 修复点击空白处返回新建课程/项目的页面 2015-08-31 16:53:41 +08:00
huang 90d93202cd Merge branch 'szzh' into dev_hjq 2015-08-31 16:44:00 +08:00
huang dbc0688213 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-08-31 16:42:40 +08:00
huang b5c0d03590 添加迁移 
代码优化
 2015-08-31 16:41:52 +08:00
ouyangxuhua 4581f9439a Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-08-31 16:02:50 +08:00
ouyangxuhua 5ee53b824d 项目中上传资源添加至动态中 2015-08-31 16:01:31 +08:00
cxt 4ab91984f2 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-31 15:33:39 +08:00
cxt fa57a6c889 主页动态的样式修改 2015-08-31 15:33:20 +08:00
suntao ac353841b0 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-31 15:21:28 +08:00
suntao d3869b03cd 资源库版面样式调整 2015-08-31 15:21:09 +08:00
cxt 7d6f952737 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-31 15:12:55 +08:00
cxt 118b731dc4 点击动态链接进入相关列表 2015-08-31 15:12:46 +08:00
suntao 3e9bb8a596 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/layouts/new_base_user.html.erb
 2015-08-31 14:55:15 +08:00
suntao b0ff7f0ee2 页面间距调整，头像大小调整 2015-08-31 14:52:56 +08:00
cxt 23c1ac5a4a 项目问题的动态内容显示超出边框 2015-08-31 14:28:43 +08:00
cxt 8345a9d94e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-31 14:13:33 +08:00
cxt fedc125731 附件名称在可用的范围内尽可能显示全 2015-08-31 14:13:17 +08:00
lizanle 5b40628a5b Merge remote-tracking branch 'origin/szzh' into szzh 2015-08-31 11:59:42 +08:00
lizanle e9b501058b 上传以后资源数改变 2015-08-31 11:59:33 +08:00
lizanle 9ca1234324 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-31 10:23:12 +08:00
guange a142103091 Merge remote-tracking branch 'origin/develop' into guange_homework 2015-08-31 09:33:20 +08:00
huang f6baf03470 Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 2015-08-30 11:25:31 +08:00
huang 3807c4ea2a Merge branch 'szzh' into dev_hjq 2015-08-30 11:21:58 +08:00
huang e652e92217 新增消息迁移 2015-08-30 11:20:37 +08:00
sw 7a4d562773 课程主页，项目主页 500 2015-08-29 19:15:06 +08:00
sw ab173fb704 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-29 19:04:36 +08:00
sw 8be7509b33 课程、竞赛主页跳转到个人主页 2015-08-29 19:03:36 +08:00
sw c416a312cf 取消发布作业时间 2015-08-29 19:02:47 +08:00
cxt 96021bee73 项目讨论区的回复不显示用户名称 2015-08-29 18:59:39 +08:00
sw 09a994f76a 职称增加副教授等职称 2015-08-29 18:54:34 +08:00
sw ca0c7a4fb0 个人主页职称 2015-08-29 18:51:35 +08:00
guange 8f426ca040 merge 2015-08-29 18:22:33 +08:00
guange 85ee2b86cd . 2015-08-29 18:21:01 +08:00
cxt 6c09e41a09 个人主页课程讨论区动态报错 2015-08-29 18:09:58 +08:00
sw bfd13bf98a 课程回复按钮样式 2015-08-29 17:54:56 +08:00
sw faea706683 Revert "Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh" 
This reverts commit 3776689661, reversing
changes made to d48cc8073a.
 2015-08-29 17:50:15 +08:00
sw f81bab6319 课程回复 2015-08-29 17:19:03 +08:00
sw 655054a8ad Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-29 17:10:56 +08:00
huang 43170c696c 迁移总表时间 2015-08-29 17:09:44 +08:00
suntao ecd355df0d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/users/_course_poll.html.erb
 2015-08-29 17:08:01 +08:00
suntao fc47b793ee 动态块间距调整 2015-08-29 17:06:21 +08:00
lizanle ac60fdf0b6 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-29 17:05:13 +08:00
sw 1e9f5cebd2 首页查询问题 2015-08-29 17:04:44 +08:00
lizanle de5dd08b55 登录之后跳到个人主页 2015-08-29 17:03:31 +08:00
cxt cb88e406d1 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-29 16:59:29 +08:00
cxt a7f161804e 描述和回复超出边框 2015-08-29 16:59:13 +08:00
sw 9437188c9b 登录界面enter键监听 2015-08-29 16:55:49 +08:00
suntao 3776689661 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-29 16:52:44 +08:00
suntao efe5c1e3f4 课程宽度调整 2015-08-29 16:52:10 +08:00
cxt d48cc8073a Merge remote-tracking branch 'origin/szzh' into szzh 2015-08-29 16:40:00 +08:00
cxt 5ddefe21b8 个人主页3080账户动态异常bug 2015-08-29 16:39:37 +08:00
sw 6d768100f8 输入为空不提交表单 2015-08-29 16:14:02 +08:00
huang 2a17cfc741 Merge branch 'szzh' into dev_hjq 2015-08-29 16:09:30 +08:00
huang 353e2f5d18 添加课程消息迁移 2015-08-29 16:08:09 +08:00
sw 63c7ea8d4e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-29 15:42:11 +08:00
sw 98d533e8f9 1、整理迁移文件 
2、个人动态添加与更新判断不正确
 2015-08-29 15:34:18 +08:00
lizanle 244d5165e2 登录之后跳到个人主页 2015-08-29 15:25:58 +08:00
lizanle 2962408c06 Merge remote-tracking branch 'origin/szzh' into szzh 2015-08-29 15:08:00 +08:00
lizanle 3a21c4e2fa 登录之后跳到个人主页 2015-08-29 15:07:47 +08:00
cxt 250d7a48dc 主页动态页面的刷新 2015-08-29 14:49:50 +08:00
sw 6cb21d3430 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-29 14:49:01 +08:00
sw 73ffbb7dfb Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-29 14:46:44 +08:00
sw c0daebd75c 上传图片js 2015-08-29 14:46:30 +08:00
sw b65243ba62 添加关注、取消关注js刷新 2015-08-29 14:37:53 +08:00
sw a2ec65a0c9 添加关注与取消关注 2015-08-29 14:34:59 +08:00
cxt b30a07d651 个人主页动态 2015-08-29 14:27:16 +08:00
sw 498775b0a8 登录界面多了一个< 
教授职称
 2015-08-29 14:24:54 +08:00
suntao a22727efb2 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-29 14:08:58 +08:00
suntao 5e25b64004 提交按钮对齐 2015-08-29 14:08:38 +08:00
lizanle acbf58837a Merge remote-tracking branch 'origin/szzh' into szzh 2015-08-29 12:32:08 +08:00
lizanle ad8bd379a1 用户资源过滤 2015-08-29 12:32:00 +08:00
sw 4ade77f3d0 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-29 12:04:57 +08:00
huang 4e1766d578 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-29 12:07:31 +08:00
huang 5f4b879fb7 修改消息过滤条件 2015-08-29 12:06:57 +08:00
sw e455f93ee1 上传图片；浏览图片按钮 2015-08-29 12:04:35 +08:00
guange 18bfe1fc73 jquery升到1.11 2015-08-29 11:59:52 +08:00
lizanle ca2b20bd99 Merge remote-tracking branch 'origin/szzh' into szzh 2015-08-29 11:58:52 +08:00
lizanle 92298160a7 搜索后的资源总数在搜索框右边展示 2015-08-29 11:58:44 +08:00
huang 8e70bc22e0 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-08-29 11:50:49 +08:00
huang f438d300dd 消息数据迁移（未完） 2015-08-29 11:50:08 +08:00
suntao 1351742919 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-29 11:41:29 +08:00
suntao 977f81e031 关注和取消关注，导航圆角 2015-08-29 11:41:12 +08:00
lizanle 577376a037 Merge remote-tracking branch 'origin/szzh' into szzh 2015-08-29 11:36:01 +08:00
lizanle 2b7beaeae8 上次登录的地址用户id变为当前用户id 2015-08-29 11:35:33 +08:00
ouyangxuhua 1957100062 用户关注ajax刷新 2015-08-29 11:34:27 +08:00
sw f01b5681a5 增加项目、课程的收起 2015-08-29 11:33:58 +08:00
ouyangxuhua f99097f3d3 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-29 11:29:27 +08:00
ouyangxuhua a111b9a3fd 用户关注ajax刷新 2015-08-29 11:29:05 +08:00
sw e5bf355a17 导航栏搜索支持enter键 2015-08-29 11:28:02 +08:00
suntao 5f3532ac14 头像部分修改 2015-08-29 11:25:49 +08:00
sw 7263598851 访问问卷报500 2015-08-29 11:17:46 +08:00
sw 86e9ec068f 新建作业时，作业截止时间为空 2015-08-29 11:12:18 +08:00
sw 00ab2bcbd4 作业名称过长超出边框 2015-08-29 11:09:19 +08:00
lizanle 5e485e5175 Merge remote-tracking branch 'origin/szzh' into szzh 2015-08-29 10:37:02 +08:00
lizanle 878f48079d 全选框在翻页后也应该重置为不选 2015-08-29 10:36:55 +08:00
lizanle eef96701dd Merge remote-tracking branch 'origin/szzh' into szzh 2015-08-29 10:33:16 +08:00
lizanle 60b429b13d 发送成功不给提示 
课程资源过少的时候不给滚动条
 2015-08-29 10:33:04 +08:00
sw 2d00eb982c 取消跳转到个人主页 2015-08-29 10:31:53 +08:00
suntao 9d638b705a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-29 10:27:40 +08:00
suntao 2342d1c23a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	public/stylesheets/new_user.css
 2015-08-29 10:27:22 +08:00
cxt bcec8eb35e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-29 10:16:15 +08:00
cxt c650c83f82 个人主页报500、动态显示错位的bug修复 2015-08-29 10:16:04 +08:00
suntao ada04e5e63 个人主页头像模块改动 2015-08-29 10:13:32 +08:00
huang 6287f9b39e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-29 09:56:39 +08:00
lizanle bc186776d8 资源移动弹出框减少留白 2015-08-29 09:56:34 +08:00
sw 51bf1cd678 作业搜索支持enter键 2015-08-29 09:53:16 +08:00
huang 6406d5a284 解决邮件内容空的问题 2015-08-29 09:43:44 +08:00
lizanle 53b150486d Merge remote-tracking branch 'origin/szzh' into szzh 2015-08-29 09:33:33 +08:00
lizanle 789b62940b 资源名称过长会覆盖的问题 
搜索按钮 手在上边的时候呈手型
筛选资源后  自选资源清零的问题
 2015-08-29 09:33:22 +08:00
huang c1851a74c5 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-29 09:20:51 +08:00
huang 170cdad3e3 解决消息过滤404问题 2015-08-29 09:20:04 +08:00
cxt 69178f1522 个人主页 2015-08-28 17:46:21 +08:00
cxt 27b8d85cc5 个人主页 2015-08-28 17:36:57 +08:00
sw 7ec10d7b39 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-28 17:28:31 +08:00
sw 3f61a908d1 部分界面样式调整 2015-08-28 17:27:51 +08:00
cxt 36860e8c4f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-28 17:26:11 +08:00
cxt e448d2c05f 个人主页 2015-08-28 17:25:42 +08:00
guange e8fe397158 added 2015-08-28 17:20:39 +08:00
sw aa06c3ac03 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-28 17:14:47 +08:00
sw 49972ca476 样式调整，取消资源库选择资源 2015-08-28 17:11:34 +08:00
huang 3a25f44d83 Merge branch 'dev_hjq' into szzh 2015-08-28 17:07:48 +08:00
huang e193cb0f2d 消息列表界面新样式 2015-08-28 17:05:27 +08:00
sw 014881bd42 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	public/stylesheets/new_user.css
 2015-08-28 17:02:49 +08:00
sw 148a4e2479 发布作业样式 2015-08-28 16:59:40 +08:00
sw bbb8e5a062 老师发布作业取消功能 2015-08-28 16:56:09 +08:00
sw 76ec0d5d48 资源库导入资源到作业静态页面 2015-08-28 16:47:43 +08:00