alan
							
						 | 
						
							
							
							
							
								
							
								b7a89d6108
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'shaproup' into szzh
							
							
							
							
							
							
							
							Conflicts:
	app/models/course.rb
	app/models/project.rb
	app/views/contests/show_attendingcontest.html.erb
	app/views/files/_course_file.html.erb
	app/views/files/_course_new.html.erb
	app/views/layouts/_base_footer.html.erb
Signed-off-by: alan <547533434@qq.com> 
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 alan
							
						 | 
						
							
							
							
							
								
							
								495c4db43e
								
							
								
							
						 | 
						
							
							
								
								增加功能<增加学生列表是否公开功能>
							
							
							
							
							
							
							
							Signed-off-by: alan <547533434@qq.com> 
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 alan
							
						 | 
						
							
							
							
							
								
							
								e044f5b615
								
							
								
							
						 | 
						
							
							
								
								修改contest中出现的逻辑错误
							
							
							
							
							
							
							
							Signed-off-by: alan <547533434@qq.com> 
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								4082dbed5b
								
							
								
							
						 | 
						
							
							
								
								修改了部分model的validate(custon_field.rb之上)
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								 
								ShengYue.Xu
							
						 | 
						
							
							
							
							
								
							
								047f6d2c95
								
							
								
							
						 | 
						
							
							
								
								修改了缺陷当中 #868、#780、#603
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 nwb
							
						 | 
						
							
							
							
							
								
							
								49aa3a994e
								
							
								
							
						 | 
						
							
							
								
								学时不允许为空
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 yanxd
							
						 | 
						
							
							
							
							
								
							
								6af11fea68
								
							
								
							
						 | 
						
							
							
								
								course class period
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 nwb
							
						 | 
						
							
							
							
							
								
							
								c443de5873
								
							
								
							
						 | 
						
							
							
								
								去掉课程名称验证
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 nwb
							
						 | 
						
							
							
							
							
								
							
								6968039c87
								
							
								
							
						 | 
						
							
							
								
								修改课程学生计算函数
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 yanxd
							
						 | 
						
							
							
							
							
								
							
								164ec645ee
								
							
								
							
						 | 
						
							
							
								
								boards created frequently, css file file EOF.
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								4825c5287e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 nwb
							
						 | 
						
							
							
							
							
								
							
								3254c4a237
								
							
								
							
						 | 
						
							
							
								
								修正二级菜单名称显示问题
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								bff1319c5e
								
							
								
							
						 | 
						
							
							
								
								去除课程数据兼容代码
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								59a5541e45
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 nwb
							
						 | 
						
							
							
							
							
								
							
								6688ba61dd
								
							
								
							
						 | 
						
							
							
								
								1.用户申请加入项目向管理员发送邮件
							
							
							
							
							
							
							
							2.资源文件添加文件密级设置 
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								47ad20421e
								
							
								
							
						 | 
						
							
							
								
								修复当课程描述中有特殊标签是,课程列表描述显示有误的BUG
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								39434766e3
								
							
								
							
						 | 
						
							
							
								
								1.修复超级管理员无法访问课程作业列表的BUG
							
							
							
							
							
							
							
							2.修改作业描述样式 
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								b492ead0c0
								
							
								
							
						 | 
						
							
							
								
								修改学校链接
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								a1920ca54c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								0e0b8fb8d8
								
							
								
							
						 | 
						
							
							
								
								历史数据中当课程名称字段为空时从项目列表里获取名称
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 nwb
							
						 | 
						
							
							
							
							
								
							
								08a6dec39d
								
							
								
							
						 | 
						
							
							
								
								课程讨论区回复时主题只读
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 nwb
							
						 | 
						
							
							
							
							
								
							
								31e338f1e5
								
							
								
							
						 | 
						
							
							
								
								修正http://127.0.0.1:3000/?course.trustie.net链接跳转问题
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 nwb
							
						 | 
						
							
							
							
							
								
							
								ad97066a45
								
							
								
							
						 | 
						
							
							
								
								课程名称有效性判断
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 nwb
							
						 | 
						
							
							
							
							
								
							
								b4af75f289
								
							
								
							
						 | 
						
							
							
								
								部分界面优化
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 nwb
							
						 | 
						
							
							
							
							
								
							
								f4aa817f42
								
							
								
							
						 | 
						
							
							
								
								修改合并后首页出错的问题
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 nwb
							
						 | 
						
							
							
							
							
								
							
								88c3347f7c
								
							
								
							
						 | 
						
							
							
								
								修正合并分支后的创建课程错误
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 nwb
							
						 | 
						
							
							
							
							
								
							
								f5c9123647
								
							
								
							
						 | 
						
							
							
								
								管理员创建课程逻辑修改,管理员创建课程后成为该课程成员
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 nwb
							
						 | 
						
							
							
							
							
								
							
								b178be984d
								
							
								
							
						 | 
						
							
							
								
								添加课程搜索处理
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 nwb
							
						 | 
						
							
							
							
							
								
							
								165dbc3f78
								
							
								
							
						 | 
						
							
							
								
								修改words_controller与课程相关方法及视图
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 nwb
							
						 | 
						
							
							
							
							
								
							
								97d920c195
								
							
								
							
						 | 
						
							
							
								
								修改新增课程通知视图
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 nwb
							
						 | 
						
							
							
							
							
								
							
								3165d97417
								
							
								
							
						 | 
						
							
							
								
								1.迁移课程新闻数据
							
							
							
							
							
							
							
							2.添加课程新闻index视图 
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 nwb
							
						 | 
						
							
							
							
							
								
							
								b6c9415a4b
								
							
								
							
						 | 
						
							
							
								
								1.给各角色添加浏览课程资源文件权限
							
							
							
							
							
							
							
							2.修改课程动态显示逻辑 
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 nwb
							
						 | 
						
							
							
							
							
								
							
								a793b8923d
								
							
								
							
						 | 
						
							
							
								
								1.Non member角色添加add_couese权限
							
							
							
							
							
							
							
							2.course_helper优化排序等相关函数
