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

6572 Commits

Author SHA1 Message Date
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
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 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 bc97fbcc72 Merge remote-tracking branch 'origin/szzh' into szzh 2015-05-07 09:20:17 +08:00
lizanle 1cb3dfc833 项目issue翻页后查询条件丢失修改 2015-05-07 09:20:11 +08:00
huang b9713c9a41 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-05-07 09:18:22 +08:00
huang f08357d300 用户反馈添加提示：课程问题反馈给老师 2015-05-07 09:17:47 +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
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
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