Commit Graph

2693 Commits

Author SHA1 Message Date
nwb bc50d5f469 允许上传空文件 2014-07-18 14:35:44 +08:00
nwb 29618d6a72 竞赛界面调整 2014-07-18 13:48:45 +08:00
nwb c443de5873 去掉课程名称验证 2014-07-18 11:49:47 +08:00
nwb 5272a90227 修改人数显示 2014-07-18 11:35:05 +08:00
nwb 7898bc1dd7 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-18 11:25:16 +08:00
nwb 046142f437 优化students_for_courses表相关逻辑 2014-07-18 11:25:04 +08:00
yanxd df848ca756 print tag exception, course name valid test. 2014-07-18 11:08:36 +08:00
nwb a4d06fbb12 课程成员设置为只能使用单一权限 2014-07-18 10:29:49 +08:00
nwb 6968039c87 修改课程学生计算函数 2014-07-18 09:55:10 +08:00
nwb 28543e3288 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-18 09:21:21 +08:00
nwb 8eac756ac7 1.项目首页的描述更改,不再限制项目描述字数
2.竞赛首页的描述更改,不再限制竞赛描述字数
2014-07-18 09:21:09 +08:00
yanxd 164ec645ee boards created frequently, css file file EOF. 2014-07-18 09:20:16 +08:00
sw 6379dd704a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	db/schema.rb
2014-07-18 08:51:56 +08:00
sw b81b5fc42c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	app/views/layouts/_base_footer.html.erb
	app/views/welcome/index.html.erb
2014-07-18 08:36:55 +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
yanxd 355d452472 63 tests, 93 assertions, 2 failures, 24 errors, 0 pendings, 0 omissions, 0 notifications 2014-07-17 17:13:14 +08:00
nwb ed00adb3ba 优化下载权限判断 2014-07-17 17:06:54 +08:00
nwb 3b1b057f0a 课程描述自动换行 2014-07-17 16:56:45 +08:00
nwb 634ef8df5f 界面修改 2014-07-17 16:11:32 +08:00
nwb baf181f1d7 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-17 16:06:26 +08:00
nwb f4d6696d2e 优化资源搜索界面 2014-07-17 16:06:10 +08:00
yanxd 2554e9fc5b code review function test: 106 tests, 89 assertions, 0 failures, 36 errors 2014-07-17 15:17:37 +08:00
nwb 02b4029e8c 资源文件下载界面调整 2014-07-17 15:05:49 +08:00
nwb 615b3ac2ac 课程界面调整 2014-07-17 14:32:07 +08:00
nwb 6a65b2a84b 去掉测试代码 2014-07-17 10:52:01 +08:00
nwb 0dc2466539 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-17 09:55:52 +08:00
nwb b60a0ddf59 1.添加给gitlab项目新增用户及赋权限接口
2.添加给gitlab项目删除用户接口
2014-07-17 09:55:40 +08:00
yanxd 12fb6bf5ca . 2014-07-17 09:52:56 +08:00
nwb 63e855725f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-17 09:10:38 +08:00
nwb a58a747cfa 屏蔽用户界面的关注需求功能 2014-07-17 09:10:29 +08:00
yanxd 4eee70a845 course new/created test 2014-07-16 17:46:17 +08:00
nwb b34a8d6166 项目搜索优化 2014-07-16 17:25:47 +08:00
nwb 3d8571b59e 1.实现新增gitlab用户接口
2.实现删除gitlab用户接口
2014-07-16 16:50:28 +08:00
nwb 1f5d792783 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-16 15:52:52 +08:00
nwb 6dcc50e60b 添加gitlab创建项目(版本库)接口 2014-07-16 15:52:41 +08:00
z9hang 8d181c4e93 迁移文件出错问题 2014-07-16 15:32:27 +08:00
z9hang 2cab9f7895 热门项目排序添加空值判断,默认按活跃度排序 2014-07-16 15:24:56 +08:00
z9hang ab05bf6f36 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-16 15:16:20 +08:00
z9hang 494d3af9a4 修复贴吧分页问题 2014-07-16 15:16:10 +08:00
nwb 36ab954cf9 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	db/schema.rb
2014-07-16 15:05:57 +08:00
nwb 297fe9a3f4 添加gitlab远程登录接口 2014-07-16 15:05:16 +08:00
yanxd 386aa1adc3 . 2014-07-16 14:35:54 +08:00
z9hang d9e04bab0a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-16 14:22:37 +08:00
z9hang cc4bf3b328 添加超级管理员控制首页热门项目排序问题 2014-07-16 14:22:12 +08:00
nwb 62af03debd Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-16 10:36:32 +08:00
nwb ca7ad03a05 1.优化课程动态信息
2.优化项目动态信息
2014-07-16 10:36:22 +08:00
sw 4825c5287e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-16 10:15:43 +08:00
z9hang fbc4cd1cf1 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	Gemfile.lock
2014-07-16 09:54:03 +08:00
nwb 3254c4a237 修正二级菜单名称显示问题 2014-07-16 09:45:39 +08:00