huang
							
						 | 
						
							
							
							
							
								
							
								057d9a3337
								
							
								
							
						 | 
						
							
							
								
								0
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 ouyangxuhua
							
						 | 
						
							
							
							
							
								
							
								af981f841e
								
							
								
							
						 | 
						
							
							
								
								添加组织时,翻页提醒功能改善
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 ouyangxuhua
							
						 | 
						
							
							
							
							
								
							
								71bf80c7a5
								
							
								
							
						 | 
						
							
							
								
								1.创建组织课程关联表,建立相应模型及控制器;
							
							
							
							
							
							
							
							2.在课程设置中,添加加入组中功能;
3.解决添加项目后,组织列表的上一页和下一页链接问题。 
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 ouyangxuhua
							
						 | 
						
							
							
							
							
								
							
								7980d92ff7
								
							
								
							
						 | 
						
							
							
								
								搜索课程,使结果按照开课时间、创建时间倒排
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 lizanle
							
						 | 
						
							
							
							
							
								
							
								b7a6bc3614
								
							
								
							
						 | 
						
							
							
								
								outline url
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 lizanle
							
						 | 
						
							
							
							
							
								
							
								4d7ca63a12
								
							
								
							
						 | 
						
							
							
								
								添加一个参数控制
							
							
							
							
							
							
							
							在课程首页设置大纲不跳转
在大纲展示页面设置大纲,跳转大纲页面 
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 lizanle
							
						 | 
						
							
							
							
							
								
							
								578bb2537d
								
							
								
							
						 | 
						
							
							
								
								课程大纲功能
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 lizanle
							
						 | 
						
							
							
							
							
								
							
								ac82910aa5
								
							
								
							
						 | 
						
							
							
								
								大纲
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 lizanle
							
						 | 
						
							
							
							
							
								
							
								c2be8b4eec
								
							
								
							
						 | 
						
							
							
								
								课程大纲界面
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 ouyangxuhua
							
						 | 
						
							
							
							
							
								
							
								e13d157f7f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 lizanle
							
						 | 
						
							
							
							
							
								
							
								07a2263b16
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'szzh' into dev_zanle
							
							
							
							
							
							
							
							Conflicts:
	app/controllers/courses_controller.rb
	public/stylesheets/new_user.css 
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								 
								guange
							
						 | 
						
							
							
							
							
								
							
								9303dfd5ae
								
							
								
							
						 | 
						
							
							
								
								IE下载xls乱码问题
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 ouyangxuhua
							
						 | 
						
							
							
							
							
								
							
								268575ceec
								
							
								
							
						 | 
						
							
							
								
								加入课程申请样式调整
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 ouyangxuhua
							
						 | 
						
							
							
							
							
								
							
								b0b1a27908
								
							
								
							
						 | 
						
							
							
								
								1.用户请求加入课程成为老师或者教师时,给课程创建者发送邮件;
							
							
							
							
							
							
							
							2.更新相应消息的状态 
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 ouyangxuhua
							
						 | 
						
							
							
							
							
								
							
								d509ef01e8
								
							
								
							
						 | 
						
							
							
								
								更新用户申请加入项目以及反馈的消息的状态
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 lizanle
							
						 | 
						
							
							
							
							
								
							
								cf83209c58
								
							
								
							
						 | 
						
							
							
								
								原来的提交被覆盖了。
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 lizanle
							
						 | 
						
							
							
							
							
								
							
								9d89da7e66
								
							
								
							
						 | 
						
							
							
								
								课程加入消息错误
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 lizanle
							
						 | 
						
							
							
							
							
								
							
								e44d95cca5
								
							
								
							
						 | 
						
							
							
								
								添加申请课程的加入身份
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 lizanle
							
						 | 
						
							
							
							
							
								
							
								a817c3b81e
								
							
								
							
						 | 
						
							
							
								
								添加身份
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 ouyangxuhua
							
						 | 
						
							
							
							
							
								
							
								4deeaa0f34
								
							
								
							
						 | 
						
							
							
								
								1.增加消息:用户迟交作业时,发送不能参与匿评的消息;
							
							
							
							
							
							
							
							2.增加消息:用户创建课程时,发送创建课程消息。 
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 cxt
							
						 | 
						
							
							
							
							
								
							
								223bac373f
								
							
								
							
						 | 
						
							
							
								
								课程动态的数据迁移
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 cxt
							
						 | 
						
							
							
							
							
								
							
								bb0db1e21d
								
							
								
							
						 | 
						
							
							
								
								课程动态页面
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								f041c80d0a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'szzh' into dev_hjq
							
							
							
							
							
							
							
							Conflicts:
	app/views/users/user_messages.html.erb
	db/schema.rb
	public/stylesheets/new_user.css
