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

963 Commits

Author SHA1 Message Date
suntao 1fff00bab0 回复模块改动 2015-09-02 17:41:19 +08:00
sw 45c54dabad 课程内创建作业代码还原 2015-09-02 17:04:01 +08:00
sw e360ea0bc7 回复框高度为50px 2015-09-02 16:34:03 +08:00
huang fcb9978a05 消息鼠标经过时显示html内容 2015-09-02 16:21:47 +08:00
sw c8eb7804df 增加发布时间和发送课程的js验证 2015-09-02 16:12:33 +08:00
sw 9df301b4cc 取消无用参数 2015-09-02 14:37:58 +08:00
sw 917442c0e7 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/users/_user_homework_list.html.erb
 2015-09-02 14:37:46 +08:00
sw 05739931f3 作业列表点击加载更多 2015-09-02 14:34:32 +08:00
cxt 9f494bc14a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-02 14:35:03 +08:00
cxt 70c2f7de1b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/users/_user_activities.html.erb
 2015-09-02 14:34:51 +08:00
huang a05a3074dd Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-02 14:34:10 +08:00
huang a94d5928d4 Merge branch 'szzh' into dev_hjq 2015-09-02 14:32:46 +08:00
cxt 63f52ea9bb Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-02 14:31:59 +08:00
cxt 3208574a5e 作业和首页的加载更多传递page参数 2015-09-02 14:31:46 +08:00
sw 594faabcbe Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-02 14:27:43 +08:00
suntao c2dbd9449e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/users/user_homeworks.html.erb
 2015-09-02 14:24:11 +08:00
huang fcdf9b3fc1 清理数据 2015-09-02 14:21:50 +08:00
sw 53c57668aa 点击显示更多按钮的显示与隐藏 2015-09-02 14:19:47 +08:00
huang 487881bb92 Merge branch 'szzh' into dev_hjq 
Conflicts:
	public/stylesheets/new_user.css
 2015-09-02 14:15:38 +08:00
