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

455 Commits

Author SHA1 Message Date
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
huang 6ece9c0463 性能优化 2016-09-28 10:40:56 +08:00
huang 9a89590ca9 issue总数实时刷新 2016-09-28 09:33:31 +08:00
huang 7ef7c0c6f0 issue过滤条件导出功能 2016-09-27 19:41:10 +08:00
huang 19c1a0d843 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-09-27 18:01:41 +08:00
huang b96ab3676c issue过滤条件 2016-09-27 18:01:26 +08:00
daiao 8fb440c593 项目issue功能修改 2016-09-27 17:01:04 +08:00
daiao a020ab8cd3 Issue导出excel带html标签问题 2016-09-27 14:27:32 +08:00
daiao 871b228743 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-09-27 10:48:51 +08:00
daiao 1c33e6481f 问题issue列表及其动态的目标版本改为里程碑， 2016-09-27 10:48:39 +08:00
huang ca30aefced Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-09-27 10:38:47 +08:00
huang a06b5f0bb9 去掉不需要评审 2016-09-27 10:38:35 +08:00
daiao 50741ad2a6 选中日期后，点清除或所有失效的问题 2016-09-27 09:57:44 +08:00
daiao b2ed335146 修改issue指派给我名称显示问题 2016-09-27 09:16:11 +08:00
guange 433f42edbf . 2016-09-26 21:58:59 +08:00
huang 5531a236fa 统计数字实时刷新 2016-09-26 21:02:12 +08:00
daiao 0ec1ecc2bf issue功能优化 2016-09-26 16:22:14 +08:00
daiao 617565bf1f 项目issue功能调整 2016-09-25 16:05:04 +08:00
daiao a8ed5ebb63 项目issue功能，增加所有人与完成度筛选条件 2016-09-25 14:35:38 +08:00
daiao 144814c11c 按开始时间与结束时间筛选 2016-09-23 20:19:47 +08:00
huang 222ef3c6af 添加过滤条件 2016-09-23 19:36:43 +08:00
huang a3230a6bf0 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-09-23 17:48:06 +08:00
huang 6d419efaec issue列表修改 2016-09-23 17:47:53 +08:00
daiao 73089e6a6a issue开始时间与结束时间改动 2016-09-23 17:23:12 +08:00
daiao e998ffec95 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-09-23 14:53:46 +08:00
daiao 7b5fc8b323 issues列表功能 2016-09-23 14:53:36 +08:00
huang 56ac8b61c9 issue列表过滤条件 2016-09-23 14:51:44 +08:00
daiao 8336fb2684 项目issue功能 2016-09-23 11:31:23 +08:00
daiao e16b5b2f5d issue界面功能调整 2016-09-23 09:27:34 +08:00
daiao 1da7b79cfb Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-09-23 09:05:37 +08:00
daiao b300c85227 issue界面功能调整 2016-09-23 09:05:26 +08:00
Tim cda32cdda9 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-09-22 17:10:34 +08:00
daiao d0ae48bbf1 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-09-22 16:13:45 +08:00
daiao aacac0aa02 里程碑相关样式修改 2016-09-22 16:12:32 +08:00
huang de0f49f850 ISSUE列表添加新的分页 2016-09-22 14:38:45 +08:00
huang 80105181ce issue中我的issue，指派给我的issue和全部issue js实现 2016-09-22 13:41:46 +08:00
Tim c718cb2144 新建issue时，增加评审，来源，实际工时选项 2016-09-21 15:27:32 +08:00
huang 2ae7dd0087 项目issue导出excel功能 2016-09-21 10:18:40 +08:00
daiao 43a3ad1ce8 问题跟踪作者下拉列表由登录名改为用户姓名 2016-09-18 09:38:02 +08:00
daiao 3e38b09219 修复：项目动态附件，组织列表，贴吧列表交流，贴吧吧主，贴吧发帖人，贴吧最后回复，详情页面问题跟踪，项目动态的指派的地方的用户改为显示用户姓名 2016-09-14 10:42:30 +08:00
daiao 8626692367 项目issue：编辑issue后点击确定按钮，却还是返回的编辑模式 2016-09-13 14:47:05 +08:00
daiao 75908f976c Merge branch 'dev_shcool' into develop 2016-09-09 17:23:45 +08:00
daiao f9a905a344 issue详情页面回复，点击附件直接下载（应该是预览） 2016-09-09 17:22:10 +08:00
huang 7899bfe985 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/views/issues/_form.html.erb
	db/schema.rb
 2016-09-09 16:00:05 +08:00