3.课程index界面修改 
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 nwb
							
						 | 
						
							
							
							
							
								
							
								a20feafa4e
								
							
								
							
						 | 
						
							
							
								
								1.添加课程动态model
							
							
							
							
							
							
							
							2.优化课程动态逻辑及权限处理 
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 nwb
							
						 | 
						
							
							
							
							
								
							
								8768193e72
								
							
								
							
						 | 
						
							
							
								
								添加课程资源文件全部列表视图
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 nwb
							
						 | 
						
							
							
							
							
								
							
								2f3d9b1795
								
							
								
							
						 | 
						
							
							
								
								1.修改资源文件类index方法
							
							
							
							
							
							
							
							2.添加课程资源文件index视图 
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 nwb
							
						 | 
						
							
							
							
							
								
							
								54505340eb
								
							
								
							
						 | 
						
							
							
								
								1.修正新建课程错误
							
							
							
							
							
							
							
							2.优化课程角色权限判断 
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 nwb
							
						 | 
						
							
							
							
							
								
							
								59742b9ddb
								
							
								
							
						 | 
						
							
							
								
								1.给各角色添加项目相关的权限
							
							
							
							
							
							
							
							2.添加课程权限解析系统 
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 nwb
							
						 | 
						
							
							
							
							
								
							
								ebe771db88
								
							
								
							
						 | 
						
							
							
								
								创建课程修改
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 nwb
							
						 | 
						
							
							
							
							
								
							
								d22ffa84b4
								
							
								
							
						 | 
						
							
							
								
								1.课程标签迁移,从项目中分离
							
							
							
							
							
							
							
							2.标签control\view添加对课程类标签的处理 
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 nwb
							
						 | 
						
							
							
							
							
								
							
								6ff26d06ab
								
							
								
							
						 | 
						
							
							
								
								修改课程基础页面逻辑(base_courses.html.erb)
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 nwb
							
						 | 
						
							
							
							
							
								
							
								de201ae8f6
								
							
								
							
						 | 
						
							
							
								
								添加课程管理员表,并从项目管理员表中迁移原有数据
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 nwb
							
						 | 
						
							
							
							
							
								
							
								a49cf3eb6b
								
							
								
							
						 | 
						
							
							
								
								1.修改课程作业路由
							
							
							
							
							
							
							
							2.课程control添加作业显示方法 
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 nwb
							
						 | 
						
							
							
							
							
								
							
								69e366d841
								
							
								
							
						 | 
						
							
							
								
								迁移课程作业数据
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 nwb
							
						 | 
						
							
							
							
							
								
							
								0d99644fa7
								
							
								
							
						 | 
						
							
							
								
								1.用户课程表逻辑修改
							
							
							
							
							
							
							
							2.添加link_to_course相关逻辑 
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 nwb
							
						 | 
						
							
							
							
							
								
							
								fb36a0d5ba
								
							
								
							
						 | 
						
							
							
								
								1.课程control添加create方法
							
							
							
							
							
							
							
							2.课程model添加部分新列及相关逻辑 
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 nwb
							
						 | 
						
							
							
							
							
								
							
								d87b52bedd
								
							
								
							
						 | 
						
							
							
								
								课程成员迁移
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 nwb
							
						 | 
						
							
							
							
							
								
							
								cd10dd5433
								
							
								
							
						 | 
						
							
							
								
								课程权限判断变更,从项目权限分离
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 nwb
							
						 | 
						
							
							
							
							
								
							
								7d3d406c00
								
							
								
							
						 | 
						
							
							
								
								新增部分课程所需的解析函数
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 nwb
							
						 | 
						
							
							
							
							
								
							
								f936c30ec9
								
							
								
							
						 | 
						
							
							
								
								添加与course.index相关的control、view、help等实现
							
							
							
							
							
						 | 
						
							12 years ago |