Commit Graph

17672 Commits

Author SHA1 Message Date
huang b1b456e63e 项目标题去掉姓名,单词不换行 2016-11-18 16:57:45 +08:00
huang de61d699a8 Merge branch 'dev_newproject' into develop 2016-11-18 16:22:03 +08:00
huang 5f35e8bd97 修复新注册用户不能fork的问题 2016-11-18 16:20:18 +08:00
huang d48c2a36fc Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-11-18 16:09:28 +08:00
huang 6584cd88f1 pull request 使用优化 2016-11-18 16:08:50 +08:00
daiao 290a301cee Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
	public/stylesheets/css/common.css
2016-11-18 15:48:40 +08:00
daiao cd32353d91 Merge branch 'dai_ao' into develop 2016-11-18 15:45:35 +08:00
cxt 3b2e33f3ec Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-18 15:45:20 +08:00
cxt 5510df165d Merge branch 'cxt_course' into develop
Conflicts:
	db/schema.rb
2016-11-18 15:45:06 +08:00
cxt 1fcb1db27c 课程大纲下的班级归档 2016-11-18 15:34:53 +08:00
daiao 1e761081c2 我的issue样式调整 2016-11-18 14:45:42 +08:00
cxt db71b1578b 新建作业的时候,必须先选择作业类型 2016-11-18 10:43:49 +08:00
huang f87d1ce3bd ISSUE中指派者按中文姓名排序 2016-11-18 10:04:02 +08:00
daiao b8e59430e8 项目资源库,资源描述框宽度增加至800px 2016-11-18 09:46:28 +08:00
daiao 440e73ea99 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-11-18 09:36:03 +08:00
daiao 19483ee762 新建和编辑issue时,选择里程碑按创建时间的倒序排列 2016-11-18 09:35:49 +08:00
huang 00d12fdeb3 pull reqeust相关 2016-11-17 17:30:15 +08:00
daiao 8f7e6004fd 我的issue居中显示 2016-11-17 17:09:07 +08:00
cxt 4d7dbc1fc6 已发布的试卷显示提交情况 2016-11-17 17:07:01 +08:00
cxt 3ebc3c6492 老师、学生测验列表的调整 2016-11-17 17:04:00 +08:00
daiao d65a062737 所有我的issue功能 2016-11-17 17:02:02 +08:00
huang edb86615a2 个别用户修改资料500问题 2016-11-17 12:20:12 +08:00
huang 386b41d08e pull requst优化 2016-11-17 11:32:39 +08:00
cxt 6c8736bea8 加入班级时的提示修改 2016-11-17 11:10:48 +08:00
cxt efd0bf6707 删除学生/退出班级时隐藏学生作品、退出班级按钮位置调整 2016-11-17 10:23:13 +08:00
cxt 1ad0c1cbff 测验列表 2016-11-17 09:06:44 +08:00
daiao e956d20d6e 我的issue部分功能 2016-11-16 16:57:02 +08:00
huang 987b5ba6db 注释掉消息中的新闻 2016-11-16 13:54:47 +08:00
huang 75a05ba9c2 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-11-16 13:50:26 +08:00
huang 1dd97ee253 个人主页的项目收藏列表提示错误 2016-11-16 13:50:10 +08:00
daiao 12ccd69167 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-11-16 13:37:15 +08:00
daiao 05fcd32225 修复项目issue,编辑issue“完成度”为100%后,该issue历程被清空 2016-11-16 13:36:57 +08:00
daiao acffe8ec19 我的issue未完 2016-11-16 11:26:17 +08:00
cxt 2dc717df0c Merge branch 'develop' into cxt_course 2016-11-15 16:57:33 +08:00
cxt 9f79408e32 导入试卷 2016-11-15 16:57:07 +08:00
huang 5dcb99c3ad 优化projects数据库表,删除不必要的字段 2016-11-15 16:38:30 +08:00
huang 8843ff7686 质量分析公共部分封装,没有权限用户删除的时候显示灰色不可点击 2016-11-15 15:58:50 +08:00
huang 3ab5ab4e4b 代码质量分析列表优化 2016-11-15 15:34:15 +08:00
cxt 57c82effed 讨论区帖子:新建时没有字数限制,编辑时却有字数限制了,不合理 2016-11-15 15:04:24 +08:00
daiao da2273b3db Merge branch 'dev_newproject' into dai_ao 2016-11-15 14:32:37 +08:00
huang 0adde560ba 我的issue路由修改及查询修改 2016-11-15 14:30:01 +08:00
cxt f754ac870d 导航栏题库-发送:如图发送弹框中当鼠标移至下拉条时,鼠标光标不要显示成可以左右拉动的图标 2016-11-15 14:18:15 +08:00
huang 1e5d3e05ad Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-11-15 14:09:40 +08:00
huang 0ea9a49f86 质量分析界面调整 2016-11-15 14:09:25 +08:00
daiao d45b1c7d4c 我的issue 2016-11-15 14:03:57 +08:00
daiao c927a6fecc Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-11-15 13:21:37 +08:00
daiao ffe86c7ec9 项目配置删除按钮新版弹框 2016-11-15 13:21:27 +08:00
huang 11f8656651 0 2016-11-15 11:20:30 +08:00
cxt 7988257e10 项目讨论区:如图多级回复,“点击展开更多”要用新的样式 2016-11-15 11:19:31 +08:00
cxt 5d0954d108 班级申请消息通知,如图以省略号结束的消息,当鼠标移至此消息,消息应该显示完全 2016-11-15 10:54:31 +08:00