Commit Graph

875 Commits

Author SHA1 Message Date
Tim 6fbb6629d7 动态issue回复宽度扩展 2016-10-19 10:17:56 +08:00
daiao daf0263be9 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-18 17:22:52 +08:00
daiao 61ad05a379 项目配置界面 2016-10-18 17:09:00 +08:00
huang 23ff82a8cd Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-19 15:24:49 +08:00
huang b8d86fcd42 版本库界面及样式 2016-10-19 15:24:36 +08:00
huang bf3506002b Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-19 14:43:25 +08:00
huang 590e639112 新版项目issue模块 2016-10-19 14:43:07 +08:00
daiao 32c5d7a13b Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-18 15:19:34 +08:00
daiao bdbd2e9cf7 项目配置组织与里程碑界面 2016-10-18 15:17:36 +08:00
Tim 5844af922e 项目动态宽度扩展 2016-10-18 13:34:28 +08:00
Tim 622fa382ca Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-18 11:30:57 +08:00
huang fce6c407c8 Merge branch 'rep_quality' into dev_newproject
Conflicts:
	app/controllers/projects_controller.rb
	app/views/layouts/base_projects.html.erb
	app/views/projects/settings/_new_edit.html.erb
	public/stylesheets/css/project.css
2016-10-19 11:27:49 +08:00
huang cff887a2be 删除项目的时候删除版本库功能 2016-10-19 11:23:15 +08:00
huang e276559286 项目show附件类型新版块 2016-10-19 09:24:07 +08:00
huang a0811ec14c project show中添加邀请码 2016-10-19 09:14:32 +08:00
huang 207273839b Merge branch 'dev_newrep' into dev_newproject
Conflicts:
	app/controllers/projects_controller.rb
	app/views/projects/settings/_new_repositories.html.erb
2016-10-19 08:53:38 +08:00
Tim fb9e1a02df 项目动态宽度调整 2016-10-18 11:30:42 +08:00
daiao f8638d173a 项目配置,成员列表功能 2016-10-15 10:48:24 +08:00
daiao d3575b288e Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
Conflicts:
	db/schema.rb
2016-10-15 09:00:03 +08:00
daiao 5ae89613ec 项目配置成员界面 2016-10-13 16:57:43 +08:00
huang e2ee75d8c1 项目宽版架构优化(主要是model及与课程等模块的分离) 2016-10-13 10:52:48 +08:00
daiao 07b98bae5e Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-13 09:28:47 +08:00
daiao a0aa34b533 项目设置,模块页面 2016-10-13 09:28:33 +08:00
huang b9b20ccc59 项目配置,各个页面高度JS控制 2016-10-12 17:18:35 +08:00
huang 10778fabc9 新版版本库界面代码整理 2016-10-12 17:02:51 +08:00
huang 50f9c5244d 项目配置--版本库代码简化及界面 2016-10-12 16:09:17 +08:00
huang fabe6bd999 项目配置过短的时候JS控制底端留白 2016-10-12 14:38:46 +08:00
huang 2126364a19 新版项目配置及JS 2016-10-12 14:13:52 +08:00
huang 7800ba9701 项目动态头部 2016-10-12 11:09:41 +08:00
huang a206a471af Merge branch 'dev_newproject' into dev_newrep
Conflicts:
	app/controllers/repositories_controller.rb
	app/views/layouts/base_projects.html.erb
2016-10-11 10:58:37 +08:00
huang 3c15c4f315 版本库权限,及项目收藏用户列表 2016-10-11 10:03:00 +08:00
huang 188db13c33 项目导航权限判断 2016-10-11 09:31:17 +08:00
huang e9a1582b71 项目添加收藏功能 2016-10-11 09:30:45 +08:00
huang c03384f122 Merge branch 'develop' into dev_newrep 2016-10-08 17:29:59 +08:00
Tim 6e93b0dc0d 项目去掉右侧白色块后,样式调整 2016-10-08 17:08:07 +08:00
huang 84fd99ced1 项目base优化 2016-10-08 15:09:59 +08:00
huang 137d62ae5d Merge branch 'rep_quality' into dev_newrep 2016-10-08 11:14:36 +08:00
daiao acbc94af1a 项目导航栏数字错误 2016-09-30 11:24:04 +08:00
daiao 0ad71e0f64 issue列表及左侧导航栏问题跟踪的issue的所有数字统计错误 2016-09-30 11:07:22 +08:00
Tim 858348298b 项目加载慢时,有白色块显示bug修复 2016-09-29 14:24:42 +08:00
huang bd383f5010 项目历史版本库提示删除一级setting中控制权限判断 2016-09-28 16:04:53 +08:00
yuanke 3b85d9e6bd 课程、项目二级回复样式 2016-09-27 21:03:40 +08:00
huang 27f45b5ea0 Merge branch 'rep_quality' into develop 2016-09-27 20:07:34 +08:00
daiao d57f80e703 用户反馈回复 2016-09-27 20:06:48 +08:00
huang e49f9b49b2 Merge branch 'rep_quality' into develop 2016-09-27 19:48:10 +08:00
daiao 7c76584e14 issue功能优化 2016-09-27 19:44:24 +08:00
yuanke 8b8d878564 项目关注列表和成员列表调整宽度 2016-09-27 19:28:40 +08:00
huang db54d6e0d9 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
	public/stylesheets/css/project.css
2016-09-26 22:21:45 +08:00
Tim fa46916ac9 项目各界面宽度修改 2016-09-26 11:20:49 +08:00
huang a8acb4a6cb 项目base功能添加 2016-09-23 10:36:47 +08:00