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

4338 Commits

Author SHA1 Message Date
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
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
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 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 31f224fd82 返回顶部动态显示 2015-05-07 11:43:11 +08:00
sw 628ffc67dd 课程作品列表界面增加返回顶部功能 2015-05-07 10:43:23 +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 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