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

5786 Commits

Author SHA1 Message Date
lizanle 7112d91706 Merge remote-tracking branch 'origin/szzh' into szzh 2015-05-13 09:56:50 +08:00
lizanle 3fae37fa90 课程学生列表下啦刷新显示，查看历次作业成绩的下啦刷新显示api改动 2015-05-13 09:56:34 +08:00
guange 50575c1c20 issue的排序经一线人员使用，还是按创建时间排序好 2015-05-13 09:45:09 +08:00
guange 80d44e4f4c 新版项目的上传图标问题解决 2015-05-12 17:46:54 +08:00
alan fe92b05026 讨论区编辑添加附件 
Signed-off-by: alan <547533434@qq.com>
 2015-05-12 17:14:07 +08:00
alan 29114e19f3 Signed-off-by: alan <547533434@qq.com> 2015-05-12 15:15:04 +08:00
guange 4e6ca53b53 jquery-js找不到报错 2015-05-12 10:12:00 +08:00
guange 092af28476 修正编辑器在火狐下粘贴不成功 2015-05-11 20:57:59 +08:00
alan 8773842801 Signed-off-by: alan <547533434@qq.com> 2015-05-11 17:35:36 +08:00
alan 8e61136d7f Signed-off-by: alan <547533434@qq.com> 2015-05-11 17:23:53 +08:00
alan 79c0c6f551 修改路由跳转 
Signed-off-by: alan <547533434@qq.com>
 2015-05-11 16:45:03 +08:00
alan ee18ba7051 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 
Conflicts:
	app/views/boards/_course_show.html.erb
	app/views/boards/_project_show.html.erb

Signed-off-by: alan <547533434@qq.com>
 2015-05-11 16:25:17 +08:00
alan 25bcc676b9 增加附件功能以及修改路由跳转 
Signed-off-by: alan <547533434@qq.com>
 2015-05-11 16:23:15 +08:00
sw 328dc828c2 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-05-11 16:12:49 +08:00
sw c51794d754 提交通知连接 2015-05-11 16:06:40 +08:00
huang f3b46c5823 项目资源库权限优化： 
管理员、资源上传者拥有设置公开私有权限
私有项目不提供引用其它项目和公开功能
 2015-05-11 15:50:23 +08:00
sw 87564eceee 修改作业--->修改作品 2015-05-11 15:25:16 +08:00
guange 11d7c234f7 merge 2015-05-10 18:12:51 +08:00
guange 461d9cc183 将autologin默认过期时间改为两个月 2015-05-10 18:06:45 +08:00
sw f12a20f85e 用户修改资料保存报错 2015-05-08 16:32:55 +08:00
sw 6a31a99c93 编辑课程讨论区回复时的问题 2015-05-08 16:14:46 +08:00
sw 25e80cefb8 Merge branch 'szzh' into guange_dev 2015-05-08 15:44:47 +08:00
sw 821ceb41cf Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-05-08 15:44:03 +08:00
sw 5f6f7b7cdf 引用功能图片显示不正常 2015-05-08 15:31:13 +08:00
huang 80e1d1f277 去掉讨论区编辑页面虚线 2015-05-08 15:20:28 +08:00
huang a5fbccc975 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-05-08 15:02:27 +08:00
huang f7ad600dde 发布帖子不能删除 2015-05-08 15:02:04 +08:00
sw 5a4f477e46 课程讨论区编辑、删除按钮互换 2015-05-08 14:57:55 +08:00
sw 86f686efb3 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-05-08 14:56:22 +08:00
sw ee051f6a37 1、课程讨论区回复取消功能 
2、课程讨论区回复时不现实主题
 2015-05-08 14:55:56 +08:00
huang 89ea9ddc7b 项目讨论区代码还原 
样式调整
 2015-05-08 14:41:57 +08:00
guange 5c4ad1ce7d merge 2015-05-08 14:31:23 +08:00
guange eed39ef0ef 上传头像会进行压缩 2015-05-08 14:28:17 +08:00
sw 05c26aceb6 发布新贴按钮跳转 2015-05-08 14:27:59 +08:00
sw 34dbde442d 还原课程讨论区 2015-05-08 14:23:57 +08:00
sw a24e4d345d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-05-08 14:03:08 +08:00
alan c21f2c3927 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-05-08 14:02:46 +08:00
alan 2d93cd4bdc Signed-off-by: alan <547533434@qq.com> 2015-05-08 13:33:18 +08:00
alan 23ef975c23 讨论区修改bug 
Signed-off-by: alan <547533434@qq.com>
 2015-05-08 13:04:25 +08:00
