jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
17,487 Commits 98 Branches 0 Tags 0 B
Commit Graph

422 Commits

Author SHA1 Message Date
daiao e70c66b5ac Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 
Conflicts:
	app/views/projects/_act_issues.html.erb
 2016-11-07 13:30:15 +08:00
daiao 8b5879217d 调整新建项目issue页面 2016-11-07 13:28:50 +08:00
huang 3e497d8621 Merge branch 'dev_newproject' into develop 2016-10-28 18:48:13 +08:00
daiao 34bcfd14b1 新建ISSUE选择提示修改 2016-10-28 18:47:23 +08:00
daiao d6927f1598 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-28 18:05:10 +08:00
daiao de63f6fbbc issue 指派给为空时，样式错误 2016-10-28 18:04:56 +08:00
huang d76ce0706e 统计页面JS实现 2016-10-28 18:04:49 +08:00
huang 27cbfc712f Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-28 16:39:32 +08:00
daiao 1279c27ffd Issue统计页面 2016-10-28 16:38:53 +08:00
huang bab1cbea5d 新建issue里程碑不能选中的问题 2016-10-28 15:55:55 +08:00
daiao 79df11bc0c 项目Isuue列表，鼠标经过时，编辑与删除展示；配置成员中，点击编辑角色后，增加失去焦点属性。 2016-10-28 15:30:03 +08:00
daiao 2aa1a3b8c9 issue列表最后一条issue下方的线条有两根，请去除虚线 2016-10-28 12:26:07 +08:00
daiao 9749d11314 Issue列表，点击清楚按钮Tab页错误的问题 2016-10-28 10:46:33 +08:00
daiao 45f8b18270 Issue列表样式调整 2016-10-28 10:39:09 +08:00
huang 03b8d081ce 一些细节的修改 2016-10-28 09:43:30 +08:00
huang ee275455de 各个页面里程碑的新建跳转 2016-10-27 16:33:00 +08:00
huang f0b43a603e issue详情中样式问题 2016-10-27 15:04:20 +08:00
huang ec5645fc66 完成项目动态中样式别别的地方冲突问题 2016-10-27 14:57:12 +08:00
daiao 025ec0c9f1 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 
Conflicts:
	app/views/issues/index.html.erb
 2016-10-27 11:17:23 +08:00
daiao d9189487e3 Isuue新建里程碑弹框 2016-10-27 11:15:28 +08:00
huang 8a41bc0b23 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-26 19:12:18 +08:00
huang 5368d6755e 没有数据可供显示提示 2016-10-26 19:11:50 +08:00
daiao c7bd0ea802 除去新建项目第二栏，配置页面上传图片隐藏 2016-10-26 19:09:16 +08:00
daiao 2608348c92 项目Issue列表样式调整 2016-10-25 16:38:45 +08:00
daiao 9042304794 项目ISSUE编辑和新建页面 2016-10-25 15:37:49 +08:00
daiao a0ba21b397 新版Issue编辑和新建页面 2016-10-25 11:23:02 +08:00
daiao 1652ec9195 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-25 09:28:28 +08:00
daiao e3f0f222e6 新版Issue新建页面 2016-10-25 09:28:09 +08:00
Tim 1023f5301e 讨论区列表、讨论区详情、讨论区回复宽度扩展 2016-10-25 09:11:56 +08:00
yuanke 1f0e8649b9 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-21 14:07:14 +08:00
yuanke 8e35158fe9 增加统计功能 2016-10-21 14:06:45 +08:00
huang 6b8184ed49 issue模块新版二级回复ajax刷新 2016-10-21 13:27:41 +08:00
huang 3ccff07bf0 项目动态issue模块删除的时候样式 2016-10-21 11:26:15 +08:00
Tim f4690f0cab 回复，二级回复，删除时，回复框宽度控制 2016-10-21 11:09:54 +08:00
Tim af5db3713c issue详情页面，属性页面，回复页面，二级回复页面宽度调整 2016-10-19 14:57:31 +08:00
huang 5532ec3b86 Merge branch 'develop' into dev_newproject 
Conflicts:
	app/views/issues/index.html.erb
	app/views/layouts/base_projects.html.erb
	public/stylesheets/css/project.css
 2016-10-15 10:53:01 +08:00
huang caa54c77a2 解决issue的冲突 2016-10-14 16:00:40 +08:00
huang b9d87b1b29 Merge branch 'develop' into rep_quality 
Conflicts:
	public/stylesheets/css/project.css
 2016-10-14 15:43:45 +08:00
daiao 2324ad31e2 Merge branch 'develop' into dev_newproject 
Conflicts:
	app/views/issues/index.html.erb
	public/stylesheets/css/common.css
	public/stylesheets/css/project.css
 2016-10-13 17:00:53 +08:00
yuanke bb0833c054 issue 2016-10-13 14:51:35 +08:00
yuanke 7dc0ba005e Merge branch 'dev_shcool' into develop 
Conflicts:
	app/views/issues/index.html.erb
	app/views/users/_course_newslist.html.erb
 2016-10-13 14:37:37 +08:00
huang 39cc6c36ea issue详情显示调整 2016-10-13 10:17:54 +08:00
daiao 9b5999eed1 项目Issue列表功能 2016-10-12 16:27:50 +08:00
huang 7e0a5952f2 issue列表新界面 2016-10-11 10:24:38 +08:00
cxt ec0d21b243 戴傲项目相关 2016-09-30 17:27:30 +08:00
Tim daa887fe0a issue列表样式调整 2016-09-28 16:56:46 +08:00
Tim 3f559a04bb issue列表边框颜色更改；issue题目宽度增长；回复数和编辑删除位置调整及显隐js实现 2016-09-28 15:20:42 +08:00
huang b8ab3dc497 点数字不还原 2016-09-28 11:39:11 +08:00
huang b573563a52 Merge branch 'rep_quality' into develop 2016-09-28 10:59:55 +08:00
daiao b22b444a7b 修改issue开始时间与结束时间判断，并将导出excel的作者改为发布人 2016-09-28 10:58:31 +08:00