Commit Graph

462 Commits

Author SHA1 Message Date
nwb 6968039c87 修改课程学生计算函数 2014-07-18 09:55:10 +08:00
nwb f4d6696d2e 优化资源搜索界面 2014-07-17 16:06:10 +08:00
nwb 6a65b2a84b 去掉测试代码 2014-07-17 10:52:01 +08:00
nwb b60a0ddf59 1.添加给gitlab项目新增用户及赋权限接口
2.添加给gitlab项目删除用户接口
2014-07-17 09:55:40 +08:00
nwb 3d8571b59e 1.实现新增gitlab用户接口
2.实现删除gitlab用户接口
2014-07-16 16:50:28 +08:00
nwb 6dcc50e60b 添加gitlab创建项目(版本库)接口 2014-07-16 15:52:41 +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
z9hang cc4bf3b328 添加超级管理员控制首页热门项目排序问题 2014-07-16 14:22:12 +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 31245f6fb2 修复软件创客列表中某些用户的用户名显示不为超链接(未激活账户) 2014-07-14 13:55:22 +08:00
sw 59a5541e45 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-11 14:52:15 +08:00
z9hang fcdfeae326 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	db/schema.rb
2014-07-11 11:45:46 +08:00
z9hang 3dfcc90574 课程、竞赛首页定制
超级管理员账户中首页定制界面优化
2014-07-11 11:41:54 +08:00
sw 4f2298fd22 修复个人动态首页中留言等动态显示有误的问题 2014-07-11 10:31:52 +08:00
nwb 9b3ffc90ba Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	app/controllers/repositories_controller.rb
	db/schema.rb
2014-07-11 09:08:50 +08:00
nwb 6688ba61dd 1.用户申请加入项目向管理员发送邮件
2.资源文件添加文件密级设置
2014-07-11 09:07:09 +08:00
z9hang b4dd8409eb 添加项目托管平台首页定制功能 2014-07-10 17:38:04 +08:00
sw a5518363c3 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-10 11:31:44 +08:00
sw 65c137e617 修复进入课程作业报错的问题 2014-07-10 11:27:06 +08:00
yanxd 2b57e170ef want that image popup in html when user click on thumbnail. 2014-07-10 10:05:45 +08:00
z9hang 9634046d11 权限管理机制优化 2014-07-09 16:02:15 +08:00
z9hang b87abf1f68 权限管理优化 2014-07-08 18:02:10 +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 bc179fbc39 右上角菜单增加二级菜单 2014-07-07 13:41:44 +08:00
nwb c927bb6fd6 首页课程列表修改 2014-07-05 09:33:52 +08:00
sw 1e6693cdcf 1.取消软件创客界面2个个人得分显示
2.修复软件创客界面用户参与课程显示不正确的BUG
3.添加获取用户参与的未过期的项目列表
2014-07-04 11:26:37 +08:00
nwb dc0180988f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-04 09:10:36 +08:00
nwb d001b4416a 1.优化课程首页
2.优化课程首页搜索逻辑
2014-07-04 09:10:17 +08:00
sw 2bdb0e20e9 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	app/views/welcome/course.html.erb
2014-07-03 18:14:44 +08:00
nwb 98ba57b819 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-03 17:28:20 +08:00
nwb 4d25ec1623 1.添加课程垃圾数据清理迁移文件
2.课程首页逻辑更改
2014-07-03 17:28:13 +08:00
yanxd 0e2b7ba362 tag search fix 2014-07-03 17:22:48 +08:00
sw 5abee0a06c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	db/schema.rb
2014-07-03 15:41:15 +08:00
nwb 2a6cbe28f0 修正课程首页错误 2014-07-03 15:24:06 +08:00
sw 3c7e680b1b Merge remote-tracking branch 'origin/szzh' into szzh 2014-07-03 10:33:35 +08:00
nwb 31e338f1e5 修正http://127.0.0.1:3000/?course.trustie.net链接跳转问题 2014-07-03 10:12:30 +08:00
sw 967c377191 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-03 10:09:25 +08:00
nwb 898ecb443a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-02 14:59:02 +08:00
nwb e8705bccb1 修改文件上传界面样式 2014-07-02 14:58:52 +08:00
z9hang 54a2fb8a9c 主页项目得分与项目页面的项目得分保持一致 2014-07-02 11:32:49 +08:00
sw 4470f0dd73 添加作业时增加教师评分所占比例设置 2014-07-01 11:53:55 +08:00
sw 12b6525cc6 t 2014-07-01 10:29:37 +08:00
sw ed9b97f987 增加访问作业显示列表的权限 2014-06-26 14:42:32 +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
sw 358d4a53b8 修复未公开项目动态仍在主页最新动态显示的问题 2014-06-23 14:19:01 +08:00
sw 0dce86d47e 修改首页项目显示为按活跃度排名的前10个项目 2014-06-23 09:42:08 +08:00