Tim
							
						 | 
						
							
							
							
							
								
							
								a8cef78ccc
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
							
							
							
							
							
							
							
							Conflicts:
	db/schema.rb 
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 Tim
							
						 | 
						
							
							
							
							
								
							
								ccd8bd1141
								
							
								
							
						 | 
						
							
							
								
								自动修改的内容
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								4405a31c9c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'guange_homework' into szzh
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								 
								guange
							
						 | 
						
							
							
							
							
								
							
								e9f9dd44b9
								
							
								
							
						 | 
						
							
							
								
								编程作业的修改功能搞定
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								64bce0261d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								3bfdff81ba
								
							
								
							
						 | 
						
							
							
								
								去掉项目组织
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 lizanle
							
						 | 
						
							
							
							
							
								
							
								dc32bba5fd
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/szzh' into szzh
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 lizanle
							
						 | 
						
							
							
							
							
								
							
								17b4b31449
								
							
								
							
						 | 
						
							
							
								
								隐藏个人中心的回复 textarea编辑框
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 ouyangxuhua
							
						 | 
						
							
							
							
							
								
							
								22e2510482
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 ouyangxuhua
							
						 | 
						
							
							
							
							
								
							
								3044b07df7
								
							
								
							
						 | 
						
							
							
								
								系统消息颜色
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								c0437ae992
								
							
								
							
						 | 
						
							
							
								
								作业截止时间提醒界面!
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								487f46bb32
								
							
								
							
						 | 
						
							
							
								
								上传图片后大小问题
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								 
								guange
							
						 | 
						
							
							
							
							
								
							
								37e1b6d2a1
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/szzh' into guange_homework
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 cxt
							
						 | 
						
							
							
							
							
								
							
								7d6b9005a4
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 cxt
							
						 | 
						
							
							
							
							
								
							
								2da3454bc5
								
							
								
							
						 | 
						
							
							
								
								暂时屏蔽课程复制功能
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 cxt
							
						 | 
						
							
							
							
							
								
							
								1855adb037
								
							
								
							
						 | 
						
							
							
								
								未登录用户不能访问新建课程页面
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								6004fe1b4d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								cd36965cd1
								
							
								
							
						 | 
						
							
							
								
								历史编程作业数据补齐
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								f1e0eed5a8
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								bb3fc97528
								
							
								
							
						 | 
						
							
							
								
								作业截止时间消息通知:
							
							
							
							
							
							
							
							1、时间区段设置为24小时
2、只进行一次消息提醒 
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 lizanle
							
						 | 
						
							
							
							
							
								
							
								8848b3975e
								
							
								
							
						 | 
						
							
							
								
								防止生成的kindeditor太高
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								f4c19c0fb0
								
							
								
							
						 | 
						
							
							
								
								1、homework.js   on改为live
							
							
							
							
							
							
							
							2、导入作业之后,编程功能按钮消失 
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								527ff41d43
								
							
								
							
						 | 
						
							
							
								
								1、编程作业开启匿评之后提交作品的提示
							
							
							
							
							
							
							
							2、匿评弹框不可关闭 
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								dfed4885de
								
							
								
							
						 | 
						
							
							
								
								新建作业,取消之后编程设置按钮消失
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 ouyangxuhua
							
						 | 
						
							
							
							
							
								
							
								36e9c20e59
								
							
								
							
						 | 
						
							
							
								
								系统消息
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								7db774eedb
								
							
								
							
						 | 
						
							
							
								
								新建作业时,匿评相关属性为作业必须属性
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								30ebe9b2d5
								
							
								
							
						 | 
						
							
							
								
								1、编程作业可以开启匿评
							
							
							
							
							
							
							
							2、取消扣分标准的显示 
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								08c222266a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								4ea20b707c
								
							
								
							
						 | 
						
							
							
								
								定义消息标题类型方法
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 ouyangxuhua
							
						 | 
						
							
							
							
							
								
							
								0bb8b175e6
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 ouyangxuhua
							
						 | 
						
							
							
							
							
								
							
								9e61ceefa9
								
							
								
							
						 | 
						
							
							
								
								系统消息修改
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								cc3990de44
								
							
								
							
						 | 
						
							
							
								
								修改发系统消息后跳转路劲
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								a94521f2e1
								
							
								
							
						 | 
						
							
							
								
								编辑普通作业功能完成
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								948a6c9138
								
							
								
							
						 | 
						
							
							
								
								隐藏教师节相关信息
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								6730c4da84
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								66636efda9
								
							
								
							
						 | 
						
							
							
								
								修改普通作业
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 lizanle
							
						 | 
						
							
							
							
							
								
							
								2beb85561a
								
							
								
							
						 | 
						
							
							
								
								上传资源后,全选按钮和已选择资源数清空
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								001c2f48f6
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								92a3d78dcc
								
							
								
							
						 | 
						
							
							
								
								完成作业截止定时发送消息
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 lizanle
							
						 | 
						
							
							
							
							
								
							
								795ce09d5e
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/szzh' into szzh
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 lizanle
							
						 | 
						
							
							
							
							
								
							
								e5e3eeca2c
								
							
								
							
						 | 
						
							
							
								
								kindeditor  icon顺序调整
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								f0bd113a5e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								93b179c958
								
							
								
							
						 | 
						
							
							
								
								修改普通作业
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								 
								guange
							
						 | 
						
							
							
							
							
								
							
								424f674da9
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/szzh' into guange_homework
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 lizanle
							
						 | 
						
							
							
							
							
								
							
								80e38287dd
								
							
								
							
						 | 
						
							
							
								
								所有baselayout都引入prttefy.css .js
							
							
							
							
							
							
							
							调整资源库宽度 
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 ouyangxuhua
							
						 | 
						
							
							
							
							
								
							
								06fea1bf1d
								
							
								
							
						 | 
						
							
							
								
								系统消息显示
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 lizanle
							
						 | 
						
							
							
							
							
								
							
								cc6fe754d4
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/szzh' into szzh
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 lizanle
							
						 | 
						
							
							
							
							
								
							
								756aae0cf2
								
							
								
							
						 | 
						
							
							
								
								发布issue编辑器可以上传代码并高亮显示了
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 cxt
							
						 | 
						
							
							
							
							
								
							
								e6d5d17859
								
							
								
							
						 | 
						
							
							
								
								轻抚展开更多->展开更多
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 cxt
							
						 | 
						
							
							
							
							
								
							
								5f0aac9265
								
							
								
							
						 | 
						
							
							
								
								点击打开编辑资料,显示保存的性别
							
							
							
							
							
						 | 
						
							10 years ago |