p49726105
/
bigdir
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
2,326 Commits 1 Branch 0 Tags 51 MiB
Commit Graph

114 Commits

Author SHA1 Message Date
nwb d1b438953a wiki_format更新 2014-06-24 16:26:29 +08:00
sw 91408cc960 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-06-23 14:59:41 +08:00
nwb d0843861ce Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-06-23 14:52:48 +08:00
nwb f33dc6bff6 1.修改测试环境搭建文档 
2.添加部分测试用例
 2014-06-23 14:51:57 +08:00
sw 358d4a53b8 修复未公开项目动态仍在主页最新动态显示的问题 2014-06-23 14:19:01 +08:00
z9hang f16bec924c 处理undefined method `update_user_level' for nil:NilClass问题 2014-06-23 09:27:21 +08:00
z9hang f9a17241da Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-06-17 09:01:23 +08:00
z9hang 697a6034b2 新得分显示 2014-06-16 17:50:28 +08:00
yanxd d2b5560d5e userscore 事务 2014-06-16 10:54:52 +08:00
yanxd 63cd19c15c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-06-16 09:18:48 +08:00
z9hang eae3918074 添加用户得数统计功能 
帖子内的踩顶横排
 2014-06-13 16:09:43 +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
z9hang e606fd89d2 被关注+2分、取消关注-2分 
讨论区帖子加顶踩功能
顶踩帖子加减分接口
 2014-06-11 17:41:47 +08:00
yanxd 73f5bab075 document css/ 
wiki h2 bug
 2014-06-10 15:59:57 +08:00
yanxd 541b22b84d score statistics init 2014-06-10 10:42:41 +08:00
z9hang 4478c86cea 添加课程 查看真名、查看成员、作业导出权限代码（未应用） 2014-06-06 10:37:06 +08:00
z9hang d83899e3e4 添加新建任务、编辑任务、删除任务、新建占位、编辑占位、删除占位、查看任务、查看占位、查看留言权限代码（未应用） 2014-06-05 17:39:48 +08:00
wanglinchun 8b78929190 修改竞赛通知中评论的相关文件 2014-06-05 11:02:32 +08:00
z9hang ae5ced6a51 课程权限添加（部分） 2014-06-04 17:39:11 +08:00
wanglinchun 6a8d697582 Merge branch 'develop' into competition 
Conflicts:
	config/routes.rb
	lib/redmine.rb
 2014-06-03 18:30:53 +08:00
wanglinchun 81a45fe977 dfs 2014-06-03 15:27:04 +08:00
wanglinchun 528af32f91 修改forge，localhost首页不能显示的问题 2014-06-03 09:27:07 +08:00
wanglinchun bf71a38608 竞赛通知相关文件修改 2014-05-30 20:32:37 +08:00
yanxd 8c33cf0afb Merge branch 'develop' into szzh 2014-05-30 10:59:29 +08:00
yanxd b33ee17343 Merge remote-tracking branch 'remotes/origin/develop' into szzh 
Conflicts:
	Gemfile
	app/controllers/users_controller.rb
	db/schema.rb
 2014-05-30 10:57:13 +08:00
xianbo 325bb85cc5 fix linchun 2014-05-30 09:28:13 +08:00
xianbo 7d1327ad2a Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop 2014-05-30 08:28:07 +08:00
wanglinchun 43449e66b5 增加了竞赛通知按钮 2014-05-29 20:02:00 +08:00
z9hang 2e36949604 添加课程列表查看权限（需用管理员账户将Non member的查看课程列表权限勾选并保存方能查看） 2014-05-28 18:04:16 +08:00
yanxd c7d6a07b72 gems 2014-05-28 09:57:30 +08:00
z9hang 0e6d9a804a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-05-24 09:03:38 +08:00
yanxd 5364687160 bootstrap & tag bug 2014-05-23 17:07:58 +08:00
z9hang 6583ccb001 admin账户个人主页显示修改 
admin账户用户管理功能分离到/admin/users，软件创客功能与普通账户一致
 2014-05-23 11:50:36 +08:00
nwb 5a5db45af2 添加文本文件的预览功能 2014-05-21 14:44:53 +08:00
xianbo 66a5db5ad3 Merge branch 'szzh' into develop 
Conflicts:
	config/routes.rb
	db/schema.rb
 2014-05-15 09:46:38 +08:00
wanglinchun 8f0ee69b8b 隐藏竞赛中的参赛项目和参赛应用 2014-05-10 08:30:35 +08:00
nwb 7ccbc5e88a 课时限制为只能输入正整数 2014-05-09 17:13:23 +08:00
wanglinchun b182debc16 将竞赛页面中“新建参赛作品”的弹出形式由弹出新页面改为本页弹出下拉框，目前已有效果，写数据库有问题 2014-05-09 15:34:13 +08:00
wanglinchun 30f9bc9178 隐藏竞赛页面参赛项目和参赛应用； 
隐藏竞赛页面中关注的“更多”功能
 2014-05-08 19:29:56 +08:00
wanglinchun f2dbbc48fc 发布作品和关联作品都可以用了，参赛应用也可以取出来了，接下来通过判断来去参赛项目和参赛应用 2014-05-08 15:06:36 +08:00
wanglinchun fe151f9e29 竞赛页面中增加“我要参赛”菜单 2014-05-08 08:33:03 +08:00
yanxd d9cadfc43e 未登录500报错 2014-04-23 09:20:09 +08:00
yanxd 60bc3bb1b2 seem_rateable to lib, using Engine setting routes 2014-04-23 08:51:46 +08:00
yanxd b4209b7cc5 jrating 2014-04-21 15:41:51 +08:00
wanglinchun 982ff342fd 显示竞赛页面参赛项目菜单 2014-04-18 22:18:04 +08:00
wanglinchun 9ac0cbe6a3 Merge branch 'competition' into develop 
Conflicts:
	Gemfile
	app/controllers/tags_controller.rb
	app/views/layouts/_base_header.html.erb
	config/routes.rb
	db/schema.rb
 2014-04-18 16:03:52 +08:00
wanglinchun e136254c8d 回复了项目页面中的头像 2014-04-18 09:28:44 +08:00
yanxd d137e78f19 remove tmp file rake task/ 2014-04-16 15:11:27 +08:00
yanxd bde4e0f4f7 fix courselist 2014-04-15 14:33:19 +08:00
kg e92383940f #b2896c16453fc51 2014-04-10 08:21:43 +08:00