suntao 9b8270aed1 Banner padding调整 2015-09-02 14:15:26 +08:00
sw 8acc432f91 项目讨论区回复刷新 2015-09-02 13:46:33 +08:00
sw c4da4b6c09 项目缺陷回复刷新 2015-09-02 11:54:52 +08:00
sw 2538797a52 课程论坛回复刷新 2015-09-02 11:51:49 +08:00
sw bbf4478fc0 课程通知回复后不能及时刷新页面 2015-09-02 11:45:52 +08:00
sw 3b153766f6 过滤之后点击展开更多相关BUG 2015-09-02 11:20:21 +08:00
sw 9728437953 作业界面样式 2015-09-02 11:02:41 +08:00
sw 6b1e0b1407 Merge branch 'guange_homework' into szzh 2015-09-02 10:42:36 +08:00
guange d5be41eebc merge 2015-09-02 10:41:59 +08:00
guange 45dd48069e submit不能提交的问题 2015-09-02 10:40:28 +08:00
guange ccc4d94212 修复合并出错问题 2015-09-02 10:27:10 +08:00
sw e42b6d65db 导入作业之后显示所有的作业信息 2015-09-02 10:25:22 +08:00
sw b0060fc03b 请选择发送的课程选择 2015-09-02 10:13:41 +08:00
ouyangxuhua 2fc337cb07 修改已读和未读消息样式 2015-09-02 09:25:34 +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 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
guange 8ad521d4ab merge 2015-09-01 16:19:48 +08:00
guange 41f9daed6d 编程作业放入到users controller 2015-09-01 16:18:03 +08:00
sw c01b71739a 增加加载更多按钮 2015-09-01 16:01:00 +08:00
cxt 756d703b5a 选择框默认显示文字类似于“请选择发布作业的课程”，点击即弹出供选择的课程列表，课程名称后还需要显示开课学期 2015-09-01 15:34:08 +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
suntao fe664b5e5c 回复模块调整 2015-09-01 09:42:03 +08:00
ouyangxuhua 86ced0e290 讨论区回帖消息应该在RE:后面显示回帖内容 2015-09-01 09:40:04 +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
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 90b8d25424 鼠标点入“请输入作业标题”后，才显示kindeditor及其下面的内容，及导入作业右侧的时间框，应该显示“提交截止日期”的tip 2015-08-31 17:35:47 +08:00
huang 90d93202cd Merge branch 'szzh' into dev_hjq 2015-08-31 16:44:00 +08:00
huang b5c0d03590 添加迁移 
代码优化
 2015-08-31 16:41:52 +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
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 ab173fb704 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-29 19:04:36 +08:00
sw c416a312cf 取消发布作业时间 2015-08-29 19:02:47 +08:00
cxt 96021bee73 项目讨论区的回复不显示用户名称 2015-08-29 18:59:39 +08:00
cxt 6c09e41a09 个人主页课程讨论区动态报错 2015-08-29 18:09:58 +08:00
sw bfd13bf98a 课程回复按钮样式 2015-08-29 17:54:56 +08:00
sw f81bab6319 课程回复 2015-08-29 17:19:03 +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
cxt a7f161804e 描述和回复超出边框 2015-08-29 16:59:13 +08:00
cxt 5ddefe21b8 个人主页3080账户动态异常bug 2015-08-29 16:39:37 +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
cxt 250d7a48dc 主页动态页面的刷新 2015-08-29 14:49:50 +08:00
cxt b30a07d651 个人主页动态 2015-08-29 14:27:16 +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
lizanle 92298160a7 搜索后的资源总数在搜索框右边展示 2015-08-29 11:58:44 +08:00
ouyangxuhua 1957100062 用户关注ajax刷新 2015-08-29 11:34:27 +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 00ab2bcbd4 作业名称过长超出边框 2015-08-29 11:09:19 +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
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
lizanle bc186776d8 资源移动弹出框减少留白 2015-08-29 09:56:34 +08:00
sw 51bf1cd678 作业搜索支持enter键 2015-08-29 09:53:16 +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
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
huang 331592d78a Merge branch 'szzh' into dev_hjq 2015-08-28 15:53:10 +08:00
huang 5384e7eee8 消息每种类型为空的时候给出提示 2015-08-28 15:51:42 +08:00
suntao 4392ecdcd7 消息格式更改 2015-08-28 15:41:50 +08:00
huang 9bc491227b Merge branch 'szzh' into dev_hjq 2015-08-28 14:49:55 +08:00
huang d9df8aae28 1。缺陷状态更新后，不同状态变更在消息列表中显示方式 
2、缺陷指派与缺陷发布者消息冲突问题
3、留言内容的过滤
 2015-08-28 14:38:46 +08:00
suntao 02120c778f 样式修改 2015-08-28 12:09:31 +08:00
suntao c0477fda99 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	public/stylesheets/new_user.css
 2015-08-28 11:58:33 +08:00
sw 462b0a82a0 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-28 11:56:52 +08:00
suntao b6d58b1b58 样式调整 2015-08-28 11:55:34 +08:00
sw 43d9697195 发布作业增加块的显示 2015-08-28 11:55:32 +08:00
sw 2fa03c3102 导入作业功能完成 2015-08-28 11:32:57 +08:00
lizanle 6dde8d1ea6 资源库弹出框位置优化 2015-08-28 11:06:02 +08:00
lizanle f9651d853c 资源每页显示的个数 2015-08-28 10:47:50 +08:00
sw 007a39b5d5 作业列表的过滤查询 2015-08-28 10:00:48 +08:00
lizanle d3f441d4da 可拖动的资源弹出框 2015-08-28 09:34:02 +08:00
sw c5ad5a3a5a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-27 17:35:04 +08:00
huang 1b9da8d963 消息添加分页功能 2015-08-27 16:57:32 +08:00
lizanle 149ac07cf9 去掉重复的css， 
解决之前在页面其他地方点击链接，导致链接背景色变白色的bug
 2015-08-27 16:20:47 +08:00