daiao 89f3e0ee0d 项目iuss:编辑issue时，弹出空白弹框的问题 2016-09-09 14:43:47 +08:00
daiao 4959910ebe ucloud无法发布新issue 2016-09-09 14:20:56 +08:00
daiao d9ad0fa1d7 issue详情界面回复之后，图片附件是下载，而不是放大 2016-09-09 10:39:39 +08:00
huang 08c64d2ac7 解决新建及复制issue时点击取消没反应的问题 2016-09-08 15:38:01 +08:00
cxt 4c59acf5a3 issue编辑后点赞按钮不见了 2016-08-31 15:04:56 +08:00
cxt 9b3e1e0275 Merge branch 'develop' into cxt_course 2016-08-31 15:02:13 +08:00
cxt 623dadaea1 回复的删除按钮当鼠标放上去才显示 2016-08-30 14:12:50 +08:00
cxt eb255d84b1 issue详情页里的点赞刷新 2016-08-29 16:25:30 +08:00
cxt 0b0a23f270 issue详情页面的点赞 2016-08-29 14:26:25 +08:00
cxt 72977886c7 Merge branch 'cs_optimize_txz' into cxt_course 
Conflicts:
	app/views/layouts/_course_base_info.html.erb
 2016-07-29 19:37:15 +08:00
huang b1f69140c7 issue用户添加链接，issue链接颜色修改 2016-07-27 14:47:13 +08:00
huang d51295127d issue删除回复删除附件的问题 同事关联删除 2016-07-26 16:13:20 +08:00
huang e7f862458f issue回复问题； 二级回复编辑issue弹空白框问题 2016-07-26 12:06:54 +08:00
cxt 71b5fe1273 Merge branch 'develop' into cxt_course 
Conflicts:
	app/controllers/issues_controller.rb
	app/views/issues/_issue_replies.html.erb
	app/views/issues/_issue_reply_ke_form.html.erb
	db/schema.rb
 2016-07-21 14:31:43 +08:00
cxt f3c95906d8 项目缺陷的二级回复 2016-07-21 10:30:48 +08:00
Tim 635b3beb32 新建issue版本图标问题 2016-07-20 16:46:58 +08:00
Tim e966972750 Merge branch 'develop' into cs_optimize_txz 
Conflicts:
	app/views/versions/index.html.erb
 2016-07-18 14:32:17 +08:00
huang 00c414c347 issue回复填写正确的样式问题 2016-07-14 11:14:05 +08:00
huang 9b59ca20de 修复issue详情页面，删除回复后再编辑保存issue弹出白色框问题 2016-07-14 10:39:54 +08:00
huang 61bf6604b1 解决ajax情况下，issue状态选框不显示问题 2016-07-13 12:23:28 +08:00
huang ef931d1491 编辑issue，与回复issue冲突问题（局部刷新） 2016-07-13 12:07:27 +08:00
Tim b02c1b5995 提交与取消按钮之间增加间距；新建问卷"选项D"文字折行；日历图标样式调整，问题跟踪日历前input宽度缩减； 2016-07-07 15:08:34 +08:00
Tim 75475b6058 个人主页，课程，项目样式更新 2016-07-06 15:43:48 +08:00
yuanke c51c73f225 所有回复添加未登录提示 2016-06-17 14:31:14 +08:00