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

7763 Commits

Author SHA1 Message Date
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
sw 02f7538200 个人描述为英文时不换行 2015-08-28 16:10:05 +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
guange 1d8fdbf8f1 可以提交答案 2015-08-28 15:08:07 +08:00
suntao e12bef1126 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-28 14:51:16 +08:00
suntao a19692a0c6 个人主页左侧修改 2015-08-28 14:50:48 +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
guange 1462ea09f3 测试代码功能完成 2015-08-28 12:04:49 +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
huang 9709692a08 修改消息每页的显示个数 2015-08-28 09:55:23 +08:00
lizanle d3f441d4da 可拖动的资源弹出框 2015-08-28 09:34:02 +08:00
guange 5fb2989427 Merge remote-tracking branch 'origin/szzh' into homework 2015-08-27 21:00:29 +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
lizanle 7916ca2ee3 密码重置 2015-08-27 15:15:06 +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 d99c1dd72a 重置密码的base错了。 2015-08-27 14:11:56 +08:00
lizanle cff93331b2 更改登录首页的标点符号 2015-08-27 11:06:04 +08:00
lizanle 54c849cccb 发送资源的时候不选任何课程项目的时候不要弹出框发送成功 2015-08-27 11:02:20 +08:00
huang a7eff50c61 消息留言发送：回复东家，回复人和东家只能一人收到消息 2015-08-27 10:32:45 +08:00
lizanle 0a898342d9 登录按钮可以用enter键 2015-08-27 10:01:13 +08:00
sw 8cd6c7d2a0 Merge branch 'guange_dev' into szzh 2015-08-27 09:47:41 +08:00
lizanle 41a8f9d6a2 底部去掉marginBottom:10px 
登录界面加底部
 2015-08-27 09:28:13 +08:00
guange 3ae4d01284 . 2015-08-26 22:11:59 +08:00
guange b9e08b22cd Merge remote-tracking branch 'origin/szzh' into guange_dev 2015-08-26 20:37:49 +08:00
guange 631283ae79 remove grack 2015-08-26 20:37:43 +08:00
sw ed3be27687 消息界面样式 2015-08-26 18:07:31 +08:00
sw 19dc9de60f Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-08-26 17:58:04 +08:00
cxt d1577028be Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-08-26 18:00:46 +08:00
lizanle 5f23244742 忘记密码 2015-08-26 17:59:05 +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 db70425d99 Merge branch 'szzh' into sw_new_course 2015-08-26 17:57:54 +08:00
sw 347298124e Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-08-26 17:55:40 +08:00
sw e4a36b9be2 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-08-26 17:55:07 +08:00
sw 01c8ee3898 1、个人主页新建课程、新建项目、加入课程功能添加 
2、新建课程时导航栏的修改
 2015-08-26 17:54:41 +08:00
lizanle 82b86ea14f Merge remote-tracking branch 'origin/sw_new_course' into sw_new_course 2015-08-26 17:52:32 +08:00
lizanle 733876743e 服务协议 忘记密码 2015-08-26 17:52:23 +08:00
sw dafc128f34 增加部分默认参数的设置 2015-08-26 17:44:03 +08:00
sw 650d0c8cb5 匿评分配数量默认为3 2015-08-26 17:42:52 +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 85b90f9958 消息代码清理 2015-08-26 16:56:41 +08:00
lizanle 9e9de44397 服务协议 2015-08-26 16:51:03 +08:00
lizanle ba9a64360e Merge remote-tracking branch 'origin/sw_new_course' into sw_new_course 2015-08-26 16:50:36 +08:00
lizanle 65b5b467d4 服务协议 2015-08-26 16:50:26 +08:00
huang ef74d129c5 消息通知回复链接样式 2015-08-26 16:35:53 +08:00
huang a54de0c8fb Merge branch 'dev_hjq' into sw_new_course 2015-08-26 16:33:21 +08:00
lizanle ccfd69602c 服务协议 2015-08-26 16:31:28 +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 a08d32d0f3 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-08-26 15:18:05 +08:00
sw e2869faa08 日历选择器的样式调整 2015-08-26 15:17:56 +08:00
lizanle 24892c9645 Merge remote-tracking branch 'origin/sw_new_course' into sw_new_course 2015-08-26 15:08:08 +08:00
lizanle 7f19295b88 服务协议 2015-08-26 15:07:59 +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
sw 47b20a7633 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-08-26 14:50:33 +08:00
sw 8247a29b85 只有admin用户可以修改个人简介 2015-08-26 14:50:01 +08:00
huang 1dce1a2a4c 老师更新作品评阅消息通知 
区分第一次评阅和后面的评阅
 2015-08-26 14:47:53 +08:00
