ouyangxuhua
							
						 | 
						
							
							
							
							
								
							
								e90a237a8a
								
							
								
							
						 | 
						
							
							
								
								2.1博客增加“设为主页”的功能
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 ouyangxuhua
							
						 | 
						
							
							
							
							
								
							
								80668d6a47
								
							
								
							
						 | 
						
							
							
								
								增加以下功能:
							
							
							
							
							
							
							
							鼠标经过用户头像时,显示用户的详细信息,并且可以添加/取消关注,可以私信/留言。 
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 ouyangxuhua
							
						 | 
						
							
							
							
							
								
							
								eacf89100d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'szzh' into dev_hjq
							
							
							
							
							
							
							
							Conflicts:
	app/controllers/organizations_controller.rb
	config/routes.rb
	db/schema.rb
	public/images/hwork_icon.png
	public/stylesheets/new_user.css
	public/stylesheets/public.css 
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 ouyangxuhua
							
						 | 
						
							
							
							
							
								
							
								7d4e3cdd5c
								
							
								
							
						 | 
						
							
							
								
								1.增加项目/课程快捷功能;
							
							
							
							
							
							
							
							2.增加私信功能 
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 cxt
							
						 | 
						
							
							
							
							
								
							
								244e133803
								
							
								
							
						 | 
						
							
							
								
								关联项目的对齐
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								7ee4ff69b3
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
							
							
							
							
							
							
							
							Conflicts:
	public/stylesheets/new_user.css
	public/stylesheets/public.css 
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								f81eea54b1
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into szzh
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								fc55be78c6
								
							
								
							
						 | 
						
							
							
								
								博客列表展开/
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 ouyangxuhua
							
						 | 
						
							
							
							
							
								
							
								a81eb5cbc8
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 ouyangxuhua
							
						 | 
						
							
							
							
							
								
							
								dab3f0d225
								
							
								
							
						 | 
						
							
							
								
								为组织1添加子域名:team
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								738acad211
								
							
								
							
						 | 
						
							
							
								
								展开、收缩
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 ouyangxuhua
							
						 | 
						
							
							
							
							
								
							
								d8c6775f42
								
							
								
							
						 | 
						
							
							
								
								1.解决“组织动态中的作业动态,评分设置弹框不能关闭 ”的问题;
							
							
							
							
							
							
							
							2.组织申请子域名功能。 
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								2efcb5b89a
								
							
								
							
						 | 
						
							
							
								
								课程讨论区添加展开、收缩
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								dc77eb6ef6
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								be218baa52
								
							
								
							
						 | 
						
							
							
								
								添加迁移:项目讨论区数据重复问题
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 cxt
							
						 | 
						
							
							
							
							
								
							
								0a2d2a539f
								
							
								
							
						 | 
						
							
							
								
								关联项目的组长名字加个title
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 Tim
							
						 | 
						
							
							
							
							
								
							
								06fa32f0e2
								
							
								
							
						 | 
						
							
							
								
								博客高度控制
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 cxt
							
						 | 
						
							
							
							
							
								
							
								c4886306d4
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 cxt
							
						 | 
						
							
							
							
							
								
							
								94eaf608c3
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'cxt_course' into szzh
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								428eb018a3
								
							
								
							
						 | 
						
							
							
								
								隐藏注册中“组织一列”
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								1f09817e4d
								
							
								
							
						 | 
						
							
							
								
								增加课程讨论区/项目讨论展开更多功能
							
							
							
							
							
							
							
							博客列表页面展开更多
