Commit Graph

43 Commits

Author SHA1 Message Date
sw 512f16a036 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-11-14 15:04:53 +08:00
alan a4e659d8e1 修改bug<代码评审模块请在左下角显示,不要在tab中显示>
Signed-off-by: alan <547533434@qq.com>
2014-11-13 15:55:12 +08:00
sw a24d1493f9 1.修复点击课程动态,课程动态tab页不高亮显示
2.修复点击新建作业,课程作业tab页不高亮显示
2014-11-12 16:51:07 +08:00
sw 460ba55dde Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	app/models/user.rb
	app/views/courses/_course_form.html.erb
	db/schema.rb
2014-11-08 16:40:36 +08:00
sw 9b64027ed6 1.当用户真实姓名为空时作业列表界面显示为昵称
2.修改分页控件样式
3.作业用户图像增加链接,修改鼠标悬浮样式
4.增加当前选中页显示样式
2014-10-31 14:04:19 +08:00
sw fd5b7ac468 1.更新css样式文件
2.增加相关图片
3.分页空间支持ajax刷新界面
4.修改分页控件显示样式
2014-10-31 11:48:40 +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
z9hang e4ff85894d 1、部分代码优化。2、未参加课程或项目的用户个人主页界面不显示对应的tab页 2014-10-17 15:02:09 +08:00
sw 0f492047a5 修复项目首页的用户动态会显示私有项目中的动态的BUG 2014-10-10 13:52:33 +08:00
alan 43e940eb1d 修复竞赛作品附件删除报错的bug
Signed-off-by: alan <547533434@qq.com>
2014-09-28 17:14:09 +08:00
z9hang 67162bd8fb admin编辑角色,项目权限、课程、;竞赛权限分开显示 2014-09-24 17:36:49 +08:00
sw 2141fcc3ca 将是否启用DTS测试移入项目模块配置 2014-07-28 17:49:28 +08:00
nwb 0950ac2329 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	db/schema.rb
2014-07-14 11:32:01 +08:00
nwb 0031f90c64 1.课程动态中的私有的资源、文档进行权限判断
2.项目动态中的私有的资源、文档进行权限判断
2014-07-14 11:31:24 +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 720c75478a 修正上传图片可传非图片文件bug 2014-07-10 10:15:20 +08:00
sw 76db0e61c3 调整页面样式 2014-07-10 09:21:24 +08:00
z9hang 470f40db82 去除绝对网址 2014-07-05 11:00:01 +08:00
nwb a115edea9d 修改课程标签页选中状态 2014-06-26 14:47:29 +08:00
nwb f4aa817f42 修改合并后首页出错的问题 2014-06-26 10:01:44 +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
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 f33dc6bff6 1.修改测试环境搭建文档
2.添加部分测试用例
2014-06-23 14:51:57 +08:00
sw 358d4a53b8 修复未公开项目动态仍在主页最新动态显示的问题 2014-06-23 14:19:01 +08:00
nwb 099e8a0912 Merge branch 'szzh' into CourseModify
Conflicts:
	app/controllers/application_controller.rb
	app/views/attachments/upload.js.erb
	app/views/courses/_homework_form.html.erb
	app/views/layouts/base_courses.html.erb
	app/views/users/_my_joinedcourse.html.erb
	db/schema.rb
	lib/redmine.rb
	lib/redmine/access_control.rb
2014-06-17 10:12:44 +08:00
nwb b2756650cf 修正课程留言动态引起的首页错误 2014-06-13 16:18:03 +08:00
nwb a20feafa4e 1.添加课程动态model
2.优化课程动态逻辑及权限处理
2014-06-10 11:49:28 +08:00
nwb 59742b9ddb 1.给各角色添加项目相关的权限
2.添加课程权限解析系统
2014-06-06 13:56:48 +08:00
nwb ebe771db88 创建课程修改 2014-06-05 16:41:05 +08:00
nwb 6ff26d06ab 修改课程基础页面逻辑(base_courses.html.erb) 2014-06-05 11:55:46 +08:00
nwb d87b52bedd 课程成员迁移 2014-06-04 09:19:01 +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
yanxd 5364687160 bootstrap & tag bug 2014-05-23 17:07:58 +08:00
xianbo da74c97b7d fix the show of manager web 2013-12-17 11:26:56 +08:00
yanxd 6a97cb69a8 welcome activity. 2013-11-28 09:29:59 +08:00
xianbo 2589d429b0 add the project what one watch 2013-10-24 08:24:56 +08:00
huangjingquan e4cbc7533e tabs显示 2013-09-14 09:51:26 +08:00
zhangyang 4d82cad51d move 2013.8.29 2013-08-30 09:34:21 +08:00
fanqiang bb5052cf30 修改了用户活动,可以查看关注好友的活动,并且将需求加入到活动中
修复了一些需求中的BUG
2013-08-05 22:47:01 +08:00
huangjingquan 70b211e355 first commit 2013-08-01 10:33:49 +08:00