sw cb5abc6d74 导入作业弹框 2015-08-27 16:03:41 +08:00
sw cc76c13700 资源库样式 2015-08-27 15:07:48 +08:00
lizanle b7daa643c8 资源库空白处单击也要隐藏弹出框 2015-08-27 14:49:51 +08:00
lizanle a4e30d119d 删不掉资源的提示 2015-08-27 14:27:49 +08:00
lizanle 54c849cccb 发送资源的时候不选任何课程项目的时候不要弹出框发送成功 2015-08-27 11:02:20 +08:00
sw ed3be27687 消息界面样式 2015-08-26 18:07:31 +08:00
cxt a7ce1168db Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-08-26 17:58:59 +08:00
cxt caec5e5490 个人主页动态 2015-08-26 17:58:48 +08:00
sw 5b9c9312f5 留言界面样式修改 2015-08-26 17:42:02 +08:00
sw afeaecc478 作业列表增加标题 2015-08-26 17:37:53 +08:00
sw b7cbb9b0c2 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 
Conflicts:
	app/controllers/users_controller.rb
	public/stylesheets/new_user.css
 2015-08-26 17:31:37 +08:00
sw 049e27f15f 发布作业功能 2015-08-26 17:29:47 +08:00
cxt 7c3544dfec 个人主页动态 2015-08-26 17:21:58 +08:00
cxt 706415dc6e Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-08-26 17:03:15 +08:00
cxt 2124b3c392 个人主页动态缺陷修复 2015-08-26 17:02:54 +08:00
huang ef74d129c5 消息通知回复链接样式 2015-08-26 16:35:53 +08:00
huang b824c3fa46 1、去掉多余的代码 
2、消息样式列表过宽显示跨行问题
 2015-08-26 16:31:28 +08:00
huang 6a986b98d9 Merge branch 'sw_new_course' into dev_hjq 
Conflicts:
	app/controllers/users_controller.rb
 2015-08-26 16:14:50 +08:00
lizanle 5ec24913bb 留言背景色 留言头 2015-08-26 16:06:15 +08:00
lizanle f43e312fbb Merge remote-tracking branch 'origin/sw_new_course' into sw_new_course 2015-08-26 15:49:11 +08:00
lizanle a53b9f9049 留言模块 2015-08-26 15:49:05 +08:00
sw af2434809b Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-08-26 15:47:05 +08:00
huang 7340a664f2 链接颜色 2015-08-26 15:42:12 +08:00
cxt eed1939d2f Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-08-26 15:25:15 +08:00
cxt 048319ef8e 个人主页 2015-08-26 15:24:57 +08:00
sw 4fe3ba2442 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-08-26 15:23:41 +08:00
sw e2869faa08 日历选择器的样式调整 2015-08-26 15:17:56 +08:00
huang bc563119d6 Merge branch 'sw_new_course' into dev_hjq 
Conflicts:
	app/controllers/users_controller.rb
	public/stylesheets/new_user.css
 2015-08-26 15:04:44 +08:00
huang 1dce1a2a4c 老师更新作品评阅消息通知 
区分第一次评阅和后面的评阅
 2015-08-26 14:47:53 +08:00
lizanle d500ea0790 关注人数变化 2015-08-26 14:39:33 +08:00
sw 686af68026 关注、粉丝、编辑资料页面样式问题 2015-08-26 14:11:28 +08:00
sw f0a4d364b0 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-08-26 13:56:53 +08:00
sw ccfa93be66 老师布置作业界面 2015-08-26 13:56:37 +08:00
lizanle d735eee4a3 关注和取消关注 2015-08-26 11:41:32 +08:00
sw aa28b5ba6a Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-08-26 09:14:44 +08:00
huang 0007b720b3 修改描述 2015-08-26 09:01:02 +08:00
cxt cccc0577c7 个人动态 2015-08-26 08:51:39 +08:00
cxt fce523606c 个人主页 2015-08-25 20:08:52 +08:00
sw ab7fd7bc8f Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-08-25 20:06:37 +08:00
sw 18029fcb22 111 2015-08-25 20:06:25 +08:00
sw ad524f5a6c 取消课程、项目、贴吧等独自的搜索条，搜索统一使用导航栏搜索条 2015-08-25 19:41:22 +08:00
huang 627ca059ca 解决issue的更新 
和新建问题
 2015-08-25 19:30:22 +08:00
