sw
							
						 | 
						
							
							
							
							
								
							
								1e6693cdcf
								
							
								
							
						 | 
						
							
							
								
								1.取消软件创客界面2个个人得分显示
							
							
							
							
							
							
							
							2.修复软件创客界面用户参与课程显示不正确的BUG
3.添加获取用户参与的未过期的项目列表 
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 yanxd
							
						 | 
						
							
							
							
							
								
							
								006e4ae45e
								
							
								
							
						 | 
						
							
							
								
								user tab bar
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								 
								yanxd
							
						 | 
						
							
							
							
							
								
							
								3df986a908
								
							
								
							
						 | 
						
							
							
								
								教师列表转换排序方式后则搜索所有人员bug
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								 
								yanxd
							
						 | 
						
							
							
							
							
								
							
								2ca1362e83
								
							
								
							
						 | 
						
							
							
								
								“按用户搜索”和“搜索”的区别,分别可以搜索什么? 上面搜索删掉
							
							
							
							
							
							
							
							1、标签的格式需 要优化(所有涉及到标签的地方的标签的格式都需要调整) tag周围距离
“课程通知“应该调整到“课程作业”后面  改! 
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								 
								yanxd
							
						 | 
						
							
							
							
							
								
							
								8a3d1d033c
								
							
								
							
						 | 
						
							
							
								
								用户navbar问题,注册对齐问题
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								 
								yanxd
							
						 | 
						
							
							
							
							
								
							
								b703c65033
								
							
								
							
						 | 
						
							
							
								
								关注取消关注位置漂移
							
							
							
							
							
							
							
							个人主页学号的隐藏 
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								 
								yanxd
							
						 | 
						
							
							
							
							
								
							
								c4bf9a8f72
								
							
								
							
						 | 
						
							
							
								
								refactor gender avatar html.erb => helper
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								 
								xianbo
							
						 | 
						
							
							
							
							
								
							
								02ff8b8955
								
							
								
							
						 | 
						
							
							
								
								take off course fomre  form the projrct ehich is watched
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								 
								xianbo
							
						 | 
						
							
							
							
							
								
							
								e9856b3524
								
							
								
							
						 | 
						
							
							
								
								modify the style of the projects witch show
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 huangjingquan
							
						 | 
						
							
							
							
							
								
							
								e25425d9a7
								
							
								
							
						 | 
						
							
							
								
								用户看别人课程主页时显示问题
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 wanglinchun
							
						 | 
						
							
							
							
							
								
							
								48a0f2f409
								
							
								
							
						 | 
						
							
							
								
								个人主页,课程相关国际化
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 baiyu
							
						 | 
						
							
							
							
							
								
							
								39c45dff30
								
							
								
							
						 | 
						
							
							
								
								1、修改了注册里的问题
							
							
							
							
							
							
							
							2、作业名称改为靠左
3、修改了提交作业、参加竞赛等混乱
4、修改了top bar的字体大小 
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 baiyu
							
						 | 
						
							
							
							
							
								
							
								aefd9b545b
								
							
								
							
						 | 
						
							
							
								
								1、删除了“企业”里的“课程”
							
							
							
							
							
							
							
							2、减小了顶和踩的图标
