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

564 Commits

Author SHA1 Message Date
sw dd589c4811 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-24 08:50:44 +08:00
sw a7debdae98 格式化代码 2014-07-23 09:16:06 +08:00
z9hang dee09aad75 修复导航bug 2014-07-22 15:59:35 +08:00
nwb 68be9c25b8 Merge remote-tracking branch 'remotes/origin/szzh' into develop 
Conflicts:
	app/views/welcome/contest.html.erb
 2014-07-22 09:52:16 +08:00
yanxd 87671e9d73 base footer merge bug. 2014-07-22 09:39:27 +08:00
z9hang 3e79dd6e32 竞赛通知鼠标悬停 
导航丢失问题
 2014-07-22 08:53:14 +08:00
nwb 35ab3a2c7d Merge remote-tracking branch 'remotes/origin/szzh' into develop 2014-07-21 13:53:45 +08:00
z9hang 5e4571d6af 修复部分页面导航丢失问题 2014-07-21 11:14:17 +08:00
nwb 2a8929b90f Merge remote-tracking branch 'remotes/origin/szzh' into develop 2014-07-21 10:11:36 +08:00
sw e24323147d 修复项目描述过长不会自动换行的BUG 2014-07-19 16:45:27 +08:00
nwb 4259d9c282 Merge remote-tracking branch 'remotes/origin/szzh' into develop 2014-07-19 13:28:07 +08:00
nwb 206aeeccfb 优化2级菜单效果 2014-07-19 11:39:09 +08:00
nwb f20f0aaa45 Merge remote-tracking branch 'remotes/origin/szzh' into develop 2014-07-19 11:11:58 +08:00
z9hang 4bd083b059 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/users/show.html.erb
 2014-07-18 16:56:00 +08:00
z9hang b44b488807 导航栏调整 2014-07-18 16:51:41 +08:00
z9hang bd43ef5d61 网站两边空白颜色调整、网站导航栏调整、admin账户新建用户bug修复 2014-07-18 16:39:39 +08:00
nwb b655f0c7b0 Merge remote-tracking branch 'remotes/origin/szzh' into develop 2014-07-18 13:50:30 +08:00
nwb 29618d6a72 竞赛界面调整 2014-07-18 13:48:45 +08:00
nwb b7c4f87a8f Merge remote-tracking branch 'remotes/origin/szzh' into develop 
Conflicts:
	app/views/welcome/index.html.erb
 2014-07-18 09:57:47 +08:00
z9hang 5b7fc4048a user.trustie.net域名下课程主页导航栏多个课程实践菜单 
页面跳转时域名不正确问题重新修正
 2014-07-18 09:11:02 +08:00
z9hang 0f4933240b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-17 18:10:42 +08:00
z9hang 7c3a81735c user。trustie.net域名下跳转到项目页面时主域名没变bug（尚需测试） 
user.trustie.net域名下主导航栏多一个项目托管菜单问题
 2014-07-17 18:10:32 +08:00
nwb 3b1b057f0a 课程描述自动换行 2014-07-17 16:56:45 +08:00
nwb 634ef8df5f 界面修改 2014-07-17 16:11:32 +08:00
nwb 615b3ac2ac 课程界面调整 2014-07-17 14:32:07 +08:00
nwb a58a747cfa 屏蔽用户界面的关注需求功能 2014-07-17 09:10:29 +08:00
nwb 3254c4a237 修正二级菜单名称显示问题 2014-07-16 09:45:39 +08:00
nwb 1d4dad22ad Merge commit '6d698cb5d8fa00faf3cb59a1c657c419bd2da6d5' into develop 
Conflicts:
	ReadMe.txt
	app/views/layouts/_base_footer.html.erb
 2014-07-11 11:38:36 +08:00
nwb bdaf59513b Merge commit '6688ba61dd67ce7bea195d6f5a7a4458b86956d7' into develop 
Conflicts:
	app/views/layouts/_base_footer.html.erb
 2014-07-11 09:11:37 +08:00