lizanle d500ea0790 关注人数变化 2015-08-26 14:39:33 +08:00
lizanle da47f5bb00 登录报错后就无法登录bug 2015-08-26 14:23:25 +08:00
sw 7081fc9975 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-08-26 14:11:47 +08:00
lizanle cb61816d9a 登录字样写错了 2015-08-26 14:12:18 +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 757da1ec0a 调整编辑资料样式 2015-08-26 09:36:05 +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
lizanle 4ee571e586 Merge remote-tracking branch 'origin/sw_new_course' into sw_new_course 2015-08-26 09:11:10 +08:00
lizanle cf12ee877e 编辑资料的时候个人说明隐藏 2015-08-26 09:11:03 +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 56a1283033 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-08-25 19:19:41 +08:00
sw d8b87ccc37 作业列表滚动到底部显示下面10条作业 2015-08-25 19:18:56 +08:00
lizanle 5c43c902c4 编辑资料css 2015-08-25 19:07:59 +08:00
lizanle 70e9d75cc6 登陆后的搜索 2015-08-25 18:59:45 +08:00
sw bedc364275 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 
Conflicts:
	app/views/layouts/_unlogin_header.html.erb
 2015-08-25 18:26:25 +08:00
lizanle d2135f7204 Merge remote-tracking branch 'origin/sw_new_course' into sw_new_course 2015-08-25 18:27:00 +08:00
lizanle 0be3ef0a65 搜索 2015-08-25 18:26:54 +08:00
sw 767fc67686 已过期课程显示为darkgrey 2015-08-25 18:22:46 +08:00
sw 6ea185f250 修改资料页面跳转以及搜索弹出框样式 2015-08-25 18:17:31 +08:00
sw ffe40b399d 个人动态表重构 2015-08-25 17:54:29 +08:00
ouyangxuhua 10e39a6967 发帖的消息内容显示的是帖子的主题 2015-08-25 17:42:39 +08:00
ouyangxuhua 24f26749c0 修改memo对应的memo_messages的viewed字段 2015-08-25 17:41:59 +08:00
sw 30147c29ee 帮助中心页面跳转 2015-08-25 17:30:55 +08:00
sw a32d6697ce 点击确实图标，跳转到登录界面 2015-08-25 17:27:28 +08:00
ouyangxuhua 0056fa9db3 修改了课程问卷的link_to以及对应的course_messages的viewed字段 2015-08-25 17:06:38 +08:00
ouyangxuhua f56d9ed265 设置作业对应的forge_messages表的viewed字段 2015-08-25 16:42:29 +08:00
lizanle c360bdaf7d logout 2015-08-25 16:39:22 +08:00
lizanle 79bd438c87 Merge remote-tracking branch 'origin/sw_new_course' into sw_new_course 2015-08-25 16:08:57 +08:00
lizanle f2e406a416 登陆注册按钮改为页面跳转 2015-08-25 16:08:52 +08:00
sw 0d9a397453 登录、未登录搜索条件选择js 
用户主页 show方法改造
 2015-08-25 16:01:31 +08:00
