txz
							
						 | 
						
							
							
							
							
								
							
								ea5bd94e99
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								
								 txz
							
						 | 
						
							
							
							
							
								
							
								9ae7461501
								
							
								
							
						 | 
						
							
							
								
								资源列表学生进入时也显示为课件;课程tab页样式替换
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								
								 yuanke
							
						 | 
						
							
							
							
							
								
							
								3a2e2c1174
								
							
								
							
						 | 
						
							
							
								
								未命名课程暂不允许进行课程管理
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								
								 yuanke
							
						 | 
						
							
							
							
							
								
							
								d38ce793bd
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								
								 yuanke
							
						 | 
						
							
							
							
							
								
							
								bb62ba40b7
								
							
								
							
						 | 
						
							
							
								
								修改微信权限问题、管理课程界面等
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								
								 txz
							
						 | 
						
							
							
							
							
								
							
								ed39b4b4f1
								
							
								
							
						 | 
						
							
							
								
								动态:创建班级;学生进入资源也显示课件;已有班级和新增班级颜色区分
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								 
								guange
							
						 | 
						
							
							
							
							
								
							
								a2ba65956c
								
							
								
							
						 | 
						
							
							
								
								.
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								
								 yuanke
							
						 | 
						
							
							
							
							
								
							
								3a6470b1f3
								
							
								
							
						 | 
						
							
							
								
								删除班级时增加提示确定信息
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								 
								guange
							
						 | 
						
							
							
							
							
								
							
								7859bf9c32
								
							
								
							
						 | 
						
							
							
								
								.
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								 
								guange
							
						 | 
						
							
							
							
							
								
							
								a17a6ed596
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								 
								guange
							
						 | 
						
							
							
							
							
								
							
								10789d2505
								
							
								
							
						 | 
						
							
							
								
								added alert2
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								
								 yuanke
							
						 | 
						
							
							
							
							
								
							
								9d46040f7a
								
							
								
							
						 | 
						
							
							
								
								课程列表 + - 按钮增加效果,资源发送界面课程列表显示和课程列表界面保持一直
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								
								 yuanke
							
						 | 
						
							
							
							
							
								
							
								b994e786ab
								
							
								
							
						 | 
						
							
							
								
								我的动态中三类动态之间切换的效果
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								
								 yuanke
							
						 | 
						
							
							
							
							
								
							
								d49bc8b114
								
							
								
							
						 | 
						
							
							
								
								发送课程的时候提示语修改
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								 
								guange
							
						 | 
						
							
							
							
							
								
							
								373e3d3422
								
							
								
							
						 | 
						
							
							
								
								merge
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								 
								guange
							
						 | 
						
							
							
							
							
								
							
								48fb02a2d6
								
							
								
							
						 | 
						
							
							
								
								管理课程
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								
								 yuanke
							
						 | 
						
							
							
							
							
								
							
								9d0b5789d9
								
							
								
							
						 | 
						
							
							
								
								1.修改我的动态博客详情页面显示不了的BUG  2.资源界面切换是暂无XX先隐藏  3. 发送资源不选择班级的提示修改
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								 
								guange
							
						 | 
						
							
							
							
							
								
							
								60367415fa
								
							
								
							
						 | 
						
							
							
								
								新建课程功能完成
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								 
								guange
							
						 | 
						
							
							
							
							
								
							
								3c295ba5a1
								
							
								
							
						 | 
						
							
							
								
								merge
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								 
								guange
							
						 | 
						
							
							
							
							
								
							
								201abd6358
								
							
								
							
						 | 
						
							
							
								
								assets
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								 
								guange
							
						 | 
						
							
							
							
							
								
							
								b010ce2e61
								
							
								
							
						 | 
						
							
							
								
								发送课程完成
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								
								 cxt
							
						 | 
						
							
							
							
							
								
							
								e834d09469
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'cxt_course' into develop
							
							
							
							
							
							
							
							Conflicts:
	db/schema.rb 
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								
								 cxt
							
						 | 
						
							
							
							
							
								
							
								0ff8f0a774
								
							
								
							
						 | 
						
							
							
								
								课程大纲的删除和课程大纲描述的删除
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								
								 cxt
							
						 | 
						
							
							
							
							
								
							
								bdaa9983e3
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'cxt_course' into develop
							
							
							
							
							
							
							
							Conflicts:
	db/schema.rb 
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								
								 cxt
							
						 | 
						
							
							
							
							
								
							
								2c1e0f534c
								
							
								
							
						 | 
						
							
							
								
								课程大纲
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								
								 cxt
							
						 | 
						
							
							
							
							
								
							
								ac4218bfb0
								
							
								
							
						 | 
						
							
							
								
								课程大纲列表
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								 
								guange
							
						 | 
						
							
							
							
							
								
							
								0bb5c8b5fb
								
							
								
							
						 | 
						
							
							
								
								注册绑定问题
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								
								 cxt
							
						 | 
						
							
							
							
							
								
							
								e066445036
								
							
								
							
						 | 
						
							
							
								
								课程大纲的显示和编辑
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								
								 cxt
							
						 | 
						
							
							
							
							
								
							
								383483de26
								
							
								
							
						 | 
						
							
							
								
								课程大纲的左侧栏base,新建课程大纲、新建班级的调整
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								 
								guange
							
						 | 
						
							
							
							
							
								
							
								e9f280b4aa
								
							
								
							
						 | 
						
							
							
								
								.
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								 
								guange
							
						 | 
						
							
							
							
							
								
							
								047903ddff
								
							
								
							
						 | 
						
							
							
								
								重构课程地址
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								 
								guange
							
						 | 
						
							
							
							
							
								
							
								1e6454efc0
								
							
								
							
						 | 
						
							
							
								
								加入我的资源
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								 
								guange
							
						 | 
						
							
							
							
							
								
							
								5477c794ba
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into weixin_guange
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								 
								guange
							
						 | 
						
							
							
							
							
								
							
								3b383dfa65
								
							
								
							
						 | 
						
							
							
								
								老师课程界面
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								
								 yuanke
							
						 | 
						
							
							
							
							
								
							
								ab99645148
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'yuanke' into develop
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								
								 yuanke
							
						 | 
						
							
							
							
							
								
							
								dd397a060b
								
							
								
							
						 | 
						
							
							
								
								修改删除组织成员跨域的BUG
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								 
								guange
							
						 | 
						
							
							
							
							
								
							
								05f09c4595
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into weixin_guange
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								 
								guange
							
						 | 
						
							
							
							
							
								
							
								c501af70ba
								
							
								
							
						 | 
						
							
							
								
								.
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								
								 cxt
							
						 | 
						
							
							
							
							
								
							
								4f342142e6
								
							
								
							
						 | 
						
							
							
								
								组织文章的展开更多
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								
								 cxt
							
						 | 
						
							
							
							
							
								
							
								0611ddcc43
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
							
							
							
							
							
							
							
							Conflicts:
	app/views/users/_reply_to.html.erb 
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								 
								guange
							
						 | 
						
							
							
							
							
								
							
								2c2e1892e5
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into weixin_guange
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								 
								guange
							
						 | 
						
							
							
							
							
								
							
								c39a982093
								
							
								
							
						 | 
						
							
							
								
								二维码
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								
								 cxt
							
						 | 
						
							
							
							
							
								
							
								eab000306c
								
							
								
							
						 | 
						
							
							
								
								动态回复的展开更多、收起,组织文章回复不可用
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								
								 cxt
							
						 | 
						
							
							
							
							
								
							
								d558a4d357
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								
								 Tim
							
						 | 
						
							
							
							
							
								
							
								a542ba46a4
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								
								 Tim
							
						 | 
						
							
							
							
							
								
							
								ec33569033
								
							
								
							
						 | 
						
							
							
								
								取消拖拽
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								
								 cxt
							
						 | 
						
							
							
							
							
								
							
								260759e4db
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								 
								guange
							
						 | 
						
							
							
							
							
								
							
								da09983f9e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'weixin_guange' into cxt_course
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								
								 cxt
							
						 | 
						
							
							
							
							
								
							
								ac629440b1
								
							
								
							
						 | 
						
							
							
								
								课程邀请码
							
							
							
							
							
						 | 
						
							9 years ago | 
						
					
				
					
						
							
							
								
								 yuanke
							
						 | 
						
							
							
							
							
								
							
								c6be37020f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'cxt_course' into develop
							
							
							
							
							
							
							
							Conflicts:
	app/views/users/_reply_to.html.erb 
							
						 | 
						
							9 years ago |