Commit Graph

50 Commits

Author SHA1 Message Date
zhuhao 7daf01f8e1 测试键包 2015-01-27 17:18:31 +08:00
alan 5434a5b087 修改《admin可以访问courses和users列表》
Signed-off-by: alan <547533434@qq.com>
2015-01-27 15:29:09 +08:00
z9hang db1cd8851c Merge branch 'szzh' into api
Conflicts:
	Gemfile
	db/schema.rb
2015-01-23 16:51:40 +08:00
z9hang 0f9915fc2a Merge branch 'szzh' into api
Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/bids_controller.rb
	app/controllers/users_controller.rb
	db/schema.rb
2015-01-13 15:12:05 +08:00
z9hang 320c01994b 去除部分gem 2015-01-10 15:50:52 +08:00
alan 23140307aa 实现<去存储过程功能,并修改打分的表更新>
Signed-off-by: alan <547533434@qq.com>
2014-12-31 08:48:14 +08:00
z9hang 899ac6f654 添加作品列表导出excel功能 2014-12-30 14:29:30 +08:00
guange e7060b7e00 开启assets 2014-12-11 11:11:30 +08:00
guange 5eba06ddf9 加入api在线文档 2014-12-10 15:11:10 +08:00
guange 70bc6acbd2 修改用户个人信息 2014-12-10 11:56:33 +08:00
z9hang dbb46b07a6 Merge branch 'api' of http://repository.trustie.net/xianbo/trustie2 into api
Conflicts:
	Gemfile.lock
2014-12-09 16:43:06 +08:00
z9hang 890f49eb36 用户信息显示方法修改 2014-12-09 16:40:52 +08:00
guange ee3d998873 课程列表接口加入老师字段 2014-12-08 16:51:21 +08:00
guange c7c25edf17 加上pry支持 2014-12-08 15:27:18 +08:00
guange db9eebbac7 [API]注册接口完成 2014-12-07 10:48:05 +08:00
z9hang fa1e7c9a04 修正密码长度判断错误问题 2014-12-06 11:27:52 +08:00
www 53ecf8718f [api]用户认证完成 2014-11-27 19:43:04 +08:00
alan 90e4387395 修复登录
Signed-off-by: alan <547533434@qq.com>
2014-11-24 09:08:49 +08:00
z9hang e6aa9d3592 修复用户、课程、项目、竞赛、留言模块样式,去除回复时的回复某某字样,及字数控制 2014-11-12 15:09:39 +08:00
alan 7487c538f3 Signed-off-by: alan <547533434@qq.com> 2014-10-30 10:06:35 +08:00
alan e044f5b615 修改contest中出现的逻辑错误
Signed-off-by: alan <547533434@qq.com>
2014-10-23 11:30:34 +08:00
alan 859a1122b7 修改contest中contestnotification列表和通知公告的界面
Signed-off-by: alan <547533434@qq.com>
2014-10-21 23:23:07 +08:00
alan 43e940eb1d 修复竞赛作品附件删除报错的bug
Signed-off-by: alan <547533434@qq.com>
2014-09-28 17:14:09 +08:00
sw b49e76bf79 Merge branch 'xiaoguang-contest' into szzh
Conflicts:
	app/views/softapplications/show.html.erb
	app/views/welcome/contest.html.erb
2014-09-02 09:28:51 +08:00
hhuai a8a6d69318 改为了山东理工大学的源,比taobao源快,稳定 2014-08-18 09:07:09 +08:00
nwb aebae800dd 竞赛首页修改 2014-07-22 08:37:07 +08:00
nwb 634ef8df5f 界面修改 2014-07-17 16:11:32 +08:00
z9hang 3cda9294fd 注释未能安装的gem 2014-07-16 09:40:18 +08:00
yanxd 14f1ad63d2 自动化测试环境 2014-07-14 16:11:38 +08:00
yanxd fd5747f4dc test 3-framework 2014-07-14 10:27:54 +08:00
sw 41823fbddf test 2014-07-10 09:10:44 +08:00
nwb c5a837c689 修改资源文件测试用例 2014-06-25 16:26:19 +08:00
nwb ae3457e68b 1.添加代码评审(CodeReview)插件
2.添加代码评审插件使用文档
2014-06-24 15:42:28 +08:00
nwb 91f0b58a7a gem修改 2014-06-24 09:55:41 +08:00
nwb e367c03f6e 修正课程作业列表显示BUG 2014-06-23 17:50:45 +08:00
nwb 26b92a925f 去掉测试gem 2014-06-23 17:35:12 +08:00
nwb f33dc6bff6 1.修改测试环境搭建文档
2.添加部分测试用例
2014-06-23 14:51:57 +08:00
z9hang 697a6034b2 新得分显示 2014-06-16 17:50:28 +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 4478c86cea 添加课程 查看真名、查看成员、作业导出权限代码(未应用) 2014-06-06 10:37:06 +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
yanxd c7d6a07b72 gems 2014-05-28 09:57:30 +08:00
yanxd 22d4835d08 asset pipeline. gemfile 2014-05-27 18:14:45 +08:00
wanglinchun ae622eb74e sdfsd 2014-04-23 17:33:32 +08:00
wanglinchun bc068eb12b 添加参赛应用的删除和修改功能以及添加相应的删除和修改权限 2014-04-22 10:59:50 +08:00
yanxd b4209b7cc5 jrating 2014-04-21 15:41:51 +08:00
Administrator 14fb820df3 修正 注册 2013-08-17 10:34:19 +08:00
william 9cc86f3cd8 移除seems_ratabale插件。 2013-08-08 17:26:37 +08:00
william 0b5ea87f11 加入了对赞功能模块,同时预留了踩功能,但暂时不使用。 2013-08-08 17:01:56 +08:00
huangjingquan 70b211e355 first commit 2013-08-01 10:33:49 +08:00