huang c6b460f520 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-08-25 15:37:29 +08:00
huang 9096fca298 留言消息发送策略 2015-08-25 15:37:08 +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
sw 87ee2e744f 公共贴吧、课程、项目相关界面导航栏和底部导航栏修改 2015-08-25 15:09:02 +08:00
cxt 097d52c07a Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-08-25 15:09:02 +08:00
cxt 4915f7977e 个人动态 2015-08-25 15:08:35 +08:00
lizanle 725143b894 登陆界面 错误信息提示 2015-08-25 14:51:07 +08:00
huang 716ffcfdc9 修改留言多余内容 2015-08-25 14:35:26 +08:00
lizanle 8917a67c7c Merge remote-tracking branch 'origin/sw_new_course' into sw_new_course 2015-08-25 14:24:29 +08:00
lizanle d25971f546 登陆界面 2015-08-25 14:24:20 +08:00
sw bcd12e7e48 课程、项目相关页面 顶部导航栏和底部导航栏修改 2015-08-25 14:09:37 +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 a83fc1c8d8 0 2015-08-25 13:52:20 +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 64e54cda75 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-08-25 12:43:47 +08:00
huang 3ecdb2940b 去掉统计信息 2015-08-25 12:43:27 +08:00
ouyangxuhua 32e67a3cb1 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-08-25 11:17:57 +08:00
ouyangxuhua 12c3f5a723 消息讨论区viewed字段更新 2015-08-25 11:17:37 +08:00
huang bff139b9a7 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-08-25 11:10:32 +08:00
huang 0da75afc88 消息排序（公共表） 2015-08-25 11:10:08 +08:00
sw 5b99effbc8 更新css，编辑个人简介功能BUG 2015-08-25 10:30:31 +08:00
ouyangxuhua 354cb52339 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-08-25 10:20:39 +08:00
ouyangxuhua d83ed09617 更新viewed字段 2015-08-25 10:19:47 +08:00
sw 67c4561b28 我的课程、我的项目图标 2015-08-25 10:04:27 +08:00
cxt 9320cd18d3 个人动态的项目讨论动态 2015-08-25 09:50:36 +08:00
sw d132c08a11 增加footer 2015-08-25 09:29:19 +08:00
huang 5306d7e2a4 列表排序（未完） 2015-08-24 23:53:28 +08:00
huang 7961e3db6f 建立公共表 2015-08-24 22:47:48 +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 4af3c9816c Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 
Conflicts:
	db/schema.rb
 2015-08-24 17:53:55 +08:00
huang d575ce5e5f 消息公共表 2015-08-24 17:51:19 +08:00
ouyangxuhua b7a473a1b2 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-08-24 17:46:11 +08:00
cxt 51c2f595d1 个人主页动态 2015-08-24 17:45:09 +08:00
ouyangxuhua f0483b6de8 更新新闻viewed 2015-08-24 17:45:00 +08:00
ouyangxuhua bf596d7b4b 更新新闻viewed字段 2015-08-24 17:44:13 +08:00
sw 26c5592d29 用户课程或项目名称过长时的显示 2015-08-24 17:04:40 +08:00
lizanle 5bf7aeb430 资源库css小改动 2015-08-24 16:35:10 +08:00
lizanle 39b022f696 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 16:25:09 +08:00
lizanle 86d2f5342c 登陆界面 2015-08-24 16:22:22 +08:00
lizanle 614743d8d4 登陆界面 2015-08-24 16:22:06 +08:00
sw a9c7c252e5 搜索功能js以及类型的选择 2015-08-24 16:16:07 +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
sw dabef542fe 更新css文件，并实现未登陆用户时静态页面显示 2015-08-24 15:30:11 +08:00
sw fe91442c96 课程列表已关闭课程标识出来 2015-08-24 15:18:07 +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
huang 3919f15806 调整消息提示样式及连接 2015-08-24 14:52:23 +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
huang fe8924443c html_safe显示 2015-08-24 12:46:48 +08:00
huang 3858e87482 user留言类型 2015-08-24 11:43:43 +08:00
sw 36152d19e8 个人show界面下面有一块空白界面 2015-08-24 11:42:26 +08:00
sw 0287a0f3b4 个人积分弹出框 2015-08-24 11:40:09 +08:00
huang aadfd16e6a Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-08-24 11:39:03 +08:00
huang 4fd90464d9 Merge branch 'sw_new_course' into dev_hjq 2015-08-24 11:38:50 +08:00
huang 98b6c090c6 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-08-24 11:38:06 +08:00
huang 374c596a50 添加新图标，新base 2015-08-24 11:37:50 +08:00
sw 15c44297cc 用户base关联user_base.js 2015-08-24 11:32:14 +08:00
ouyangxuhua b2ac4e8e1f 项目消息问题 2015-08-24 11:27:36 +08:00
huang 1e6db593d6 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-08-24 11:19:41 +08:00
huang 9f664d8172 修改表情无法显示问题 2015-08-24 11:19:20 +08:00
ouyangxuhua 657f5f9acf Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-08-24 11:15:50 +08:00
ouyangxuhua ab37372dad 增加消息用户链接 2015-08-24 11:13:41 +08:00
huang e129404b4c 解决图标点两次的问题 2015-08-24 11:11:45 +08:00
sw f6d122e37f Merge branch 'guange_dev' into sw_new_course 2015-08-24 11:04:19 +08:00
sw 08ab08d064 Merge branch 'develop' into sw_new_course 2015-08-24 11:03:18 +08:00
sw 111478ec72 Merge branch 'szzh' into sw_new_course 
Conflicts:
	app/controllers/users_controller.rb
	config/routes.rb
 2015-08-24 10:39:52 +08:00
