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

6051 Commits

Author SHA1 Message Date
lizanle 47d75fe205 Merge remote-tracking branch 'origin/szzh' into szzh 2015-05-15 14:02:48 +08:00
lizanle a262f86100 成绩查询我总是在最上方 2015-05-15 14:02:41 +08:00
guange 907d89e1cc merge 2015-05-15 13:39:26 +08:00
yutao a4cf7bcaad 修改问题跟踪列表翻页为局部刷新 2015-05-15 12:17:47 +08:00
yutao 233c68e965 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-05-15 11:47:57 +08:00
yutao 68cf5fa55e 修复:当1个页面存在多个上传控件时的各种bug 2015-05-15 11:45:15 +08:00
huang 7db9e2eb7f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-05-15 11:28:59 +08:00
huang 2fb5871058 缺陷显示新界面 2015-05-15 11:26:50 +08:00
guange a1240e8743 将过期改为1个月 2015-05-15 10:27:26 +08:00
lizanle 66f8bed978 Merge remote-tracking branch 'origin/szzh' into szzh 2015-05-15 10:17:52 +08:00
lizanle 75643b8181 修改一个查询user的bug 2015-05-15 10:17:47 +08:00
alan 372bf71ca5 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-05-15 10:08:12 +08:00
alan cc5738c12f 课程讨论区回复样式错误 
Signed-off-by: alan <547533434@qq.com>
 2015-05-15 10:07:52 +08:00
huang 465dbfe3f9 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-05-15 09:13:16 +08:00
huang e51d6684ca 发布竞赛页面bug 2015-05-15 09:09:49 +08:00
lizanle d2bf8a16de Merge remote-tracking branch 'origin/szzh' into szzh 2015-05-15 09:06:50 +08:00
lizanle a047bd3d18 课程作业发布功能 
设置教辅功能
学生列表及成绩查看功能
 2015-05-15 09:06:36 +08:00
guange 39308dacfd 将setting中的domain合并到host配置中 2015-05-14 21:40:34 +08:00
guange 9f3cdba9db merge 2015-05-14 17:59:51 +08:00
guange af2c20f666 修复意见反馈不见了的问题 2015-05-14 17:58:56 +08:00
sw c2d11140a1 意见反馈问题 2015-05-14 17:57:00 +08:00
sw 31d80a0026 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-05-14 17:40:46 +08:00
sw c3a98edca8 取消打零分时的弹出框 2015-05-14 17:40:33 +08:00
alan e9c1012cbe 修改附件上传时公开，删除位置不一致 
Signed-off-by: alan <547533434@qq.com>
 2015-05-14 17:23:55 +08:00
alan b8651606be Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-05-14 17:11:43 +08:00
alan 0db90f98d5 wiki的attachment与讨论区冲突 
Signed-off-by: alan <547533434@qq.com>
 2015-05-14 17:09:38 +08:00
alan 8a8a46a5d2 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-05-14 17:00:22 +08:00
alan e3d277163f 修改个人主页的链接 
Signed-off-by: alan <547533434@qq.com>
 2015-05-14 16:59:43 +08:00
sw 9bbae3d7ac Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	public/stylesheets/application.css
 2015-05-14 16:59:27 +08:00
sw dd7140f4fb 意见反馈。内容宽没了 2015-05-14 16:57:49 +08:00
sw c129e767e5 测试版：公共贴吧：显示页数应该与虚线分开 2015-05-14 16:26:01 +08:00
huang 574e79ff57 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-05-14 16:06:41 +08:00
sw 33365f7ea6 修改编辑作业时附件显示移位 2015-05-14 16:04:07 +08:00
alan 0708279c5e Signed-off-by: alan <547533434@qq.com> 2015-05-14 15:42:20 +08:00
huang 68986fa1cb Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-05-14 15:38:27 +08:00
huang 2c568ed370 修改主页下载不存在的资源500错误 
定义helper方法
 2015-05-14 15:37:25 +08:00
sw 8d44ed2189 课程--课程通知：取消编辑通知，应该返回通知详情页面，而非一个空白页 2015-05-14 15:17:30 +08:00
alan f9d9ffe4d9 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-05-14 15:11:36 +08:00
alan 72ef4e1db4 修改讨论区编辑是主题，内容为空时报错以及动态页面跳转问题 
Signed-off-by: alan <547533434@qq.com>
 2015-05-14 15:11:20 +08:00
sw 963a21283f 1、修改作业打分插件星星移位 
2、修改返还批改结果显示不正确
 2015-05-14 15:09:15 +08:00