yanxd 0998438e67 bootstrap fine tuning. 2014-07-09 15:20:00 +08:00
yanxd 449b87e38d remove cnzz 2014-07-08 15:38:37 +08:00
xianbo 25ee1d8672 for adjust test domain and give a setting reposwq 2014-07-08 10:59:20 +08:00
yanxd ab03962e9a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-07 16:53:00 +08:00
yanxd aca63146e9 搜索文件归属，课程相关逻辑修改，查询把过滤去掉了。暂时没想有什么过滤的好办法 2014-07-07 16:52:39 +08:00
nwb dd396a6da2 Merge remote-tracking branch 'remotes/origin/szzh' into develop 2014-07-07 16:27:49 +08:00
nwb bc179fbc39 右上角菜单增加二级菜单 2014-07-07 13:41:44 +08:00
z9hang 470f40db82 去除绝对网址 2014-07-05 11:00:01 +08:00
nwb efbffa7436 Merge remote-tracking branch 'remotes/origin/szzh' into develop 2014-07-05 09:34:34 +08:00
sw eac725a0f4 修改作业、用户、课程界面中相关学校的链接 2014-07-04 15:21:56 +08:00
yanxd f664ec10b4 Merge branch 'szzh' into develop 
Conflicts:
	app/views/bids/_bid_homework_show.html.erb
 2014-07-03 09:07:09 +08:00
yanxd 663634b9da Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 2014-07-03 09:03:17 +08:00
xianbo 830e2d4fb4 隐藏 站长统计 2014-07-01 18:18:25 +08:00
z9hang bc587f3e7d 屏蔽个人分数实时刷新功能 
修复个人分数计分异常
 2014-06-27 11:15:10 +08:00
sw 12b16f0bb6 1.修复作业界面点击所属任务链接出错的BUG 
2.点击所属任务返回作业列表界面
 2014-06-26 16:47:49 +08:00
sw 392dc0c365 增加访问作业显示列表的权限 2014-06-26 14:58:59 +08:00
sw ed9b97f987 增加访问作业显示列表的权限 2014-06-26 14:42:32 +08:00
sw c4b2c47dc7 调整作业显示样式 2014-06-26 11:40:54 +08:00
sw 7702b746c6 修复作业显示界面，提交作业按钮不显示的问题 2014-06-26 10:55:50 +08:00
nwb f4aa817f42 修改合并后首页出错的问题 2014-06-26 10:01:44 +08:00
nwb 7425178419 Merge branch 'CourseModify' into szzh 
Conflicts:
	app/views/layouts/base_courses.html.erb
	app/views/layouts/base_homework.html.erb
	app/views/projects/_course.html.erb
	db/schema.rb
	lib/redmine/activity/fetcher.rb
 2014-06-26 08:53:16 +08:00
z9hang 02e221eedb 修改：网站中的旧分数显示为新分数 2014-06-24 13:57:51 +08:00
z9hang df89e5e173 去掉多的一个分数显示 2014-06-23 17:49:20 +08:00
z9hang 9d9bc76af4 定时刷新分数 2014-06-21 17:06:08 +08:00
z9hang f9612ca63f 实时刷新（ajax轮询） 2014-06-21 15:34:10 +08:00
z9hang 9061a77221 修改user.user_score为空问题的解决方式 2014-06-19 10:45:30 +08:00
z9hang d2db58050d 修复部分未填工作单位报错问题 2014-06-18 14:21:05 +08:00
z9hang 08ba10c32d 添加超链接 
已添加的超链接：
学校主页，课程信息中的学校名称
竞赛中项目列表： 参赛人
竞赛中参入竞赛tab页：参赛代表
修改作业界面教师单位不显示问题，并添加超链接
作业界面作业名称添加超链接
软件众包页面：软件众包名称
软件众包页面：关注栏下头像添加链接，参与项目栏：图片添加链接
贴吧帖子：修复 发帖回帖下方 “由xxx在XXX之前添加”中名子未链接问题
 2014-06-18 11:42:59 +08:00
z9hang 1cb1eeeb1d 个人主页：姓名、工作单位 
课程主页：课程名称、教师单位
项目主页：项目名称
竞赛主页：竞赛名称
主页：课程列=>单位名称
修复部分个人主页报错问题
 2014-06-17 17:41:59 +08:00
nwb 0de6cc8a31 修改作业基础视图 2014-06-17 15:20:39 +08:00
nwb 78612488e5 1.修改新建作业及视图 
2.修改编辑作业及视图
 2014-06-17 11:32:41 +08:00
nwb 099e8a0912 Merge branch 'szzh' into CourseModify 
Conflicts:
	app/controllers/application_controller.rb
	app/views/attachments/upload.js.erb
	app/views/courses/_homework_form.html.erb
	app/views/layouts/base_courses.html.erb
	app/views/users/_my_joinedcourse.html.erb
	db/schema.rb
	lib/redmine.rb
	lib/redmine/access_control.rb
 2014-06-17 10:12:44 +08:00
