guange
							
						 | 
						
							
							
							
							
								
							
								45c51ef8db
								
							
								
							
						 | 
						
							
							
								
								merge
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								 
								guange
							
						 | 
						
							
							
							
							
								
							
								24a278d7d6
								
							
								
							
						 | 
						
							
							
								
								加上atall
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								f469e51202
								
							
								
							
						 | 
						
							
							
								
								课程模块/通知、作业、留言、发帖,删除的时候统计数字递减
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								f381784a3c
								
							
								
							
						 | 
						
							
							
								
								数据迁移
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								9beaa62d6d
								
							
								
							
						 | 
						
							
							
								
								课程活跃度
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								085729f91b
								
							
								
							
						 | 
						
							
							
								
								课程活跃度中添加作业留言得分
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 cxt
							
						 | 
						
							
							
							
							
								
							
								520811fdc7
								
							
								
							
						 | 
						
							
							
								
								留言按回复的更新时间排序
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 cxt
							
						 | 
						
							
							
							
							
								
							
								b48a2848b0
								
							
								
							
						 | 
						
							
							
								
								首页、课程、项目、组织动态增加更新时间
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 ouyangxuhua
							
						 | 
						
							
							
							
							
								
							
								7d4e3cdd5c
								
							
								
							
						 | 
						
							
							
								
								1.增加项目/课程快捷功能;
							
							
							
							
							
							
							
							2.增加私信功能 
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								 
								guange
							
						 | 
						
							
							
							
							
								
							
								eb97f7dfb2
								
							
								
							
						 | 
						
							
							
								
								merge
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								 
								guange
							
						 | 
						
							
							
							
							
								
							
								fc63dfcb7b
								
							
								
							
						 | 
						
							
							
								
								消息通知
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								ac8aa9e0a6
								
							
								
							
						 | 
						
							
							
								
								解决作业留言和课程留言导致的bug
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								06e5784436
								
							
								
							
						 | 
						
							
							
								
								解决英雄榜两个用户同时存在的but
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 lizanle
							
						 | 
						
							
							
							
							
								
							
								96b704e191
								
							
								
							
						 | 
						
							
							
								
								所有者的更新时间随着被拥有者的改变而改天
							
							
							
							
							
							
							
							譬如course 里边这么写:has_many :boards
boards里边这么写就ok:belongs_to :course,:touch=>true 
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 lizanle
							
						 | 
						
							
							
							
							
								
							
								582cd6f5d4
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'szzh' into dev_zanle
							
							
							
							
							
							
							
							Conflicts:
	app/models/attachment.rb
	db/schema.rb 
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								aca7684414
								
							
								
							
						 | 
						
							
							
								
								课程英雄榜
							
							
							
							
							
							
							
							各模块动作 触发加分 
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 lizanle
							
						 | 
						
							
							
							
							
								
							
								dcd441a9db
								
							
								
							
						 | 
						
							
							
								
								全站搜索
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 cxt
							
						 | 
						
							
							
							
							
								
							
								2a82f33227
								
							
								
							
						 | 
						
							
							
								
								个人首页的留言动态显示不合理
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 cxt
							
						 | 
						
							
							
							
							
								
							
								8abc97ae84
								
							
								
							
						 | 
						
							
							
								
								个人主页添加个人留言动态
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 cxt
							
						 | 
						
							
							
							
							
								
							
								b9b7f6fa9e
								
							
								
							
						 | 
						
							
							
								
								个人主页留言动态的实现
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 cxt
							
						 | 
						
							
							
							
							
								
							
								223bac373f
								
							
								
							
						 | 
						
							
							
								
								课程动态的数据迁移
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								f823046bc3
								
							
								
							
						 | 
						
							
							
								
								完成课程留言点对点逻辑结构
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								0fead3b801
								
							
								
							
						 | 
						
							
							
								
								1、课程留言发送对象为老师
							
							
							
							
							
							
							
							2、作业截止时间邮件通知不适用delay_job