huang 30c6a71cbc 修正新建课程讨论区跳转 2015-05-08 11:25:25 +08:00
alan 07ca42b24d Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-05-08 10:59:30 +08:00
alan 63351fc049 Signed-off-by: alan <547533434@qq.com> 2015-05-08 10:59:11 +08:00
huang e6fe010bd7 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-05-08 10:56:33 +08:00
huang 5167cf374c 项目讨论区左侧新建按钮跳转页面修改 
通过传参跳入（JS实现）
 2015-05-08 10:56:02 +08:00
alanlong9278 087f46bf64 Signed-off-by: alanlong9278 <547533434@qq.com> 2015-05-08 10:24:26 +08:00
huang 39fe748da7 处理项目讨论区主题、描述内容过长 2015-05-08 10:10:35 +08:00
alanlong9278 358c9aa019 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-05-08 10:09:17 +08:00
alanlong9278 65c2c43dcb 展开收起回复 
Signed-off-by: alanlong9278 <547533434@qq.com>
 2015-05-08 10:09:01 +08:00
sw 559b5ce7ab 打开缺陷在新的页面打开 2015-05-08 10:02:14 +08:00
sw 78f30344b9 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-05-08 09:55:00 +08:00
sw db6218a487 教师列表界面增加角色显示、教师显示真实姓名 2015-05-08 09:54:40 +08:00
alanlong9278 3995c68b96 Signed-off-by: alanlong9278 <547533434@qq.com> 2015-05-08 09:50:58 +08:00
alanlong9278 3d74734607 Signed-off-by: alanlong9278 <547533434@qq.com> 2015-05-08 09:48:43 +08:00
alanlong9278 53124710d8 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-05-08 09:38:21 +08:00
sw 2749c4f890 课程配置页面，角色改为中文 2015-05-08 09:37:57 +08:00
alanlong9278 49fe15a666 论坛js冲突 
Signed-off-by: alanlong9278 <547533434@qq.com>
 2015-05-08 09:37:52 +08:00
huang 7755d54ef1 各处中文角色统一 2015-05-08 09:28:01 +08:00
alanlong9278 336b59f606 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 
Conflicts:
	.gitignore
	Gemfile
	app/views/issues/index.html.erb
	app/views/layouts/_base_feedback.html.erb
	app/views/tags/_tag_name.html.erb

Signed-off-by: alanlong9278 <547533434@qq.com>
 2015-05-08 09:15:50 +08:00
huang c6b1a4af59 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-05-08 09:12:52 +08:00
huang 3df8a99408 添加中文项目成员角色 2015-05-08 09:12:27 +08:00
lizanle 3035bf24fc Merge remote-tracking branch 'origin/szzh' into szzh 2015-05-08 08:53:44 +08:00
lizanle de921be762 学生列表老师列表报key not find:realname 2015-05-08 08:53:31 +08:00
alan 20cea86ae8 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-05-07 17:38:24 +08:00
alan 3b58810528 修改课程讨论区的js 
Signed-off-by: alan <547533434@qq.com>
 2015-05-07 17:38:08 +08:00
sw 3cb8962f01 登录后域名改为user.truestie.net 2015-05-07 17:16:09 +08:00
sw ac976e59df 匿评可以打0分并给出提示 2015-05-07 16:27:26 +08:00
sw b684f5b361 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-05-07 16:18:15 +08:00
sw e884f58956 匿评可以打0分并给出提示 2015-05-07 16:12:56 +08:00
alan 4bf08e49da Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-05-07 16:10:22 +08:00
alan 08f1c39033 修改课程讨论区界面 
Signed-off-by: alan <547533434@qq.com>
 2015-05-07 16:10:07 +08:00
sw 5ea295f8b5 1、第一次进入作品列表界面 返回顶部按钮不显示 
2、第一次点击返回顶部按钮无用
 2015-05-07 15:58:41 +08:00