z9hang 697a6034b2 新得分显示 2014-06-16 17:50:28 +08:00
yanxd c5d892a214 footer 2014-06-16 08:47:42 +08:00
yanxd 70abac4c1e Merge branch 'competition' into develop 
Conflicts:
	app/controllers/application_controller.rb
	config/locales/en.yml
	config/locales/zh.yml
	db/schema.rb
 2014-06-13 10:59:43 +08:00
yanxd b58c5685ac Merge branch 'szzh' into develop 2014-06-13 08:36:24 +08:00
sw b7458abd9e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-06-12 16:43:34 +08:00
sw 277aa81a60 修复占位列表界面显示的作业描述样式不正确的问题 2014-06-12 16:43:02 +08:00
yanxd 0536af6625 Merge branch 'szzh' into develop 2014-06-12 16:39:35 +08:00
nwb c8900c279c 课程标签增加、删除 2014-06-12 16:22:35 +08:00
yanxd 858a7936b5 revert userscore catch exception, added cache to footer. 2014-06-12 16:19:46 +08:00
yanxd cccb19e733 cnzz 2014-06-12 15:46:16 +08:00
nwb ae8fcca14f 1.课程接触视图修改 
2.添加课程成员列表视图
 2014-06-12 14:57:25 +08:00
sw 43736ba8d6 兼容历史数据 2014-06-11 17:00:23 +08:00
sw 541ced18ec 作业显示界面增加导航栏 2014-06-11 16:53:07 +08:00
sw 26b933dddb t 2014-06-10 08:59:31 +08:00
wanglinchun 1393aebace 完成了按钮样式 2014-06-09 11:30:18 +08:00
yanxd 4c7bcd50f5 contests delete routes error 2014-06-09 10:51:07 +08:00
wanglinchun 372de9932a 英文版竞赛子站完成 2014-06-06 11:24:05 +08:00
wanglinchun 42aba52111 竞赛子站英文版5 2014-06-06 10:46:56 +08:00
yanxd 57994edc06 load user in homework 2014-06-05 17:29:11 +08:00
yanxd 1c7923e5bd sql 2014-06-05 16:53:41 +08:00
sw 8e2288a362 1.封装获取作业平均评分方法 
2.优化作业列表界面效率
 2014-06-05 15:57:40 +08:00
nwb d22ffa84b4 1.课程标签迁移，从项目中分离 
2.标签control\view添加对课程类标签的处理
 2014-06-05 15:20:09 +08:00
nwb cd3c69af94 课程资源文件迁移，从项目中分离 2014-06-05 14:07:44 +08:00
nwb 6ff26d06ab 修改课程基础页面逻辑(base_courses.html.erb) 2014-06-05 11:55:46 +08:00
sw 39ce95a950 美化作业显示界面 2014-06-04 17:22:42 +08:00
wanglinchun 9d783a7caa 修改竞赛通知等tab-menu的显示状态 2014-06-03 21:52:16 +08:00
sw 03c8f39729 1.修复登录提示描述不正确的问题 
2.修改作业显示界面html
 2014-05-29 08:37:54 +08:00
sw b9550cedb9 课程作业显示界面修改 2014-05-28 19:54:53 +08:00
yanxd 654cb404e2 bootstrap test 2014-05-26 11:27:10 +08:00
yanxd 12b1553a33 Merge branch 'develop' into szzh 2014-05-26 09:05:36 +08:00
yanxd 7a4e5afba0 test 2014-05-24 12:12:38 +08:00
t430 fd0a504d84 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into develop 2014-05-23 17:12:10 +08:00
yanxd 5364687160 bootstrap & tag bug 2014-05-23 17:07:58 +08:00
xianbo a3a95556a3 fix 王林春提交了冲突文件 2014-05-23 14:16:32 +08:00
yanxd f44b930037 233 2014-05-22 15:33:38 +08:00
nwb 80e84069a1 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-05-21 19:31:05 +08:00
nwb 1d6816419d 优化用户申请加入项目界面刷新 2014-05-21 19:30:49 +08:00
z9hang 21e58ce3df 课程列表中课程成员数量显示n+（不显示精确数） 
只有课程成员能点击教师数量学生数量的链接和查看已提交作业的列表
 2014-05-21 17:33:02 +08:00
nwb 104ee13ac7 1.添加用户申请加入项目contrl、model及相关逻辑 
2.项目界面添加申请加入按钮
 2014-05-21 16:45:11 +08:00