Commit Graph

14278 Commits

Author SHA1 Message Date
huang 9b2d4b8a07 新建项目边框问题 2016-11-18 17:31:48 +08:00
cxt 6bb4e650c4 QQ反馈返回空白页、“返回上一页”不能点击时字体置灰 2016-11-18 17:21:23 +08:00
huang 7f1d12de04 项目版本库标题改成用户名加版本库名 2016-11-18 17:08:36 +08:00
huang b1b456e63e 项目标题去掉姓名,单词不换行 2016-11-18 16:57:45 +08:00
cxt 9a30369cef 班级作业:两种身份(助教和学生)的成员匿评扣分错误 2016-11-18 16:37:25 +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
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
huang 0adde560ba 我的issue路由修改及查询修改 2016-11-15 14:30:01 +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
huang 5f21b63c41 我的issue框架搭建 2016-11-15 10:47:07 +08:00
cxt d8906db1aa 班级学生列表:“未分班”列表对成员分班,成员显示未自动刷新;具体分班列表对成员编辑分班,分班成员数统计未自动刷新 2016-11-15 10:34:14 +08:00
yuanke 19e2c34917 测试代码还原 2016-11-15 10:33:28 +08:00
yuanke 85938bf3f1 测试 2016-11-15 09:28:42 +08:00
yuanke e33146813d 加日志测试 2016-11-15 09:25:58 +08:00
huang e9ec3ca258 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-11-15 09:02:15 +08:00
huang 3561009efc Merge branch 'develop' into dev_newproject 2016-11-15 09:01:45 +08:00
cxt ef9b389cfc 作业动态报500 2016-11-14 17:32:18 +08:00
daiao 442be21a30 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-11-14 16:48:22 +08:00
daiao 98849931d6 项目新建/编辑issue,调整“里程碑”提示 2016-11-14 16:47:45 +08:00
cxt 5605a9e638 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-14 16:37:54 +08:00
cxt edf8ceed7c 取消收藏的班级和项目动态不显示 2016-11-14 16:37:42 +08:00
huang ddb747bfcb 解决login中带特殊字符的问题 2016-11-14 16:35:15 +08:00
huang 2b1a73e692 解决用户登录名的.号问题 2016-11-14 16:33:49 +08:00
huang 695ce6c2e4 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-11-14 16:07:16 +08:00
huang f08b04d645 My Issue未完 2016-11-14 16:06:54 +08:00
cxt b06dcc9db4 780班级访问分班报500 2016-11-14 15:38:00 +08:00
cxt 0ed878e718 404、403、500页面 2016-11-14 15:36:36 +08:00
yuanke 5134418388 Merge branch 'yuanke_youhua' into develop 2016-11-14 15:14:05 +08:00
cxt 96bc35552a 未收藏的班级和项目动态不显示 2016-11-14 15:11:37 +08:00
daiao f4df8716d3 issue查看页,新增新建按钮 2016-11-14 13:28:41 +08:00
yuanke 5fd00ae472 关注官方微信改为关注微信APP 2016-11-14 10:35:40 +08:00
yuanke d0abc8d3ad Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-11 19:52:38 +08:00
yuanke 369f6eb9f7 微信动态不显示的BUG修复 2016-11-11 19:52:30 +08:00
cxt a2b0717aaa Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-11 18:41:36 +08:00
cxt 3aec93e5e4 分组作业的作品列表展开/收起 2016-11-11 18:41:29 +08:00
cxt a831be59d0 匿评时点击姓名和关联的项目应打开作品详情 2016-11-11 18:31:00 +08:00
huang 5104340b78 Merge branch 'dev_newproject' into develop 2016-11-11 18:21:29 +08:00
huang 6752b8fa62 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-11 18:19:19 +08:00
huang d1f9ce3ab2 课程中资源库导入不能用 2016-11-11 18:19:03 +08:00
cxt 809cb5a344 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-11 18:12:31 +08:00
cxt acfbe6f03e 某用户为某班级的助教和学生两种角色成员,当前身份是助教,点击个人主页“我的作业”,如图对应的班级作品显示的却是“提交作品”-》 “查看作品” 2016-11-11 18:12:22 +08:00
huang 561c96b485 用户图像下拉列表中我的课程、组织链接改成登录名 2016-11-11 18:02:17 +08:00
daiao 753da4b078 点击用户将id改为用户名 2016-11-11 17:59:34 +08:00
huang e6354c82cf Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-11 17:57:45 +08:00
huang bb871b5a77 个人主页 博客 粉丝 关注url的id改成登录名 2016-11-11 17:57:31 +08:00
cxt 6ee9b12c5d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-11 17:55:32 +08:00
cxt c352fb5604 学生列表的删除和编辑按钮的对齐显示、删除学生时刷新班级头部的学生数 2016-11-11 17:55:25 +08:00
huang 7e762a42ed 用户动态部分url的id改成登录名 2016-11-11 17:50:42 +08:00
cxt 18bfb26689 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-11 17:38:25 +08:00
cxt e1c216ef80 班级导入问卷不可用 2016-11-11 17:38:19 +08:00
daiao 1ec0100386 项目简介样式调整,并且输入网页能点击 2016-11-11 17:35:11 +08:00
cxt 4a266b33e6 新建课程增加示例,并追加班级的说明tip 2016-11-11 17:26:38 +08:00
huang d040d2efd1 版本库添加返回上一级目录 2016-11-11 17:21:18 +08:00
cxt ec36b07aab 分班名称编辑后,如图班级左侧导航处未自动刷新 2016-11-11 17:05:47 +08:00
huang b944a4a5c6 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-11 17:00:10 +08:00
huang 9113c93e49 项目成员列表点击跳入新的页面 2016-11-11 16:59:34 +08:00
cxt 93c10515df Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-11 16:59:28 +08:00
cxt 7298e983fa 如图课程大纲中“加入班级”,输入错误的邀请码,提示“您加入的班级不存在”不合理,应该是“您输入的邀请码错误” 2016-11-11 16:59:15 +08:00