sw
							
						 | 
						
							
							
							
							
								
							
								6a6fbea446
								
							
								
							
						 | 
						
							
							
								
								提交作品样式
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								487881bb92
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'szzh' into dev_hjq
							
							
							
							
							
							
							
							Conflicts:
	public/stylesheets/new_user.css 
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								0e4019be2f
								
							
								
							
						 | 
						
							
							
								
								修复时间乱的问题
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								b0060fc03b
								
							
								
							
						 | 
						
							
							
								
								请选择发送的课程选择
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								dd3fe5915e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
							
							
							
							
							
							
							
							9e7323539f923b5387b9ec9239b5aeb, reversing
changes made to da9c374ed9.
Conflicts:
	app/views/users/_user_homework_form.html.erb 
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								d0743e4dbf
								
							
								
							
						 | 
						
							
							
								
								缺陷显示界面描述增加html_safe
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 cxt
							
						 | 
						
							
							
							
							
								
							
								de1708b8df
								
							
								
							
						 | 
						
							
							
								
								选择框默认显示文字类似于“请选择发布作业的课程”,点击即弹出供选择的课程列表,课程名称后还需要显示开课学期
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 cxt
							
						 | 
						
							
							
							
							
								
							
								21565b74fe
								
							
								
							
						 | 
						
							
							
								
								冲突
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								7361f40b0c
								
							
								
							
						 | 
						
							
							
								
								修改项目资源时间显示跳转错误页面问题
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 cxt
							
						 | 
						
							
							
							
							
								
							
								d4dfd97b97
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 cxt
							
						 | 
						
							
							
							
							
								
							
								756d703b5a
								
							
								
							
						 | 
						
							
							
								
								选择框默认显示文字类似于“请选择发布作业的课程”,点击即弹出供选择的课程列表,课程名称后还需要显示开课学期
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								c09478c73f
								
							
								
							
						 | 
						
							
							
								
								作业列表界面和动态列表界面显示不一致
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								09a994f76a
								
							
								
							
						 | 
						
							
							
								
								职称增加副教授等职称
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								ca0c7a4fb0
								
							
								
							
						 | 
						
							
							
								
								个人主页职称
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								7263598851
								
							
								
							
						 | 
						
							
							
								
								访问问卷报500
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 cxt
							
						 | 
						
							
							
							
							
								
							
								e448d2c05f
								
							
								
							
						 | 
						
							
							
								
								个人主页
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								d9df8aae28
								
							
								
							
						 | 
						
							
							
								
								1。缺陷状态更新后,不同状态变更在消息列表中显示方式
							
							
							
							
							
							
							
							2、缺陷指派与缺陷发布者消息冲突问题
3、留言内容的过滤 
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								9709692a08
								
							
								
							
						 | 
						
							
							
								
								修改消息每页的显示个数
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								049e27f15f
								
							
								
							
						 | 
						
							
							
								
								发布作业功能
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								c93bc5be40
								
							
								
							
						 | 
						
							
							
								
								作业列表效果显示
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								 
								guange
							
						 | 
						
							
							
							
							
								
							
								3a601bbd2c
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/szzh' into guange_dev
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 lizanle
							
						 | 
						
							
							
							
							
								
							
								1aa61acd79
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
							
							
							
							
							
							
							
							Conflicts:
	public/stylesheets/public.css 
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								5594295c9e
								
							
								
							
						 | 
						
							
							
								
								添加问题更新策略
							
							
							
							
							
							
							
							显示更新内容 
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 lizanle
							
						 | 
						
							
							
							
							
								
							
								9138f46301
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'szzh' into dev_zanle
							
							
							
							
							
							
							
							Conflicts:
	app/controllers/users_controller.rb 
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								 
								guange
							
						 | 
						
							
							
							
							
								
							
								d36da76685
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/szzh' into guange_dev
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 lizanle
							
						 | 
						
							
							
							
							
								
							
								89b9a5c09d
								
							
								
							
						 | 
						
							
							
								
								资源库
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								a8283a2861
								
							
								
							
						 | 
						
							
							
								
								点击问卷动态,跳转到答题界面
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								3e9f3f4e70
								
							
								
							
						 | 
						
							
							
								
								课程动态,无对应数据时报错
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								4b5022bfc6
								
							
								
							
						 | 
						
							
							
								
								课程动态报错
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								b036d5b63d
								
							
								
							
						 | 
						
							
							
								
								网站首页、个人主页、项目、课程等页面header项目/课程下拉框按照最新的动态更新时间排序
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								2f77adfe9c
								
							
								
							
						 | 
						
							
							
								
								课程动态公共表的完成,去掉课程动态表的与我相关功能,动态的页面显示
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								a1dfe13728
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 lizanle
							
						 | 
						
							
							
							
							
								
							
								d43ded4f8b
								
							
								
							
						 | 
						
							
							
								
								1.没有可导入的问卷提示
							
							
							
							
							
							
							
							2.教辅也可以导入老师的问卷 
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								09b1c03ef2
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 lizanle
							
						 | 
						
							
							
							
							
								
							
								d0bca180ca
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/szzh' into szzh
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 lizanle
							
						 | 
						
							
							
							
							
								
							
								5d82f3336e
								
							
								
							
						 | 
						
							
							
								
								导入作者是我,但是问卷在其他课程里的问卷,可以多选
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								2e4babc2ae
								
							
								
							
						 | 
						
							
							
								
								修改demo代码,增加C++的示例代码
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								96420f59a8
								
							
								
							
						 | 
						
							
							
								
								修改标准代码
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								aaf546686e
								
							
								
							
						 | 
						
							
							
								
								输出错误 --->  输入和输出不匹配
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								3f51368bb2
								
							
								
							
						 | 
						
							
							
								
								老师布置作业界面增加错误信息的提示
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								fe2d621dc3
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
							
							
							
							
							
							
							
							Conflicts:
	app/helpers/users_helper.rb 
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								5e857d3472
								
							
								
							
						 | 
						
							
							
								
								...
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								793f477f1c
								
							
								
							
						 | 
						
							
							
								
								创建课程数、加入课程数、创建项目数、加入项目数统计问题
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 cxt
							
						 | 
						
							
							
							
							
								
							
								8eb2b72802
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								93ef63d60d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'szzh' into dev_hjq
							
							
							
							
							
							
							
							Conflicts:
	app/views/layouts/base_users_new.html.erb 
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								ef5bd664cc
								
							
								
							
						 | 
						
							
							
								
								..合并
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 cxt
							
						 | 
						
							
							
							
							
								
							
								dfa06ab069
								
							
								
							
						 | 
						
							
							
								
								课程动态中的创建问卷显示成了发布问卷
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								9728277005
								
							
								
							
						 | 
						
							
							
								
								1、课程动态、每次项目动态显示13条
							
							
							
							
							
							
							
							2、取消动态页面、他的课程、他的项目、留言等显示 
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								390aa632cd
								
							
								
							
						 | 
						
							
							
								
								修改删除主版本库后,新建可以设置主版本库
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 lizanle
							
						 | 
						
							
							
							
							
								
							
								e85ef7b192
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/szzh' into szzh
							
							
							
							
							
						 | 
						
							10 years ago |