lizanle
							
						 | 
						
							
							
							
							
								
							
								acbf58837a
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/szzh' into szzh
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 lizanle
							
						 | 
						
							
							
							
							
								
							
								ad8bd379a1
								
							
								
							
						 | 
						
							
							
								
								用户资源过滤
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								4ade77f3d0
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								86e9ec068f
								
							
								
							
						 | 
						
							
							
								
								新建作业时,作业截止时间为空
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 cxt
							
						 | 
						
							
							
							
							
								
							
								c650c83f82
								
							
								
							
						 | 
						
							
							
								
								个人主页报500、动态显示错位的bug修复
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								3a25f44d83
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_hjq' into szzh
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								014881bd42
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
							
							
							
							
							
							
							
							Conflicts:
	public/stylesheets/new_user.css 
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								76ec0d5d48
								
							
								
							
						 | 
						
							
							
								
								资源库导入资源到作业静态页面
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								5384e7eee8
								
							
								
							
						 | 
						
							
							
								
								消息每种类型为空的时候给出提示
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								9bc491227b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'szzh' into dev_hjq
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								462b0a82a0
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								2fa03c3102
								
							
								
							
						 | 
						
							
							
								
								导入作业功能完成
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 lizanle
							
						 | 
						
							
							
							
							
								
							
								f9651d853c
								
							
								
							
						 | 
						
							
							
								
								资源每页显示的个数
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								007a39b5d5
								
							
								
							
						 | 
						
							
							
								
								作业列表的过滤查询
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								9709692a08
								
							
								
							
						 | 
						
							
							
								
								修改消息每页的显示个数
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								c5ad5a3a5a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								1b9da8d963
								
							
								
							
						 | 
						
							
							
								
								消息添加分页功能
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								cb5abc6d74
								
							
								
							
						 | 
						
							
							
								
								导入作业弹框
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 lizanle
							
						 | 
						
							
							
							
							
								
							
								54c849cccb
								
							
								
							
						 | 
						
							
							
								
								发送资源的时候不选任何课程项目的时候不要弹出框发送成功
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								19dc9de60f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 cxt
							
						 | 
						
							
							
							
							
								
							
								a7ce1168db
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 cxt
							
						 | 
						
							
							
							
							
								
							
								caec5e5490
								
							
								
							
						 | 
						
							
							
								
								个人主页动态
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								db70425d99
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'szzh' into sw_new_course
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								dafc128f34
								
							
								
							
						 | 
						
							
							
								
								增加部分默认参数的设置
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								650d0c8cb5
								
							
								
							
						 | 
						
							
							
								
								匿评分配数量默认为3
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								b7cbb9b0c2
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
							
							
							
							
							
							
							
							Conflicts:
	app/controllers/users_controller.rb
	public/stylesheets/new_user.css 
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								049e27f15f
								
							
								
							
						 | 
						
							
							
								
								发布作业功能
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								85b90f9958
								
							
								
							
						 | 
						
							
							
								
								消息代码清理
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								b824c3fa46
								
							
								
							
						 | 
						
							
							
								
								1、去掉多余的代码
							
							
							
							
							
							
							
							2、消息样式列表过宽显示跨行问题 
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								6a986b98d9
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'sw_new_course' into dev_hjq
							
							
							
							
							
							
							
							Conflicts:
	app/controllers/users_controller.rb 
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 lizanle
							
						 | 
						
							
							
							
							
								
							
								f43e312fbb
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/sw_new_course' into sw_new_course
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 lizanle
							
						 | 
						
							
							
							
							
								
							
								a53b9f9049
								
							
								
							
						 | 
						
							
							
								
								留言模块
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 cxt
							
						 | 
						
							
							
							
							
								
							
								eed1939d2f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 cxt
							
						 | 
						
							
							
							
							
								
							
								048319ef8e
								
							
								
							
						 | 
						
							
							
								
								个人主页
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								bc563119d6
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'sw_new_course' into dev_hjq
							
							
							
							
							
							
							
							Conflicts:
	app/controllers/users_controller.rb
	public/stylesheets/new_user.css 
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								8247a29b85
								
							
								
							
						 | 
						
							
							
								
								只有admin用户可以修改个人简介
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 lizanle
							
						 | 
						
							
							
							
							
								
							
								d735eee4a3
								
							
								
							
						 | 
						
							
							
								
								关注和取消关注
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 cxt
							
						 | 
						
							
							
							
							
								
							
								fce523606c
								
							
								
							
						 | 
						
							
							
								
								个人主页
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 cxt
							
						 | 
						
							
							
							
							
								
							
								e4c9f05c7b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 cxt
							
						 | 
						
							
							
							
							
								
							
								bd00870eba
								
							
								
							
						 | 
						
							
							
								
								个人主页
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								56a1283033
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								d8b87ccc37
								
							
								
							
						 | 
						
							
							
								
								作业列表滚动到底部显示下面10条作业
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 lizanle
							
						 | 
						
							
							
							
							
								
							
								70e9d75cc6
								
							
								
							
						 | 
						
							
							
								
								登陆后的搜索
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								0d9a397453
								
							
								
							
						 | 
						
							
							
								
								登录、未登录搜索条件选择js
							
							
							
							
							
							
							
							用户主页 show方法改造 
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								c8b1bb5d64
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 cxt
							
						 | 
						
							
							
							
							
								
							
								4915f7977e
								
							
								
							
						 | 
						
							
							
								
								个人动态
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								c93bc5be40
								
							
								
							
						 | 
						
							
							
								
								作业列表效果显示
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								4c974266b8
								
							
								
							
						 | 
						
							
							
								
								没消息显示!
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								3ecdb2940b
								
							
								
							
						 | 
						
							
							
								
								去掉统计信息
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								0da75afc88
								
							
								
							
						 | 
						
							
							
								
								消息排序(公共表)
							
							
							
							
							
						 | 
						
							10 years ago |