sw 5f6f937fcb 返回顶部浏览器不兼容 2015-05-07 14:38:02 +08:00
sw f5e87451b9 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-05-07 11:47:43 +08:00
sw 0ec08f9361 打零分作品仍在未批作品列表显示 2015-05-07 11:47:34 +08:00
sw 31f224fd82 返回顶部动态显示 2015-05-07 11:43:11 +08:00
sw 628ffc67dd 课程作品列表界面增加返回顶部功能 2015-05-07 10:43:23 +08:00
lizanle f7720843a6 Merge remote-tracking branch 'origin/szzh' into szzh 2015-05-07 10:03:23 +08:00
lizanle 2b1b1c34a6 项目issue翻页后查询条件丢失修改 2015-05-07 10:03:10 +08:00
alan 4546095ed4 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-05-07 09:53:50 +08:00
alan eee0df8d22 修改课程，项目的讨论区界面 
Signed-off-by: alan <547533434@qq.com>
 2015-05-07 09:53:34 +08:00
sw cba473269d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-05-07 09:31:22 +08:00
lizanle c9d66c7f5f 项目issue翻页后查询条件丢失修改 2015-05-07 09:22:30 +08:00
lizanle 1cb3dfc833 项目issue翻页后查询条件丢失修改 2015-05-07 09:20:11 +08:00
lizanle 6c7b92558c 项目issue翻页后查询条件丢失修改 2015-05-07 09:08:29 +08:00
lizanle f214a26329 Merge remote-tracking branch 'origin/szzh' into szzh 2015-05-07 09:03:08 +08:00
lizanle 700d2985f6 项目issue翻页后查询条件丢失修改 2015-05-07 09:02:56 +08:00
whimlex 3b5d8f76a4 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-05-06 17:41:36 +08:00
whimlex 3c72af69ea 版本库刷新页面时“git操作指南”展开收起保持一致 2015-05-06 17:41:18 +08:00
huang aabdd1a4d7 剔除新建问题状态时不必要的代码 2015-05-06 16:56:08 +08:00
sw b456bc0e62 评分支持打0分 2015-05-06 16:55:59 +08:00
huang fd28310e15 修改issue列表太长换行问题 2015-05-06 16:37:18 +08:00
sw e32a065c09 关闭学生评分界面后会跳到最顶部 2015-05-06 15:47:02 +08:00
huang a7b2ac860b 修改索引迁移文件不能执行的问题 2015-05-06 15:40:13 +08:00
guange 9ba55296f5 修改密码完成后跳到个人资料 2015-05-06 15:17:42 +08:00
sw a5a5ccce41 #2452course网站课程资源个数的显示和主页显示的不一致 2015-05-06 15:05:57 +08:00
sw cba760b8b0 课程、项目搜索提示 2015-05-06 15:01:26 +08:00
sw 4c268b13dd #2460匿评分配数量限制长度 2015-05-06 14:55:48 +08:00
sw 6bbf8c8f45 课程通知、课程留言取消按钮删除编辑器内内容 2015-05-06 14:53:25 +08:00
sw c0b7819870 修改资料时昵称提示以及样式 2015-05-06 14:20:55 +08:00
guange bd54edd770 Merge remote-tracking branch 'origin/szzh' into guange_dev 2015-05-06 11:05:09 +08:00
guange 05428213a2 让session保持，防止长时间编辑时session丢失 2015-05-06 11:04:57 +08:00
huang 615184fc38 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-05-06 09:26:31 +08:00
huang b39e00b5c7 项目讨论区--内容必填 
添加国际化
 2015-05-06 09:26:14 +08:00
lizanle 3da5fdfa0f 课程课件搜索 课程学生搜索 2015-05-05 17:19:31 +08:00
lizanle b6993e78a6 Merge remote-tracking branch 'origin/szzh' into szzh 2015-05-05 17:19:18 +08:00
lizanle 74c09f45d3 课程课件搜索 课程学生搜索 2015-05-05 17:19:06 +08:00
sw 2e26e27298 版本库收起后之保存在cookie中，刷新页面后仍保持收起状态 2015-05-05 17:08:46 +08:00
huang 0b524b8a40 登录后主页只显示我的项目 
方法定义
功能实现
 2015-05-05 16:29:53 +08:00
alan 3f859065f2 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-05-05 14:33:12 +08:00
alan d73ed9e467 项目讨论区改版 
Signed-off-by: alan <547533434@qq.com>
 2015-05-05 14:32:40 +08:00
huang 6b7a17de8c 版本库Git说明信息 2015-05-05 14:11:01 +08:00
guange 31c78d295e Merge remote-tracking branch 'origin/szzh' into guange_dev 2015-05-05 11:46:15 +08:00
guange 86af233042 修正autologin多终端登录问题 2015-05-05 11:45:58 +08:00
alan a5760afa68 项目讨论区界面更改 
Signed-off-by: alan <547533434@qq.com>
 2015-05-04 17:44:03 +08:00