cxt e4c9f05c7b Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-08-25 19:24:37 +08:00
cxt bd00870eba 个人主页 2015-08-25 19:24:23 +08:00
sw d8b87ccc37 作业列表滚动到底部显示下面10条作业 2015-08-25 19:18:56 +08:00
ouyangxuhua 10e39a6967 发帖的消息内容显示的是帖子的主题 2015-08-25 17:42:39 +08:00
ouyangxuhua 0056fa9db3 修改了课程问卷的link_to以及对应的course_messages的viewed字段 2015-08-25 17:06:38 +08:00
sw e2af9e26f8 个人主页报错 2015-08-25 15:35:45 +08:00
ouyangxuhua 67c31d59d0 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-08-25 15:20:44 +08:00
ouyangxuhua 03ac1ca37c 消息人物头像链接 2015-08-25 15:20:24 +08:00
sw c8b1bb5d64 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-08-25 15:09:21 +08:00
cxt 4915f7977e 个人动态 2015-08-25 15:08:35 +08:00
huang 716ffcfdc9 修改留言多余内容 2015-08-25 14:35:26 +08:00
huang 3170fb2377 相关问题 2015-08-25 13:56:48 +08:00
huang 36c855cc65 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-08-25 13:52:41 +08:00
huang 90c199f15a 缺陷更新区别新建 2015-08-25 13:51:42 +08:00
sw c93bc5be40 作业列表效果显示 2015-08-25 13:50:42 +08:00
ouyangxuhua 49af0cdea7 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-08-25 13:05:06 +08:00
ouyangxuhua d7de5fc480 更改消息样式 2015-08-25 13:04:46 +08:00
huang 4c974266b8 没消息显示！ 2015-08-25 13:04:25 +08:00
huang b1ed9deba1 内容框对齐 2015-08-25 12:46:57 +08:00
huang 3ecdb2940b 去掉统计信息 2015-08-25 12:43:27 +08:00
huang 0da75afc88 消息排序（公共表） 2015-08-25 11:10:08 +08:00
sw 5b99effbc8 更新css，编辑个人简介功能BUG 2015-08-25 10:30:31 +08:00
cxt 9320cd18d3 个人动态的项目讨论动态 2015-08-25 09:50:36 +08:00
huang 5306d7e2a4 列表排序（未完） 2015-08-24 23:53:28 +08:00
sw 4bf92d0737 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-08-24 18:17:45 +08:00
sw 45d90639c9 静态页面的间距 2015-08-24 18:17:33 +08:00
sw 3ea198dc3d 标题栏作业界面静态页面的添加 2015-08-24 18:15:46 +08:00
cxt 2e5916cf5e Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 
Conflicts:
	app/controllers/admin_controller.rb
 2015-08-24 18:01:51 +08:00
huang d575ce5e5f 消息公共表 2015-08-24 17:51:19 +08:00
cxt 51c2f595d1 个人主页动态 2015-08-24 17:45:09 +08:00
huang f26ccac3b9 Merge branch 'sw_new_course' into dev_hjq 2015-08-24 15:46:29 +08:00
sw 5fcb97b990 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 
Conflicts:
	public/stylesheets/new_public.css
 2015-08-24 15:32:51 +08:00
huang 4d0abbc4d3 添加消息总数和未读控制 2015-08-24 15:03:45 +08:00
sw 7f2f2c5d40 个人主页，项目更多功能 2015-08-24 14:53:35 +08:00
lizanle 12b89e2c81 可拖动的框暂时做不了。 2015-08-24 14:53:30 +08:00
sw 2d75fea96b 课程点击更多按钮显示 2015-08-24 14:44:22 +08:00
huang 17b06963dd 添加未读样式 2015-08-24 14:29:38 +08:00
lizanle 9a2e9a4ad2 Merge remote-tracking branch 'origin/sw_new_course' into sw_new_course 2015-08-24 13:54:22 +08:00
lizanle 5628a43578 资源库和新版个人中心整合 2015-08-24 13:54:15 +08:00