解决冲突 
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 ouyangxuhua
							
						 | 
						
							
							
							
							
								
							
								e463be04c3
								
							
								
							
						 | 
						
							
							
								
								课程留言更新
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 cxt
							
						 | 
						
							
							
							
							
								
							
								1855adb037
								
							
								
							
						 | 
						
							
							
								
								未登录用户不能访问新建课程页面
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 lizanle
							
						 | 
						
							
							
							
							
								
							
								70e9d75cc6
								
							
								
							
						 | 
						
							
							
								
								登陆后的搜索
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								6051d0797d
								
							
								
							
						 | 
						
							
							
								
								课程搜索结果不正确
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								23f8bd8312
								
							
								
							
						 | 
						
							
							
								
								搜索课程结果列表课程动态
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								2f77adfe9c
								
							
								
							
						 | 
						
							
							
								
								课程动态公共表的完成,去掉课程动态表的与我相关功能,动态的页面显示
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 lizanle
							
						 | 
						
							
							
							
							
								
							
								a282d81551
								
							
								
							
						 | 
						
							
							
								
								加入课程或者已经加入的课程,提示后进行跳转
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								4a781ea6b2
								
							
								
							
						 | 
						
							
							
								
								个人主页,助教不可以关闭课程。修改张生代码
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 zhangshenjerry
							
						 | 
						
							
							
							
							
								
							
								d639942b82
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
							
							
							
							
							
							
							
							Conflicts:
	app/helpers/users_helper.rb
	app/views/layouts/base_users_new.html.erb 
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								b781d22a62
								
							
								
							
						 | 
						
							
							
								
								删除课程过滤器中没有的方法,增加删除课程的action
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 zhangshenjerry
							
						 | 
						
							
							
							
							
								
							
								acebefc987
								
							
								
							
						 | 
						
							
							
								
								个人主页-助教关闭课程不能不可用
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								cf4c6c83d3
								
							
								
							
						 | 
						
							
							
								
								作业积分改为总分
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								1a1580953a
								
							
								
							
						 | 
						
							
							
								
								分班后学生显示不全
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								7338f0d44e
								
							
								
							
						 | 
						
							
							
								
								未完善个人资料的用户创建可以报错
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								 
								guange
							
						 | 
						
							
							
							
							
								
							
								e1cf19baac
								
							
								
							
						 | 
						
							
							
								
								打开课程缓存
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 yutao
							
						 | 
						
							
							
							
							
								
							
								fa3b216e0f
								
							
								
							
						 | 
						
							
							
								
								貌似删除操作不会更新缓存 还是先不用缓存吧
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								 
								guange
							
						 | 
						
							
							
							
							
								
							
								f58b530484
								
							
								
							
						 | 
						
							
							
								
								给课程活动慢加上缓存,并且加入了开关
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 yutao
							
						 | 
						
							
							
							
							
								
							
								e874f4406c
								
							
								
							
						 | 
						
							
							
								
								...
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								cc2bd5f7b1
								
							
								
							
						 | 
						
							
							
								
								作品列表收索时,收索条件内容在课程收索栏
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								f956b27953
								
							
								
							
						 | 
						
							
							
								
								作业积分显示平均分
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 yutao
							
						 | 
						
							
							
							
							
								
							
								b4732814e6
								
							
								
							
						 | 
						
							
							
								
								...
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								e6af34e9f8
								
							
								
							
						 | 
						
							
							
								
								学生列表显示
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								b935f50b36
								
							
								
							
						 | 
						
							
							
								
								课程内作业列表、新建作业等路由关闭,相关页面、方法删除
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								3dce6ec763
								
							
								
							
						 | 
						
							
							
								
								课程动态:暂时不现实老师创建作业
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 yutao
							
						 | 
						
							
							
							
							
								
							
								085b86bbbe
								
							
								
							
						 | 
						
							
							
								
								修复bug#2585:IE11.0中--课程--学生列表:导出列表文件名乱码
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								 
								guange
							
						 | 
						
							
							
							
							
								
							
								907d89e1cc
								
							
								
							
						 | 
						
							
							
								
								merge
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								 
								guange
							
						 | 
						
							
							
							
							
								
							
								af107d861b
								
							
								
							
						 | 
						
							
							
								
								将下载信息放到课程动态
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								ca26b0d819
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'szzh' into dev_hjq
							
							
							
							
							
							
							
							Conflicts:
	app/views/courses/_course_members.html.erb
	app/views/courses/settings.html.erb
	app/views/members/create.js.erb
	app/views/members/destroy.js.erb
	app/views/members/update.js.erb
	app/views/users/show.html.erb
	public/javascripts/course.js 
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 lizanle
							
						 | 
						
							
							
							
							
								
							
								d6527f1f7e
								
							
								
							
						 | 
						
							
							
								
								去掉学生列表分页
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								 
								whimlex
							
						 | 
						
							
							
							
							
								
							
								6195f0a150
								
							
								
							
						 | 
						
							
							
								
								课程动态添加问卷发布,为通过问卷动态访问课程问卷做权限判断
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								cdbe95f6ec
								
							
								
							
						 | 
						
							
							
								
								修改老师配置界面成员搜索
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 z9hang
							
						 | 
						
							
							
							
							
								
							
								8a26fd4343
								
							
								
							
						 | 
						
							
							
								
								课程配置:成员配置处添加搜素成员功能
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								94ca6cd2f9
								
							
								
							
						 | 
						
							
							
								
								新建课程时增加密码与课时的验证
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								ee68828132
								
							
								
							
						 | 
						
							
							
								
								创建课程后跳转URL报错
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								6b758375f8
								
							
								
							
						 | 
						
							
							
								
								1、搜索课程报500
							
							
							
							
							
							
							
							2、课程讨论区描述换行显示 
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								9ebed65fde
								
							
								
							
						 | 
						
							
							
								
								课程动态:作业动态url不对
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								 
								whimlex
							
						 | 
						
							
							
							
							
								
							
								e030c12be8
								
							
								
							
						 | 
						
							
							
								
								课程动态计数和显示统一;问卷计数对学生和老师和显示统一;课程资源库排序
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								 
								whimlex
							
						 | 
						
							
							
							
							
								
							
								aa64b47d74
								
							
								
							
						 | 
						
							
							
								
								资源按时间倒序显示;新建课程设置公开私有属性;课程动态(动态统计主要在作业和作品上存在问题,动态显示在作品和留言中存在权限问题);课程动态格式调整
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								94ecc3e59e
								
							
								
							
						 | 
						
							
							
								
								1、课程新增成员分页控件样式
							
							
							
							
							
							
							
							2、课程老师列表翻页不可用 
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								98bf8dd494
								
							
								
							
						 | 
						
							
							
								
								课程成员列表显示
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								72d683bdb7
								
							
								
							
						 | 
						
							
							
								
								加入课程与退出课程js刷新
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								9af60424c2
								
							
								
							
						 | 
						
							
							
								
								去除错误代码
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								b9031095d4
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'szzh' into sw_new_course
							
							
							
							
							
							
							
							Conflicts:
	Gemfile
	app/controllers/courses_controller.rb
	app/views/attachments/_form.html.erb
	app/views/attachments/_form_course.html.erb
	app/views/files/_attachement_list.html.erb
	app/views/layouts/base.html.erb
	app/views/layouts/base_projects.html.erb
	config/locales/zh.yml
	public/javascripts/attachments.js 
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								ed92faaedd
								
							
								
							
						 | 
						
							
							
								
								关闭课程与重开课程js
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								53eef164c9
								
							
								
							
						 | 
						
							
							
								
								新建课程时layout修改
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								ab7d12e514
								
							
								
							
						 | 
						
							
							
								
								1、修改、删除分班是js方法重构
							
							
							
							
							
							
							
							2、验证分班名是否重复重构 
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								cfe487e217
								
							
								
							
						 | 
						
							
							
								
								搜素学生后内容清空
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								ab3a3a8573
								
							
								
							
						 | 
						
							
							
								
								学生收索功能
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								92808fe8ea
								
							
								
							
						 | 
						
							
							
								
								完成学生列表界面
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								5f41c92cb3
								
							
								
							
						 | 
						
							
							
								
								学生列表界面静态显示
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								221276ba1f
								
							
								
							
						 | 
						
							
							
								
								增加老师布置作业学生访问的列表
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								0408cc5150
								
							
								
							
						 | 
						
							
							
								
								去除无用代码
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								5139ac30dc
								
							
								
							
						 | 
						
							
							
								
								修改老师新建作业界面
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								dc0c9417e3
								
							
								
							
						 | 
						
							
							
								
								修改新提交的作业显示在前面
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								3418c9ccee
								
							
								
							
						 | 
						
							
							
								
								1、修改course/homewrok方法
							
							
							
							
							
							
							
							2、修改course的作业列表显示 
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								258d9bf33a
								
							
								
							
						 | 
						
							
							
								
								1、调整分页控件显示样式
							
							
							
							
							
							
							
							2、修改课程动态分页算法