sw b5719aca8e 修改首页我要提问后新建帖子显示样式 2015-05-14 14:38:22 +08:00
huang 97780b7eef 私有项目可以引用其他资源 2015-05-14 11:14:05 +08:00
huang 84efdb16c9 解决wiki500错误 
show_new代码优化（代码中存在错误）
 2015-05-14 11:06:26 +08:00
alan 0af8c1cc38 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-05-13 17:25:49 +08:00
alan bd77ad9ac1 展开。收起 
Signed-off-by: alan <547533434@qq.com>
 2015-05-13 17:25:31 +08:00
guange c0e1eb85a1 Merge branch 'guange_dev' into szzh 2015-05-13 17:16:21 +08:00
guange f53691ceed 修复不是News的附件显示出错 2015-05-13 17:13:22 +08:00
guange f90278fe73 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-05-13 16:53:24 +08:00
guange af107d861b 将下载信息放到课程动态 2015-05-13 16:44:12 +08:00
huang 404073d76e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-05-13 16:25:56 +08:00
huang c148a8a145 私有项目版本库全休修改 2015-05-13 16:24:46 +08:00
guange bb506b2ab4 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
# Conflicts:
#	db/schema.rb
 2015-05-13 16:22:44 +08:00
guange f31fe81c5d 将课程通知中的附件提到列表和动态中 2015-05-13 15:33:35 +08:00
guange eb6c3a9377 课程搜索很慢，原因是以前成员数计算太复杂 2015-05-13 14:58:11 +08:00
alan a8d19a119a Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-05-13 14:34:07 +08:00
alan fe2f6a0d9d 修改样式以及添加回复取消功能 
Signed-off-by: alan <547533434@qq.com>
 2015-05-13 14:31:54 +08:00
huang 406d608edc 版本库私有权限设置 
--项目成员可以查看
--左侧入口隐藏
--禁止通过url访问
 2015-05-13 11:46:19 +08:00
huang 68050b7d22 版本库页面脚本过长 2015-05-13 10:42:52 +08:00
huang 90559556c6 新建版本库，输入框对齐 2015-05-13 10:37:01 +08:00
huang 6f3621f6c0 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-05-13 10:27:53 +08:00
huang a62001c892 新建版本库-- 
如果主版本库已存在，新建的时候不允许设置主版本库
 2015-05-13 10:27:27 +08:00
huang 6c500109c9 修改项目上传资源 2015-05-13 10:06:04 +08:00
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
alan 54078e114c redis缓存服务器的搭建以及对首页的缓存设置 
Signed-off-by: alan <547533434@qq.com>
 2015-05-04 15:20:40 +08:00
alan 5c67cfc6b6 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into memcached_alan 2015-05-04 14:58:22 +08:00
alan c80263a66e Merge branch 'guange_dev' into memcached_alan 
Conflicts:
	.gitignore
	Gemfile
	app/views/issues/index.html.erb
	app/views/layouts/_base_feedback.html.erb
	app/views/tags/_tag_name.html.erb
	config/environments/production.rb
	db/schema.rb

Signed-off-by: alan <547533434@qq.com>
 2015-05-04 14:58:11 +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
sw 387ab567d2 Merge branch 'szzh' into guange_dev 2015-04-28 15:06:12 +08:00
sw 90c143f047 评论上传附件换行 2015-04-28 15:02:10 +08:00
sw e6a724d439 编辑作业样式 2015-04-28 14:57:02 +08:00
sw 4c3013f1ac 修改作业评价上传附件功能500 
作业标题换行
 2015-04-28 14:37:25 +08:00
sw 9b15cbd6ee 1、老师评分、学生匿评增加附件上传，可上传批改后的作业 
2、修改作业列表作业数不显示
 2015-04-28 12:21:35 +08:00
guange 38ec84cde9 将删除版本库的操作置入后台 2015-04-28 10:33:15 +08:00
sw b3fb7914e2 课程通知评论编辑框不可用，解决方案：编辑跳转到新的页面 2015-04-28 10:31:55 +08:00
guange 273b360b51 Merge remote-tracking branch 'origin/szzh' into guange_dev 2015-04-28 09:53:50 +08:00
guange b70ada57e6 邮件未处理text发送类型，导致每日发送失败 2015-04-27 21:54:49 +08:00
sw 261ebb916c 1、当login过长，用户匿评界面的星星换行 
2、去掉无用的创建作业的代码，与弹出框创建作业代码冲突
 2015-04-27 20:25:28 +08:00