huang ff3816e97d 添加链接，修复留言无法显示问题 2015-08-24 10:38:41 +08:00
lizanle 67c5a8e9c5 分页改为了15条 2015-08-24 10:31:25 +08:00
huang b9980d4ab1 消息没显示问题！ 2015-08-24 10:30:27 +08:00
lizanle 830815d3fd 课程资源搜索bug 2015-08-21 21:29:33 +08:00
guange 3a601bbd2c Merge remote-tracking branch 'origin/szzh' into guange_dev 2015-08-21 19:23:17 +08:00
huang 17aae7c79d 解决CSS冲突 2015-08-21 17:40:28 +08:00
sw cc4661a9b8 Merge branch 'szzh' into develop 2015-08-21 17:38:21 +08:00
cxt 011184b537 个人主页 2015-08-21 17:26:52 +08:00
lizanle f763fcf144 Merge remote-tracking branch 'origin/szzh' into szzh 2015-08-21 17:13:52 +08:00
lizanle 53c28a9b39 新成员注册的时候报错 2015-08-21 17:13:42 +08:00
sw c3bd085068 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-21 17:09:00 +08:00
lizanle 033aea28c5 新成员注册的时候报错 2015-08-21 17:05:54 +08:00
sw 0489b02e54 课程留言无法删除 2015-08-21 17:00:17 +08:00
lizanle 2589179fca 管理员登陆报错 2015-08-21 16:57:44 +08:00
lizanle f6b01b300d 资源库 全部里能看到课程资源，但是分类里边却没有。 2015-08-21 16:36:42 +08:00
huang 4e4df99bb1 处理冲突 2015-08-21 16:34:57 +08:00
sw 2a522f144e 编辑个人简介 2015-08-21 16:29:25 +08:00
lizanle 1aa61acd79 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	public/stylesheets/public.css
 2015-08-21 16:16:18 +08:00
cxt e1fb2a6bab 个人主页动态 2015-08-21 16:07:18 +08:00
lizanle 051c921108 资源库 多选发送给出提示 2015-08-21 15:58:32 +08:00
huang 604fe40f84 poll after create 2015-08-21 15:55:17 +08:00
sw d942cc3123 性别的判断 2015-08-21 15:40:38 +08:00
huang 5594295c9e 添加问题更新策略 
显示更新内容
 2015-08-21 15:27:01 +08:00
