Commit Graph

9402 Commits

Author SHA1 Message Date
Tim 5adc4e1e5a 项目issue上传附件与填写正确加间距 2016-07-20 16:41:53 +08:00
Tim bf87ffb992 组织历史版本弹框文件夹图标问题 2016-07-20 16:21:58 +08:00
Tim 78e4d37d8b 大纲base页引入弹框样式;作业列表调整 2016-07-20 15:09:01 +08:00
Tim eb503cc3e8 Merge branch 'develop' into cs_optimize_txz 2016-07-19 16:50:30 +08:00
huang 26d4be6518 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
	db/schema.rb
2016-07-19 15:25:54 +08:00
huang 1a129722eb Merge branch 'rep_quality' into develop 2016-07-19 15:25:13 +08:00
huang 4e3bfd9254 some bugs for sonar show 2016-07-19 11:17:54 +08:00
huang c50ca34b0e 代码质量分析部分数据转换成整型 2016-07-19 09:48:02 +08:00
Tim 1fc2bbd56a 作业资源库弹框,资源名称与上传者栏增加宽度限制 2016-07-19 09:17:20 +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 412d74e295 优化最近动态获取方法 2016-07-18 13:57:00 +08:00
yuanke 6ae57ef23a Merge branch 'weixin_guange' into develop 2016-07-15 19:53:33 +08:00
guange c14979d878 assets 2016-07-15 19:53:38 +08:00
cxt c9e0143fe8 作业动态的时间 2016-07-15 19:36:46 +08:00
yuanke ba1af901ad 强制更新myresource.js 2016-07-15 17:39:21 +08:00
cxt 48e5a0be7e Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
	db/schema.rb
2016-07-15 17:38:56 +08:00
cxt fcc8a08138 课程列表的样式问题 2016-07-15 17:38:10 +08:00
huang 4c5052dce2 作业按更新时间排序 2016-07-15 17:28:57 +08:00
cxt 5b070b6acc 消息列表的html标签 2016-07-15 16:52:18 +08:00
huang f9e03434c2 Merge branch 'develop' into rep_quality 2016-07-15 16:51:31 +08:00
yuanke 60dc0e72cf 微信我我的资源更多按钮显示 2016-07-15 16:46:27 +08:00
yuanke 0a1ecd65e8 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
	db/schema.rb
2016-07-15 16:31:42 +08:00
huang b2a8a0fed6 修复里程碑进度条数据显示错误的问题 2016-07-15 16:28:33 +08:00
cxt 1c967ce569 Merge branch 'rep_quality' into develop
Conflicts:
	app/views/users/_user_message_system.html.erb
	app/views/users/_user_message_userfeedaback.html.erb
2016-07-15 15:53:32 +08:00
cxt 11e0101f56 导航栏题库中 我的题库放在前面 2016-07-15 15:06:33 +08:00
guange dd892993dd assets 2016-07-15 14:49:23 +08:00
cxt b7e6725e1f 管理员界面的课程名称双击可点击 2016-07-15 14:48:39 +08:00
guange 0e415fffff merge 2016-07-15 14:48:10 +08:00
huang 4e3a7e8df1 新建版本“日期”--》“截止日止” 2016-07-15 14:11:51 +08:00
huang 77e4a66e7e 模式切换刷新后引起的样式问题 2016-07-15 13:50:15 +08:00
cxt fd68479d72 课程/项目/组织资源库发送资源、问答区帖子发送、通知发送、新闻发送、动态中发送到课程改为班级 2016-07-15 11:02:53 +08:00
huang 97b1ea22e7 解决:Firefox浏览器中:资源库,先点击资源描述编辑图标按钮(笔),再点击页面空白处,如图两个资源之间有一段空白 2016-07-15 10:51:44 +08:00
cxt 7ea5d7d934 新建班级页面,提示“如果列表中没有对应的课程,请您先创建课程”始终显示 2016-07-15 10:21:59 +08:00
Tim 2d1d3083d0 引入project.css 2016-07-15 09:51:14 +08:00
yuanke 6ab1269c01 修改微信反馈框加入重复班级提示有误的问题 2016-07-15 09:16:37 +08:00
cxt b77779ca55 文章的二级回复和组织帖子的二级回复 2016-07-14 17:23:48 +08:00
yuanke d50fd40307 Merge branch 'weixin_guange' into develop 2016-07-14 17:19:47 +08:00
Tim c41a116378 博客上传附件后,编辑处文件夹图标显示;大纲引用css样式更改 2016-07-14 17:00:38 +08:00
huang 7da67350fd issue列表进入详情页面,弹出新页面 2016-07-14 15:31:25 +08:00
huang e98d7a213f 系统消息点击跳转列表定位 2016-07-14 15:23:16 +08:00
huang f7c9bc0a19 消息跳转定位 2016-07-14 15:04:58 +08:00
cxt e19efc1c8a 博客的二级回复 2016-07-14 14:44:47 +08:00
huang 3485d48163 Merge branch 'develop' into rep_quality
Conflicts:
	app/controllers/quality_analysis_controller.rb
2016-07-14 14:08:03 +08:00
huang 8c6fca87c9 项目动态中,新闻添加快捷操作,所有操作默认显示 2016-07-14 13:57:06 +08:00
huang 00c414c347 issue回复填写正确的样式问题 2016-07-14 11:14:05 +08:00
Tim fdf147326c Merge branch 'develop' into cs_optimize_txz 2016-07-14 11:01:12 +08:00
huang 9b59ca20de 修复issue详情页面,删除回复后再编辑保存issue弹出白色框问题 2016-07-14 10:39:54 +08:00
cxt ded8f48d34 博客的二级回复 2016-07-13 15:20:39 +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