sw 827d99fce4 Merge branch 'szzh' into guange_dev 2015-04-27 18:02:35 +08:00
sw 456dcf9d40 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-27 17:52:34 +08:00
sw d2f1f7d142 1、当教师评论为空时，预留一部分显示 2015-04-27 17:52:16 +08:00
sw a64b3940dd 1、当教师评论为空时，预留一部分 2015-04-27 17:50:03 +08:00
whimlex e30c446847 项目私有问题提示信息 2015-04-27 17:49:05 +08:00
sw 0970182cd5 当教师只评分不评论时，学生可以进行回复 
修改作业评论回复框样式不正确，修改项目用户反馈框显示不正确
 2015-04-27 17:25:42 +08:00
whimlex f3fb0115e4 版本库git操作文档默认展开，样式调整 2015-04-27 17:15:21 +08:00
whimlex 4f48bbbfdb Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-27 16:58:35 +08:00
whimlex 40fdda0ee2 版本库git帮助文档的显示与隐藏 2015-04-27 16:58:16 +08:00
huang e7d85aad27 修改项目配置、关注、加入、类型等不同角色显示 2015-04-27 16:54:46 +08:00
guange 86347cab89 现在可以通过rake redmine📧test[guange] 发送测试邮件 2015-04-27 16:44:53 +08:00
sw 03044d0190 课程--资源库：加粗上传课件分类字样 2015-04-27 15:59:22 +08:00
huang 9cb31d75de Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-27 15:39:54 +08:00
huang be9beff0b4 解决Roles未定义 2015-04-27 15:39:36 +08:00
sw a23231ea7b 修改学生创建作品时的样式 2015-04-27 15:29:09 +08:00
sw 2323c821d6 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-27 14:54:19 +08:00
sw f9aaaf38f9 打爆下载增加字符集 2015-04-27 14:54:01 +08:00
whimlex 5670e2755b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-27 14:42:07 +08:00
whimlex eba638b42e 问题跟踪编辑、更新的权限控制 2015-04-27 14:41:27 +08:00
guange 56f6fa0d86 设置zip支持unicode 2015-04-27 14:36:11 +08:00
huang 020e544b38 修改项目--用户反馈--两层回复样式 2015-04-27 14:34:37 +08:00
guange 24ce5191c3 zip打包可能有乱码 2015-04-27 12:04:08 +08:00
huang 4cdc1d66a2 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-27 11:42:23 +08:00
huang db8b79f3b4 退出项目/项目三种模式切换权限控制 2015-04-27 11:42:01 +08:00
sw 64642a51e0 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-24 17:44:35 +08:00
sw 7e833a4727 缺陷图片显示小 2015-04-24 17:41:18 +08:00
sw 1a33510da1 我要反馈、我要提问新版Editor没有边框 2015-04-24 17:31:19 +08:00
whimlex 520627f010 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-24 17:11:55 +08:00
whimlex cde4a892e0 竞赛主页竞赛通知条数对主页样式的调整 2015-04-24 17:11:36 +08:00
guange e3dd68ad24 Merge remote-tracking branch 'origin/szzh' into guange_dev 2015-04-24 15:21:18 +08:00
guange 449bbc553c 修复issue界面js报错 2015-04-24 15:20:47 +08:00
guange 3299f7e726 正式库issue界面图片显示路径错误 2015-04-24 15:20:10 +08:00
whimlex 481f7ee4ba 意见反馈按回退键重新计算 2015-04-24 15:08:09 +08:00
whimlex 091c6125d5 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-24 15:02:53 +08:00
whimlex 85e1262769 意见反馈 2015-04-24 15:02:32 +08:00
sw 91e37c7ab8 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-24 14:58:51 +08:00
sw 54ef7e3325 修改课程讨论区报错 2015-04-24 14:57:44 +08:00
whimlex 650ffd4397 课程和项目意见反馈 2015-04-24 14:47:50 +08:00
sw f67bdae22a 课程讨论去引用、回帖不换行 2015-04-24 09:10:15 +08:00
whimlex b61d76d94e 意见反馈 2015-04-23 18:18:07 +08:00
whimlex e61822d74a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-23 17:56:11 +08:00
whimlex b3e0490b90 意见反馈 2015-04-23 17:55:48 +08:00
guange 828d2caefa 邮件加入三个邮件设置 2015-04-23 17:43:10 +08:00
guange 5c0d0230fc 去掉首页底部留白和不对齐 2015-04-23 17:43:10 +08:00
guange 3f9abf170e #2363 按天发送邮件相关标题修改 2015-04-23 17:43:10 +08:00
sw b6652ed5e5 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-23 17:32:56 +08:00
sw 10bc470dcf 修改课程讨论区 2015-04-23 17:32:37 +08:00
huang e38639665b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-23 17:02:42 +08:00
huang 7e7ff92f7c issueenter键不能搜索的问题 2015-04-23 17:02:26 +08:00
huang 4c1259ff92 缺陷enter键盘不能搜索（未完成） 2015-04-23 16:56:18 +08:00
sw 4224e11b52 课程讨论区标题换行 2015-04-23 16:34:09 +08:00
sw 66057b5b4f 编辑帖子时的样式 2015-04-23 16:19:23 +08:00
whimlex b5781ac22b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-23 16:13:19 +08:00
whimlex 5d0d9de6e8 意见反馈各主页内保持一致 2015-04-23 16:13:01 +08:00
huang 6a19ac4098 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-23 16:02:35 +08:00
huang 4da77d8a71 wiki页面显示 2015-04-23 16:02:18 +08:00
sw 12e65ad61f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-23 15:45:38 +08:00
huang c9bfe00a4f 修改成员列表的排列 
版本库页面色系
 2015-04-23 15:31:14 +08:00