lizanle 8929644ab1 课程学生model 2015-05-04 17:38:38 +08:00
lizanle 96aef6dbe2 Merge remote-tracking branch 'origin/szzh' into szzh 2015-05-04 17:37:05 +08:00
lizanle c353398d65 课程学生列表功能 2015-05-04 17:36:48 +08:00
whimlex 9707a88790 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	public/stylesheets/project.css
 2015-04-30 17:26:10 +08:00
whimlex 88bbd70102 项目名称导航；问题跟踪页面项目导航到问题列表页面；IE问题跟踪页面缩略图显示 2015-04-30 17:24:30 +08:00
huang 888cd508c4 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-30 16:37:34 +08:00
huang 76b4ae24da 修改邮件邀请--邮件名 
修改成用户点击同意按钮后才能加入项目
 2015-04-30 16:30:02 +08:00
sw 74a85e1601 Merge branch 'szzh' into guange_dev 2015-04-30 11:22:42 +08:00
huang 431c6888a7 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	public/stylesheets/project.css
 2015-04-30 11:16:09 +08:00
huang 119e540373 邮件邀请系统已注册的用户 2015-04-30 11:08:36 +08:00
whimlex 229d8007fe Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-30 10:47:59 +08:00
whimlex 538ba33174 问题跟踪附件图片显示不拉伸 2015-04-30 10:47:34 +08:00
guange 49389ebe28 Merge remote-tracking branch 'origin/szzh' into guange_dev 2015-04-30 10:32:15 +08:00
guange dbccf9034d 邮件加入日志 2015-04-30 10:31:06 +08:00
huang b67f401738 引入我的课程居中 2015-04-30 09:15:48 +08:00
sw 0a8f3faf6a 1、project.css错误代码 
2、项目上传资源弹框
 2015-04-30 09:02:33 +08:00
huang 389266e3e5 修改不同角色拥有的权限 
管理员--配置、项目类型
开发人员-- 配置、退出项目
报告者-- 退出项目（admin可以配）
 2015-04-30 07:46:07 +08:00
huang 73798a0da4 修改邮件两次点击500错误 
增加功能：在点击提交时代码后自动创建用户
用户自动登录功能
 2015-04-30 07:22:47 +08:00
guange ccc004aa03 Merge remote-tracking branch 'origin/szzh' into guange_dev 2015-04-29 23:17:45 +08:00
guange 8384eff7f2 delayed_job条件错误 2015-04-29 23:17:24 +08:00
whimlex 33fc193e65 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-29 17:50:51 +08:00
whimlex bbe4c15293 问题跟踪图片附件和定义的样式不一时，调整图片缩略图显示方式 2015-04-29 17:50:35 +08:00
lizanle cc276c649d Merge remote-tracking branch 'origin/szzh' into szzh 2015-04-29 17:46:52 +08:00
lizanle 519eab76bd 添加显示课程的课件列表 2015-04-29 17:46:39 +08:00
huang dfcc076a7f 角色多选的时候权限控制 2015-04-29 16:46:34 +08:00
huang 84a7bb5907 修改超级管理员不能退出项目 2015-04-29 14:57:12 +08:00
huang f94c2769e6 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-29 14:29:25 +08:00
huang 135c3d9b19 课程讨论区代码重构 
解决路由匹配和JS显示冲突
 2015-04-29 14:29:03 +08:00
sw bef306e94c Merge branch 'guange_dev' into szzh 2015-04-29 14:18:56 +08:00
sw 750393508a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-29 11:20:12 +08:00
sw 33da5b4a44 1、作业评论回复删除不即使刷新 
2、匿评弹框样式
 2015-04-29 11:18:32 +08:00
huang 412052dd0d 修改:引入我的文件提示信息 2015-04-29 10:44:05 +08:00
guange e6f8610dea Merge remote-tracking branch 'origin/szzh' into guange_dev 2015-04-29 10:44:04 +08:00
guange 6c6ef757e1 Merge branch 'guange_dev' of http://repository.trustie.net/xianbo/trustie2 into guange_dev 2015-04-29 10:43:48 +08:00
guange 2afdd57fb6 修复服务器打包乱码问题 2015-04-29 10:43:36 +08:00
whimlex b5b50bef21 问题跟踪图片压缩不清晰 2015-04-29 10:11:50 +08:00