Commit Graph

2680 Commits

Author SHA1 Message Date
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
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
z9hang 3cda9294fd 注释未能安装的gem 2014-07-16 09:40:18 +08:00
nwb 13a3725b06 BUG修改 2014-07-16 09:28:12 +08:00
sw f8d3d60b27 tttttttt 2014-07-16 08:53:14 +08:00
sw 62e24eda1c ttt 2014-07-15 17:53:07 +08:00
sw e303009917 格式化代码 2014-07-15 17:49:28 +08:00
z9hang 53ff6ea335 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	db/schema.rb
2014-07-15 16:16:13 +08:00
z9hang 6a45a0287d 添加删除图片功能,修复用户修改资料界面form.quene undefine的js错误(导致加载中不消失的原因) 2014-07-15 16:13:50 +08:00
sw 121ffa0342 修改缺陷时增加跟踪者的删除和增加功能 2014-07-15 15:09:52 +08:00
sw b142953a4b 1.创建项目增加功能:是否启动DTS测试,默认为不启用。根据用户选择,决定左侧DTS测试工具选项是否在该项目内显示 2014-07-15 10:28:49 +08:00
yanxd 37d0560b70 test test 2014-07-15 10:27:24 +08:00
sw bff1319c5e 去除课程数据兼容代码 2014-07-15 09:53:03 +08:00
sw 61ba2c47ee 1.修改历史数据中作业为项目时作业显示列表未改变的问题
2.修改作业列表关联项目过长,增加省略号显示和鼠标移动到相应位置的气泡显示
2014-07-15 09:43:13 +08:00
nwb ba3d1755d4 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-14 16:51:34 +08:00