sw 75504139c9 删除课程留言时留言数自动刷新 2015-04-23 15:25:04 +08:00
sw cfe0635804 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-23 14:31:01 +08:00
huang de23c3c2a8 配置中子页面调整 
隔行换色显示
显示页面左对齐
 2015-04-23 14:04:22 +08:00
sw b1e31ded0e 修改公共贴吧样式 2015-04-23 11:56:59 +08:00
sw 7cd54f07cb 我要反馈按钮移位 2015-04-23 11:50:16 +08:00
sw 6d058940ec 当课程没有讨论区时自动创建其讨论区 2015-04-23 11:44:07 +08:00
sw 5b5423b8c5 修改贴吧新建帖子、回复显示样式的问题 2015-04-23 10:47:54 +08:00
sw 1f7f1eff1a 课程添加成员输入空格键会搜索出所有任务 2015-04-23 10:26:27 +08:00
huang ee1c53bacc Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-23 10:20:15 +08:00
whimlex 2070d69d44 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-23 10:20:01 +08:00
huang 348eae5c45 修改项目模式提示样式 
版本库
版本
 2015-04-23 10:19:59 +08:00
whimlex 19fe973b5b 上传头像 2015-04-23 10:19:43 +08:00
whimlex d66af82478 新建竞赛页面日历插件显示错误 2015-04-23 01:00:17 +08:00
huang 0484692b47 缺陷显示页面虚线多余 2015-04-22 17:57:36 +08:00
sw 9a07989917 调整header的login的样式 2015-04-22 17:01:36 +08:00
huang 425f8473b4 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-22 16:49:23 +08:00
huang 681546b860 缺陷上传附件显示 
项目邮件邀（未完成，需切换分支）
 2015-04-22 16:49:07 +08:00
sw 1985d1c84b 调整header下啦列表框位置 2015-04-22 16:47:13 +08:00
sw 427f26b058 header的login显示 2015-04-22 16:37:24 +08:00
whimlex 36f2643ad8 上传logo 2015-04-22 16:33:12 +08:00
whimlex 7ec060cc46 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-22 15:49:56 +08:00
whimlex 4cb22f2437 课程、项目、个人头像上传 2015-04-22 15:49:38 +08:00
sw de192761b8 Merge branch 'szzh' into guange_dev 
Conflicts:
	Gemfile
	config/application.rb
 2015-04-22 14:53:40 +08:00
whimlex 86bd708c5d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-22 14:35:25 +08:00
whimlex 21f08830df 意见反馈功能修改 2015-04-22 14:35:04 +08:00
sw 1cced5d7e6 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-22 14:16:48 +08:00
sw 2f2d4257c2 调整提交作业按钮样式 2015-04-22 14:10:45 +08:00
huang 9cfcbc5584 项目讨论区--未登录情况下提示界面 2015-04-22 13:56:36 +08:00
huang bce1006969 邀请界面添加权限控制 2015-04-22 13:46:35 +08:00
huang eeaa613c9e 项目类型实时刷新功能 2015-04-22 13:34:57 +08:00
huang 154ee9f38b Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-22 12:43:35 +08:00
huang 2f021aecee 项目成员列表添加角色。用户得分 2015-04-22 12:43:20 +08:00
guange d2dd77612b 将登录默认值改为自动登录 2015-04-22 12:42:22 +08:00
sw 09c51d1a87 修改创建作业未启用匿评时，所有作业列表看不到 2015-04-22 11:44:52 +08:00
sw 83796bfaa0 去掉puts 2015-04-22 11:18:22 +08:00
sw d279881daf Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 
Conflicts:
	app/views/courses/settings.html.erb
 2015-04-22 11:14:12 +08:00
