Commit Graph

17356 Commits

Author SHA1 Message Date
cxt 26d36358a9 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-10-27 15:12:00 +08:00
cxt c79676d426 问卷的上移、下移 2016-10-27 15:11:52 +08:00
huang 86c977ca2d issue为空是时候导出不显示 2016-10-27 15:10:52 +08:00
Tim c7c73ccfcb 多选题默认限制为空 2016-10-27 15:10:23 +08:00
Tim ae0db01569 插入题目菜单显隐控制;多选题答题限制js 2016-10-27 15:07:46 +08:00
huang f0b43a603e issue详情中样式问题 2016-10-27 15:04:20 +08:00
huang ec5645fc66 完成项目动态中样式别别的地方冲突问题 2016-10-27 14:57:12 +08:00
Tim c58fb36f44 在线测验单选、多选、填空题显示调整 2016-10-27 14:31:14 +08:00
yuanke 5d3ab1bb09 优化头像地址获取代码、屏蔽头像card代码 2016-10-27 14:30:07 +08:00
cxt a00fd27eee 问卷调整 2016-10-27 13:57:03 +08:00
yuanke 5595b45670 代码查重结果中加一行提示 2016-10-27 13:51:12 +08:00
huang d8f30f4dbe Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-27 12:39:56 +08:00
huang 05b206a7cf 收藏者列表 2016-10-27 12:39:44 +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
huang 0272e95eb7 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-27 11:17:15 +08:00
huang c4b32438ee 动态样式冲突问题 2016-10-27 11:16:51 +08:00
daiao d9189487e3 Isuue新建里程碑弹框 2016-10-27 11:15:28 +08:00
cxt 5d7af65bac 问卷调查显示页面的调整 2016-10-27 10:55:12 +08:00
Tim 97f35d1cc9 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-27 10:53:10 +08:00
Tim e035316cc7 里程碑,版本库table宽度限制 2016-10-27 10:53:01 +08:00
cxt f3d67dc26a 问卷类型按创建顺序排列 2016-10-27 10:12:50 +08:00
huang 3cc9899e5d Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-27 10:10:18 +08:00
huang 03bfbf777a pull request 添加一些判断 2016-10-27 10:10:06 +08:00
Tim e3fc304d35 项目动态回复栏展开更多时,回复框宽度扩展问题 2016-10-27 10:06:58 +08:00
yuanke 1d674e0f6e 修改资料界面修改 2016-10-27 09:46:59 +08:00
Tim 409dc30e78 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-27 09:44:35 +08:00
Tim 2823ea4182 项目成员列表和关注列表增宽 2016-10-27 09:44:20 +08:00
huang 0e15ac00be 动态中链接为空问题 2016-10-27 09:27:48 +08:00
cxt 8cccaba9f3 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
	public/stylesheets/css/courses.css
2016-10-27 09:04:39 +08:00
Tim acda8ca15c 单选题增加操作栏;多选题增加选项上下限;数字随选项数实时变化js实现 2016-10-27 09:02:56 +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 7a1177c199 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-26 19:09:30 +08:00
daiao c7bd0ea802 除去新建项目第二栏,配置页面上传图片隐藏 2016-10-26 19:09:16 +08:00
huang 7c0ff4bbe2 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-26 18:39:48 +08:00
huang 5c31a5379e 里程碑添加删除功能 2016-10-26 18:39:14 +08:00
daiao 7fd1beb8d0 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-26 18:04:25 +08:00
daiao 3080c8ff09 里程碑列表,新建弹框 2016-10-26 18:04:12 +08:00
huang 17a9d0f174 配置中用户链接 2016-10-26 17:51:06 +08:00
yuanke ad1f59b45e . 2016-10-26 17:26:53 +08:00
yuanke 156d74d9b0 调试 2016-10-26 17:26:16 +08:00
yuanke 27b12a4f43 . 2016-10-26 16:41:17 +08:00
huang a83f5317bb 里程碑列表页面添加删除 2016-10-26 16:28:40 +08:00
cxt 00f8c9ec0b Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-10-26 16:13:07 +08:00
cxt 51e422c1a6 个人留言、课程留言的主留言增加自动保存 2016-10-26 16:12:51 +08:00
yuanke ca5e47b705 修改delay_job时间上限 2016-10-26 16:09:31 +08:00
huang c76b0d75f8 setting中新建里程碑bug 2016-10-26 16:01:20 +08:00
huang f22b9eb35b pull request用户链接处理 2016-10-26 15:45:47 +08:00
huang 68ff26e3ef Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-26 15:41:07 +08:00
huang 7035dab4ce pull request 提交动态按天排序 2016-10-26 15:40:44 +08:00