统一展开高度为一个屏幕 
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								 
								guange
							
						 | 
						
							
							
							
							
								
							
								1b177a8498
								
							
								
							
						 | 
						
							
							
								
								默认禁用自动高度
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 cxt
							
						 | 
						
							
							
							
							
								
							
								f52dc37a76
								
							
								
							
						 | 
						
							
							
								
								作业动态添加作品评阅和作品提交消息
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								0d6ad9ffac
								
							
								
							
						 | 
						
							
							
								
								修改课程删除后可以显示的问题
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								 
								guange
							
						 | 
						
							
							
							
							
								
							
								d2c7d12cd9
								
							
								
							
						 | 
						
							
							
								
								merge
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								 
								guange
							
						 | 
						
							
							
							
							
								
							
								8ea9430318
								
							
								
							
						 | 
						
							
							
								
								at链接问题修改
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 ouyangxuhua
							
						 | 
						
							
							
							
							
								
							
								abf6b5ff70
								
							
								
							
						 | 
						
							
							
								
								解决base_org上传资源按钮不能正常上传的问题
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 ouyangxuhua
							
						 | 
						
							
							
							
							
								
							
								8dd34f91c3
								
							
								
							
						 | 
						
							
							
								
								课程/项目配置关联组织,仅关联用户的组织
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 cxt
							
						 | 
						
							
							
							
							
								
							
								3ddbeae100
								
							
								
							
						 | 
						
							
							
								
								课程的“更多”模式的文字不用粗体
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 cxt
							
						 | 
						
							
							
							
							
								
							
								a4a29b0ee9
								
							
								
							
						 | 
						
							
							
								
								关联项目的文字样式调整
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 cxt
							
						 | 
						
							
							
							
							
								
							
								28d491495a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into cxt_course
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 ouyangxuhua
							
						 | 
						
							
							
							
							
								
							
								dae07d7e92
								
							
								
							
						 | 
						
							
							
								
								解决组织页面对齐的问题
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 cxt
							
						 | 
						
							
							
							
							
								
							
								7f751cfc63
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 cxt
							
						 | 
						
							
							
							
							
								
							
								4d4e91c358
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'szzh' into develop
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 huang
							
						 | 
						
							
							
							
							
								
							
								11444f43f0
								
							
								
							
						 | 
						
							
							
								
								解决issue多附件,删除一个附件后,提交弹出白色框框的问题
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 cxt
							
						 | 
						
							
							
							
							
								
							
								6b5341805e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 cxt
							
						 | 
						
							
							
							
							
								
							
								f0216cf604
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'cxt_course' into szzh
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 cxt
							
						 | 
						
							
							
							
							
								
							
								3dac8d2944
								
							
								
							
						 | 
						
							
							
								
								课程/项目帖子的编辑/删除跳转  所有用户都有发送帖子的权限
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 lizanle
							
						 | 
						
							
							
							
							
								
							
								87b8e4dafc
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/szzh' into szzh
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 lizanle
							
						 | 
						
							
							
							
							
								
							
								b06bd51347
								
							
								
							
						 | 
						
							
							
								
								项目资源库更新资源公开私有属性的时候 需要区分 项目课程
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 ouyangxuhua
							
						 | 
						
							
							
							
							
								
							
								527897bff0
								
							
								
							
						 | 
						
							
							
								
								新建组织后,增加默认栏目
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 ouyangxuhua
							
						 | 
						
							
							
							
							
								
							
								692f13d1de
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 ouyangxuhua
							
						 | 
						
							
							
							
							
								
							
								defba80427
								
							
								
							
						 | 
						
							
							
								
								栏目配置中,“设为显示”改成“设为可见"
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 lizanle
							
						 | 
						
							
							
							
							
								
							
								a82fef3ea2
								
							
								
							
						 | 
						
							
							
								
								资源库新上传资源不能被删除
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 cxt
							
						 | 
						
							
							
							
							
								
							
								c323e15e2c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'szzh' into develop
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 lizanle
							
						 | 
						
							
							
							
							
								
							
								d26b51c982
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'szzh' into dev_zanle
							
							
							
							
							
							
							
							Conflicts:
	app/controllers/organizations_controller.rb
	db/schema.rb 
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 cxt
							
						 | 
						
							
							
							
							
								
							
								9b974b6170
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'cxt_course' into szzh
							
							
							
							
							
							
							
							Conflicts:
	db/schema.rb 
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 cxt
							
						 | 
						
							
							
							
							
								
							
								7e76a32480
								
							
								
							
						 | 
						
							
							
								
								项目/课程讨论区的动态增加设置菜单
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 ouyangxuhua
							
						 | 
						
							
							
							
							
								
							
								9c34cf6c3a
								
							
								
							
						 | 
						
							
							
								
								课程/项目帖子页面,齿轮菜单内容居中显示
							
							
							
							
							
						 | 
						
							10 years ago | 
						
					
				
					
						
							
							
								
								 lizanle
							
						 | 
						
							
							
							
							
								
							
								c3b7662cac
								
							
								
							
						 | 
						
							
							
								
								issue按更新时间排序
							
							
							
							
							
						 | 
						
							10 years ago |