3、添加作业截止时间邮件通知界面 
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 ouyangxuhua
							
						 | 
						
							
							
							
							
								
							
								5155e8794f
								
							
								
							
						 | 
						
							
							
								
								将课程留言加入消息队列
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								b5c0d03590
								
							
								
							
						 | 
						
							
							
								
								添加迁移
							
							
							
							
							
							
							
							代码优化 
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								a7eff50c61
								
							
								
							
						 | 
						
							
							
								
								消息留言发送:回复东家,回复人和东家只能一人收到消息
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								9096fca298
								
							
								
							
						 | 
						
							
							
								
								留言消息发送策略
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								0489b02e54
								
							
								
							
						 | 
						
							
							
								
								课程留言无法删除
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								893c1c753f
								
							
								
							
						 | 
						
							
							
								
								修复留言嵌套回复问题
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								6b847e27d9
								
							
								
							
						 | 
						
							
							
								
								修正问题
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								e4dda89c07
								
							
								
							
						 | 
						
							
							
								
								消息---用户留言界面
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								b5682adcd3
								
							
								
							
						 | 
						
							
							
								
								添加统计数
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								192f16ba79
								
							
								
							
						 | 
						
							
							
								
								修改memo类
							
							
							
							
							
							
							
							添加新的用户留言表结构 
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								6b6f6e0b0d
								
							
								
							
						 | 
						
							
							
								
								个人主页留言消息推送
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								c8399cdf58
								
							
								
							
						 | 
						
							
							
								
								去掉forum
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								d18d1a9d81
								
							
								
							
						 | 
						
							
							
								
								用户留言添加
							
							
							
							
							
							
							
							公共讨论区留言修改 
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								6b55474623
								
							
								
							
						 | 
						
							
							
								
								作品被评阅
							
							
							
							
							
							
							
							作品被回复
消息通知 
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								465af5e2d3
								
							
								
							
						 | 
						
							
							
								
								增加课程动态,以及课程内相关活动时动态的添加
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								2bb59ffd79
								
							
								
							
						 | 
						
							
							
								
								1、作品评论回复以及相关界面刷新
							
							
							
							
							
							
							
							2、调整回复框宽度 
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								9b15cbd6ee
								
							
								
							
						 | 
						
							
							
								
								1、老师评分、学生匿评增加附件上传,可上传批改后的作业
							
							
							
							
							
							
							
							2、修改作业列表作业数不显示 
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								0970182cd5
								
							
								
							
						 | 
						
							
							
								
								当教师只评分不评论时,学生可以进行回复
							
							
							
							
							
							
							
							修改作业评论回复框样式不正确,修改项目用户反馈框显示不正确 
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								95c5e6ac83
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'szzh' into dev_hjq
							
							
							
							
							
							
							
							Conflicts:
	app/helpers/application_helper.rb
	app/helpers/files_helper.rb
	app/helpers/members_helper.rb
	app/models/journals_for_message.rb
	app/models/mailer.rb
	app/models/user.rb
	app/views/attachments/_form.html.erb
	app/views/bids/_new_homework_form.html.erb
	app/views/boards/_project_show.html.erb
	app/views/courses/_courses_jours.html.erb
	app/views/courses/feedback.html.erb
	app/views/courses/new_homework.html.erb
	app/views/courses/settings.html.erb
	app/views/issues/_list.html.erb
	app/views/issues/new.html.erb
	app/views/messages/_project_show.html.erb
	app/views/messages/edit.html.erb
	app/views/news/_project_news.html.erb
	app/views/projects/invite_members.html.erb
	app/views/projects/settings/_modules.html.erb
	app/views/projects/show.html.erb
	config/configuration.yml
	config/locales/zh.yml
	db/schema.rb
	public/assets/kindeditor/kindeditor.js
	public/javascripts/course.js
	public/stylesheets/courses.css
	public/stylesheets/public.css 
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								 
								whimlex
							
						 | 
						
							
							
							
							
								
							
								e030c12be8
								
							
								
							
						 | 
						
							
							
								
								课程动态计数和显示统一;问卷计数对学生和老师和显示统一;课程资源库排序
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								12eaac5683
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
							
							
							
							
							
							
							
							Conflicts:
	app/views/boards/_project_show.html.erb
	public/javascripts/course.js
处理冲突
修改项目动态分页
项目到航天中添加“新建项目” 
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 lizanle
							
						 | 
						
							
							
							
							
								
							
								ceb6af7365
								
							
								
							
						 | 
						
							
							
								
								课程相关模块添加编辑器
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 sw
							
						 | 
						
							
							
							
							
								
							
								1f2b5eedb8
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_zanle' into szzh
							
							
							
							
							
							
							
							Conflicts:
	app/views/projects/show.html.erb
	db/schema.rb 
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 lizanle
							
						 | 
						
							
							
							
							
								
							
								7ee58d1d44
								
							
								
							
						 | 
						
							
							
								
								项目动态重写,并去掉首页缓存
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 alan
							
						 | 
						
							
							
							
							
								
							
								6f9e2bad63
								
							
								
							
						 | 
						
							
							
								
								mail weekly
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 lizanle
							
						 | 
						
							
							
							
							
								
							
								3047b523b0
								
							
								
							
						 | 
						
							
							
								
								add expire_helper and change the code way of set cache expire!
							
							
							
							
							
						 | 
						
							11 years ago | 
						
					
				
					
						
							
							
								
								 lizanle
							
						 | 
						
							
							
							
							
								
							
								10cde37582
								
							
								
							
						 | 
						
							
							
								
								cache using version
							
							
							
							
							
						 | 
						
							11 years ago |