3、更改了课程图标 
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 huangjingquan
							
						 | 
						
							
							
							
							
								
							
								cab5fb8b52
								
							
								
							
						 | 
						
							
							
								
								新的
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 huangjingquan
							
						 | 
						
							
							
							
							
								
							
								b19ed67d79
								
							
								
							
						 | 
						
							
							
								
								新的课程
							
							
							
							
							
							
							
							修改了一些bug 
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 william
							
						 | 
						
							
							
							
							
								
							
								2079c87362
								
							
								
							
						 | 
						
							
							
								
								增加tag删除。
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								 
								xianbo
							
						 | 
						
							
							
							
							
								
							
								8ff8d0f4d4
								
							
								
							
						 | 
						
							
							
								
								modify some little bug && merge  handle
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								 
								xianbo
							
						 | 
						
							
							
							
							
								
							
								806fae7b19
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop
							
							
							
							
							
							
							
							Conflicts:
	app/controllers/account_controller.rb
	app/controllers/my_controller.rb
	app/controllers/projects_controller.rb
	app/controllers/users_controller.rb
	app/helpers/projects_helper.rb
	app/helpers/users_helper.rb
	app/models/project.rb
	app/models/user.rb
	app/models/user_extensions.rb
	app/views/account/register.html.erb
	app/views/bids/_bid_show.html.erb
	app/views/bids/_history.html.erb
	app/views/bids/_project_list.html.erb
	app/views/bids/show.html.erb
	app/views/files/index.html.erb
	app/views/layouts/base_bids.html.erb
	app/views/layouts/base_users.html.erb
	app/views/my/account.html.erb
	app/views/users/watch_bids.html.erb
	config/locales/en.yml
	config/locales/zh.yml
	config/routes.rb
	db/schema.rb
	lib/redmine.rb
	public/stylesheets/application.css 
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								 
								baiyu
							
						 | 
						
							
							
							
							
								
							
								4fb040bc61
								
							
								
							
						 | 
						
							
							
								
								modify register bug
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 huangjingquan
							
						 | 
						
							
							
							
							
								
							
								3536883248
								
							
								
							
						 | 
						
							
							
								
								课程合并
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 huangjingquan
							
						 | 
						
							
							
							
							
								
							
								466922d13b
								
							
								
							
						 | 
						
							
							
								
								修改了上次会议提出的几点
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 fanqiang
							
						 | 
						
							
							
							
							
								
							
								602e3dc3fa
								
							
								
							
						 | 
						
							
							
								
								修改个人主页
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 huangjingquan
							
						 | 
						
							
							
							
							
								
							
								261c3fc337
								
							
								
							
						 | 
						
							
							
								
								new version
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 nieguanghui
							
						 | 
						
							
							
							
							
								
							
								7490806bf3
								
							
								
							
						 | 
						
							
							
								
								默认排序方式更改
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 huangjingquan
							
						 | 
						
							
							
							
							
								
							
								77a47797d2
								
							
								
							
						 | 
						
							
							
								
								user列表
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 kaizheng
							
						 | 
						
							
							
							
							
								
							
								0d447cae2c
								
							
								
							
						 | 
						
							
							
								
								活动显示分类国际化,需求反馈图标引用、删除国际化,留言图标引用、删除国际化
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 william
							
						 | 
						
							
							
							
							
								
							
								0c22d409fc
								
							
								
							
						 | 
						
							
							
								
								添加写project_status和user_status两表的方法,
							
							
							
							
							
							
							
							在关注中写这2个表,
重构了tag的过滤方法,
拿掉了user_extension.rb. 
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 fanqiang
							
						 | 
						
							
							
							
							
								
							
								c7beefa556
								
							
								
							
						 | 
						
							
							
								
								修改用户活动页面,添加了过滤功能。修改留言中引用和删除功能的显示问题
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 william
							
						 | 
						
							
							
							
							
								
							
								0ef943d5f3
								
							
								
							
						 | 
						
							
							
								
								修复因为ISSUE引起的bug;
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 fanqiang
							
						 | 
						
							
							
							
							
								
							
								69e3dcee6c
								
							
								
							
						 | 
						
							
							
								
								修改用户活动,用户主页的其他部分添加分页
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 william
							
						 | 
						
							
							
							
							
								
							
								80e74e4dd7
								
							
								
							
						 | 
						
							
							
								
								修改了一些赞的bug,添加了显示所有tag的功能。
							
							
							
							
							
						 | 
						
							12 years ago | 
						
					
				
					
						
							
							
								
								 huangjingquan
							
						 | 
						
							
							
							
							
								
							
								70b211e355
								
							
								
							
						 | 
						
							
							
								
								first commit
							
							
							
							
							
						 | 
						
							12 years ago |