Commit Graph

316 Commits

Author SHA1 Message Date
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
cxt c0d167d2e2 项目缺陷动态的回复不显示 2016-06-08 15:23:19 +08:00
huang a60356091b issue中添加类型tag 2016-05-23 11:02:21 +08:00
yuanke ded5f8f861 页面中显示KE内容的地方都加上自动识别网址的函数 2016-05-20 15:30:25 +08:00
txz 9b55d8b527 微信版标题显示不完整 2016-05-10 14:06:34 +08:00
alan 66d2558f87 修复《issue具体页面样式》 2016-03-18 15:58:23 +08:00
alan 6f5a4d429d 修改《issue详情页面样式乱了》 2016-03-17 21:17:30 +08:00
alan 4d82f0c959 在个人动态、项目动态以及项目问题跟踪页面《issue动态要右上角显示功能菜单》 2016-03-16 16:03:53 +08:00
luoquan 1900a824e8 0 2016-03-11 14:39:17 +08:00
yuanke 7f7979e955 修改回复时可多次点击发送按钮的问题。 2016-03-10 15:12:16 +08:00
Tim b376c5c6cd 版本库和问题跟踪的function样式冲突 2016-02-24 15:47:30 +08:00
ouyangxuhua f785277d42 解决回复框工具栏乱码、组织子域名等问题 2016-02-23 16:17:14 +08:00
cxt cb2fdc7388 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
	app/views/words/create_reply.js.erb
2016-02-02 15:57:23 +08:00
guange f3a0e71cee issue中回复at列表不正常 2016-02-02 11:38:04 +08:00
ouyangxuhua cdd997e45e kindeditor回复框修改 2016-02-01 14:50:45 +08:00
ouyangxuhua dc3278274d 修改kindeditor的工具栏 2016-01-29 16:55:07 +08:00
huang 007afa8c4f issue在动态中回复自动刷新 2016-01-22 19:34:02 +08:00
huang faf1fcaf22 issue回复局部刷新
附件浏览问题
昵称改成登录名
2016-01-22 17:27:21 +08:00
huang edd198e91f issue刷新 2016-01-22 14:21:17 +08:00
Tim a3c30ee965 issue上传附件样式修改 2016-01-19 17:31:59 +08:00
huang f52e74da61 修改issues总数读取方式 2016-01-15 16:11:26 +08:00
cxt a3a16b5591 问题跟踪、作业列表页面“展开更多”改为“点击展开更多” 2016-01-11 10:21:42 +08:00
huang f9bc1efd7c issue编辑的时候ajax刷新附件 2016-01-08 21:18:08 +08:00
huang 5b9be0bb11 Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
	db/schema.rb
	public/stylesheets/public.css
2016-01-08 18:11:54 +08:00
cxt 7d663ce66f 动态内容统一高度 2016-01-08 14:53:12 +08:00
huang 6a9dc43d03 版权修改、issue编辑 2016-01-08 14:42:28 +08:00
huang b79a50ce2f issue回复添加附件 2016-01-04 12:33:43 +08:00
huang 0541294c33 为解决完:
1、user_message_system附件显示问题
2、issue回复添加附件问题
2015-12-31 17:08:27 +08:00
huang 743950d264 Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop 2015-12-29 18:13:15 +08:00
huang 0763963ca4 格式 2015-12-29 18:12:14 +08:00
cxt c3ddbcfddf Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2015-12-29 16:33:32 +08:00
lizanle 5ce9a5109d issue存在重复 2015-12-28 16:55:46 +08:00
huang af9bc9a124 解决版本库点击新增版本版本信息丢失 2015-12-28 15:09:41 +08:00
huang 77722f0211 修改issue中ke高度 2015-12-28 14:52:36 +08:00
cxt 8ed01bf572 issue列表报500 2015-12-25 17:16:47 +08:00
cxt 1623d846f4 动态的展开更多改成点击展开更多 2015-12-22 15:14:03 +08:00
lizanle 31cbf3fbce onchange函数去掉 2015-12-21 11:19:34 +08:00
lizanle 60381fded5 表单长度对齐 2015-12-21 11:14:27 +08:00
lizanle 538c64329f issue的修改 2015-12-21 09:26:56 +08:00
guange d0e139650f issue回复的at出错 2015-12-18 16:50:44 +08:00