sw 7b3edb59b0 Merge branch 'szzh' into dev_hjq 
Conflicts:
	app/views/courses/_course_members.html.erb
	app/views/courses/settings.html.erb
	app/views/members/create.js.erb
	app/views/members/destroy.js.erb
	app/views/members/update.js.erb
	public/javascripts/course.js
 2015-04-22 11:11:51 +08:00
sw 3d8ec17bb1 修改学生作业得分列表弹出框样式 2015-04-22 11:07:39 +08:00
huang 49f33dd50c 类型bug修复 2015-04-22 10:50:12 +08:00
huang 249c02efff Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-22 10:24:43 +08:00
huang be5c7ac6dd 修改项目类型术语 
图标
 2015-04-22 10:24:15 +08:00
whimlex 0f037e78fa Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 
Conflicts:
	public/stylesheets/public.css
 2015-04-22 10:18:49 +08:00
whimlex 5123ca1047 版本库样式调整 2015-04-22 10:16:14 +08:00
huang ee4cfb9c89 修改流程碑点进去样式 2015-04-22 09:59:29 +08:00
sw 5385f35aff 教师列表删除翻页 2015-04-22 09:52:12 +08:00
huang ca26b0d819 Merge branch 'szzh' into dev_hjq 
Conflicts:
	app/views/courses/_course_members.html.erb
	app/views/courses/settings.html.erb
	app/views/members/create.js.erb
	app/views/members/destroy.js.erb
	app/views/members/update.js.erb
	app/views/users/show.html.erb
	public/javascripts/course.js
 2015-04-22 09:31:13 +08:00
huang 729d11ebaf 修复项目配置中首页显示问题 2015-04-22 09:22:52 +08:00
huang 8b77079f44 公开。私有标识强制不换行 2015-04-22 00:55:40 +08:00
sw 57193b077e 作品列表取消分页显示 2015-04-21 20:44:27 +08:00
huang 7c91a40e4f Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-21 18:05:51 +08:00
huang 1fe35fc063 配置中添加角色权限判断 
不同角色通过admin配置显示不同模块
 2015-04-21 18:05:35 +08:00
whimlex 51aeb40d31 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-21 18:05:20 +08:00
whimlex 6441d298a2 版本库修订SVG图样式修改 2015-04-21 18:04:57 +08:00
whimlex 9fa3d25e3f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-21 17:57:39 +08:00
whimlex b99f8d8056 上传头像，上传课程项目logo提示 2015-04-21 17:56:01 +08:00
lizanle d6527f1f7e 去掉学生列表分页 2015-04-21 17:54:49 +08:00
lizanle da7528c780 重定向到项目配置里的新建版本页面 2015-04-21 17:10:07 +08:00
whimlex 0d26f64afd 搜索课程——授课时间”与“课程简介”显示异常 2015-04-21 16:49:13 +08:00
huang 2043b963c8 添加意见反馈 
项目配置权限
 2015-04-21 16:35:51 +08:00
whimlex ab93d19b56 动态中显示更新项目缺陷样式异常 2015-04-21 16:17:51 +08:00
huang 861469e39f 1、修改回复帖子和新建帖子标题冲突 
2、对齐新建框
3、版本库新建按钮样式
 2015-04-21 16:11:25 +08:00
huang 86027e077f Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-21 15:22:43 +08:00
huang 5bfef259de 去掉缺陷列表空白处的链接 2015-04-21 15:22:27 +08:00
whimlex 84d7e63d54 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-21 15:11:15 +08:00
whimlex 6195f0a150 课程动态添加问卷发布，为通过问卷动态访问课程问卷做权限判断 2015-04-21 15:10:45 +08:00
huang c510f14edb 流程碑添加新建版本 2015-04-21 15:10:05 +08:00
huang 2521e802bf 缺陷统计添加冒号 2015-04-21 14:48:49 +08:00