3、更新样式文件 
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								 
								guange
							
						 | 
						
							
							
							
							
								
							
								08eae0e5eb
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/szzh' into guange_dev
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								 
								guange
							
						 | 
						
							
							
							
							
								
							
								ab6c21314d
								
							
								
							
						 | 
						
							
							
								
								#1503 老师发布的作业可以在课程动态中显示了
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 z9hang
							
						 | 
						
							
							
							
							
								
							
								6ca853edc7
								
							
								
							
						 | 
						
							
							
								
								1、课程首页2、用户首页3、课程留言页4、发布作业页5、用户的留言页6、为课程作业创建作品页传递apptoken参数时自动登录功能
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								bbeaa6e80c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 alan
							
						 | 
						
							
							
							
							
								
							
								22ac578ede
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
							
							
							
							
							
							
							
							Conflicts:
	config/locales/zh.yml 
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								d999a9f4a6
								
							
								
							
						 | 
						
							
							
								
								修复新建课程时报错的BUG
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 z9hang
							
						 | 
						
							
							
							
							
								
							
								18271946d7
								
							
								
							
						 | 
						
							
							
								
								作业详情,课程作业列表接口返回数据格式修改(增加了作业作者相关信息)
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 alan
							
						 | 
						
							
							
							
							
								
							
								4bfc4493eb
								
							
								
							
						 | 
						
							
							
								
								添加《邮件周日发送》功能,修改《贴吧》邮件发送策略
							
							
							
							
							
							
							
							Signed-off-by: alan <547533434@qq.com> 
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								f380d781e7
								
							
								
							
						 | 
						
							
							
								
								增加根据已有课程复制成新课程的路由以及方法实现
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 alan
							
						 | 
						
							
							
							
							
								
							
								6f9e2bad63
								
							
								
							
						 | 
						
							
							
								
								mail weekly
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 alan
							
						 | 
						
							
							
							
							
								
							
								646678c9db
								
							
								
							
						 | 
						
							
							
								
								修改《课程--学生列表:输入有效条件获得搜索结果,对搜索结果按积分排序,却自动返回对所有学生排序》bug
							
							
							
							
							
							
							
							Signed-off-by: alan <547533434@qq.com> 
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 lizanle
							
						 | 
						
							
							
							
							
								
							
								f3f590a834
								
							
								
							
						 | 
						
							
							
								
								# 这写变量发现没有用而且拖慢速度
							
							
							
							
							
							
							
							#@teachers= searchTeacherAndAssistant(@course)
    #@canShowRealName = isCourseTeacher(User.current.id,@course)
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 alan
							
						 | 
						
							
							
							
							
								
							
								5434a5b087
								
							
								
							
						 | 
						
							
							
								
								修改《admin可以访问courses和users列表》
							
							
							
							
							
							
							
							Signed-off-by: alan <547533434@qq.com> 
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 alan
							
						 | 
						
							
							
							
							
								
							
								36dfd7c77c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 alan
							
						 | 
						
							
							
							
							
								
							
								00c0ddc600
								
							
								
							
						 | 
						
							
							
								
								admin查看course和user列表
							
							
							
							
							
							
							
							Signed-off-by: alan <547533434@qq.com> 
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 z9hang
							
						 | 
						
							
							
							
							
								
							
								4b3621905e
								
							
								
							
						 | 
						
							
							
								
								修正课程成员搜索bug
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 z9hang
							
						 | 
						
							
							
							
							
								
							
								db1cd8851c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'szzh' into api
							
							
							
							
							
							
							
							Conflicts:
	Gemfile
	db/schema.rb 
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 alan
							
						 | 
						
							
							
							
							
								
							
								fdba8ca986
								
							
								
							
						 | 
						
							
							
								
								修改《邮箱地址真实性验证》《课程分班提示重名出错》《留言模块发送邮件模板功能》
							
							
							
							
							
							
							
							Signed-off-by: alan <547533434@qq.com> 
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 alan
							
						 | 
						
							
							
							
							
								
							
								24a8f4fe7d
								
							
								
							
						 | 
						
							
							
								
								Signed-off-by: alan <547533434@qq.com>
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								750c8d77aa
								
							
								
							
						 | 
						
							
							
								
								11111
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 z9hang
							
						 | 
						
							
							
							
							
								
							
								0f9915fc2a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'szzh' into api
							
							
							
							
							
							
							
							Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/bids_controller.rb
	app/controllers/users_controller.rb
	db/schema.rb 
							
						 | 
						
							11 years ago |