sw 8ef6225084 个人主页，添加、取消关注及相关效果 2015-08-21 15:23:03 +08:00
sw 73854cc35c 右侧静态页面如果没有内容时增加默认最小高度 2015-08-21 14:25:01 +08:00
sw 2db6696fd4 个人动态的级联新增和级联删除 2015-08-21 14:21:10 +08:00
lizanle 9138f46301 Merge branch 'szzh' into dev_zanle 
Conflicts:
	app/controllers/users_controller.rb
 2015-08-21 14:10:50 +08:00
huang a53e66d4b0 消息中同事显示 评论和 打分 2015-08-21 14:04:10 +08:00
lizanle 4928d5976e 资源库 上传以后逻辑修改 2015-08-21 14:00:24 +08:00
huang 2473849a6b 作品只打分不留言的情况！ 2015-08-21 13:53:36 +08:00
huang 241d525e2c 问卷名为空的显示“未命名问卷” 2015-08-21 13:08:05 +08:00
huang 3f3c55cb52 修复名字为空的缺陷 2015-08-21 12:59:50 +08:00
huang 953817800a 问卷发布后才能提交 2015-08-21 11:46:04 +08:00
huang 580735ef79 修改删除的关联的500问题 2015-08-21 11:28:10 +08:00
lizanle 8a88935b7c 资源库 只能看到自己的资源库 2015-08-21 10:44:09 +08:00
lizanle 3feff49ca3 资源库 只能删除上传者为自己的资源 2015-08-21 10:32:13 +08:00
lizanle cf243d47e5 资源库 只能删除上传者为自己的资源 2015-08-21 10:28:29 +08:00
lizanle 3c6484269d 资源库 只能删除上传者为自己的资源 2015-08-21 10:14:04 +08:00
huang 9b827a698c 鼠标经过的时候显示完整的标题 2015-08-21 10:02:58 +08:00
lizanle 7deafac280 资源库 修改 2015-08-21 10:02:26 +08:00
huang ef45e41a40 新消息提醒。表情插入 2015-08-21 09:41:59 +08:00
huang 893c1c753f 修复留言嵌套回复问题 2015-08-20 18:54:01 +08:00
huang 840caf18f3 修改排序 2015-08-20 17:40:01 +08:00
lizanle 705d31b1d0 资源库 修改 2015-08-20 17:38:30 +08:00
cxt 4c87071765 个人动态 2015-08-20 17:24:34 +08:00
huang 29b8a9dd9d 添加项目新闻回复 消息通知 2015-08-20 17:20:38 +08:00
lizanle 0e8c1d1b66 资源库 分页 2015-08-20 17:00:54 +08:00
huang 7c7c337deb 控制界面 2015-08-20 16:29:43 +08:00
huang ff53840029 修改消息中存在的页面bug 2015-08-20 16:27:49 +08:00
lizanle 7ddf6d1e7d 资源库 多选发送 2015-08-20 16:05:58 +08:00
huang 93f44287aa jounal状态 2015-08-20 14:32:46 +08:00
huang b40122c9ee 跟新issue状态！ 2015-08-20 14:18:16 +08:00
huang a15ab2c72e Merge branch 'szzh' into dev_hjq 
Conflicts:
	db/schema.rb
 2015-08-20 14:07:11 +08:00
lizanle f97a55e164 资源库 删除 2015-08-20 14:01:33 +08:00
huang 404a6f4bca Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-08-20 14:00:47 +08:00
huang 6b847e27d9 修正问题 2015-08-20 14:00:31 +08:00
ouyangxuhua cb773e37ea Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-08-20 12:49:49 +08:00
ouyangxuhua ee09a105d2 贴吧帖子改名 2015-08-20 12:46:31 +08:00
huang f829c6ff23 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 
Conflicts:
	app/views/users/user_messages.html.erb
 2015-08-20 12:45:21 +08:00
huang e4dda89c07 消息---用户留言界面 2015-08-20 12:44:32 +08:00
ouyangxuhua 84182171f5 消息信息显示 2015-08-20 12:41:53 +08:00
lizanle 107a5686d1 资源库 全选反选 2015-08-20 11:37:32 +08:00