Commit Graph

1789 Commits

Author SHA1 Message Date
daiao 609d1d2fb4 新建和编辑issue时,里程碑被清空的bug 2016-11-18 21:19:34 +08:00
cxt 003c6a7551 新建作业初始显示调整 2016-11-18 18:37:41 +08:00
huang de61d699a8 Merge branch 'dev_newproject' into develop 2016-11-18 16:22:03 +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
cxt db71b1578b 新建作业的时候,必须先选择作业类型 2016-11-18 10:43:49 +08:00
huang f87d1ce3bd ISSUE中指派者按中文姓名排序 2016-11-18 10:04:02 +08:00
daiao d65a062737 所有我的issue功能 2016-11-17 17:02:02 +08:00
huang 386b41d08e pull requst优化 2016-11-17 11:32:39 +08:00
daiao e956d20d6e 我的issue部分功能 2016-11-16 16:57:02 +08:00
daiao acffe8ec19 我的issue未完 2016-11-16 11:26:17 +08:00
cxt acfbe6f03e 某用户为某班级的助教和学生两种角色成员,当前身份是助教,点击个人主页“我的作业”,如图对应的班级作品显示的却是“提交作品”-》 “查看作品” 2016-11-11 18:12:22 +08:00
huang f71a21155f Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-11 16:54:47 +08:00
huang a655e73c50 配置中成员链接改成登录名 2016-11-11 16:54:24 +08:00
cxt cb5ca96bb5 Merge branch 'cxt_course' into develop
Conflicts:
	app/views/users/_course_homework.html.erb
	db/schema.rb
2016-11-11 16:53:20 +08:00
daiao 812c74134a Merge branch 'develop' into dev_newproject 2016-11-11 14:55:29 +08:00
daiao 5742a9951e 项目-配置-成员,翻页时,当前页用蓝色颜色标识 2016-11-11 13:44:39 +08:00
huang aab24ea34a 解决顶部fork路由错误,已经fork过该项目的添加提示 2016-11-11 10:37:20 +08:00
cxt 0d8d2fbc90 班级活跃度排行去除老师和教辅 2016-11-11 09:29:29 +08:00
cxt 1e0c2e5d6a 班级首页的活跃度和英雄榜由3个增加到6个 2016-11-10 17:28:14 +08:00
huang 0f328c9c58 解决用户ID转换成用户名后引发的问题 2016-11-10 10:27:57 +08:00
cxt 070e18a9b2 作业动态优化 2016-11-08 15:39:00 +08:00
cxt 70a6a26819 班级作业:分组作业,开启了匿评后,某组再加了某组员,如图该组员看到的作业列表中不应该是“作品匿评” 2016-11-07 14:38:10 +08:00
cxt 78ca68b5e3 Merge branch 'cxt_course' into develop
Conflicts:
	public/stylesheets/css/moduel.css
	public/stylesheets/css/public.css
2016-11-04 16:15:56 +08:00
cxt d762c68f7b 分组作业的页面显示和评分处理调整 2016-11-04 16:10:13 +08:00
cxt 6f1c648770 班级作业:修改评分后,同一人的之前的评分,就不显示了 2016-11-04 11:27:15 +08:00
huang 69bd89761d 解决编码问题 2016-11-03 16:19:04 +08:00
cxt 4575b8274e 不限定匿评人数 2016-11-03 10:25:53 +08:00
cxt fea07e07c1 分组作业:基本作业编辑为分组作业后,组长提交作品的时候不能添加组员 2016-11-02 17:17:12 +08:00
huang 03dba25ab7 项目增加fork于某项目功能 2016-11-01 16:34:05 +08:00
huang b27dca74b5 消息中申请后的冒号改成中文 2016-11-01 15:06:08 +08:00
huang f0a713f54e 解决部分项目提交数为0的问题,版本库登录名改成中文姓名 2016-11-01 14:54:29 +08:00
huang b5b6f49d7c 项目版本库提供时间显示 2016-11-01 12:17:52 +08:00
huang a2a40558f1 项目新建添加KE及样式调整 2016-10-31 14:39:50 +08:00
huang 27cbfc712f Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-28 16:39:32 +08:00
yuanke 93ed72fb59 Merge branch 'cxt_course' into develop
Conflicts:
	db/schema.rb
2016-10-28 15:57:53 +08:00
cxt 4d88fe727b 问卷 2016-10-28 15:42:45 +08:00
daiao 79df11bc0c 项目Isuue列表,鼠标经过时,编辑与删除展示;配置成员中,点击编辑角色后,增加失去焦点属性。 2016-10-28 15:30:03 +08:00
yuanke abbf39848b Merge branch 'yuanke_youhua' into develop 2016-10-28 13:23:59 +08:00
huang 3ef90a3c62 Merge branch 'dev_newproject' into develop
Conflicts:
	db/schema.rb
2016-10-27 17:33:28 +08:00
yuanke 5d3ab1bb09 优化头像地址获取代码、屏蔽头像card代码 2016-10-27 14:30:07 +08:00
huang 7035dab4ce pull request 提交动态按天排序 2016-10-26 15:40:44 +08:00
huang 5eb82de6e0 pull request权限判断 2016-10-26 13:45:15 +08:00
huang 21d34bb4d4 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-25 14:05:24 +08:00
huang 2702b5a197 项目收藏结构修改 2016-10-25 14:05:07 +08:00
Tim d72993b76c 日历tip文字加大 2016-10-25 13:36:18 +08:00
daiao e3f0f222e6 新版Issue新建页面 2016-10-25 09:28:09 +08:00
cxt 40a895a786 issue动态附件点击后下载更新为直接查看 2016-10-24 10:57:40 +08:00
yuanke bb5d957ec5 Merge branch 'cxt_course' into develop 2016-10-21 17:46:29 +08:00
cxt 3d29eb2be0 分班批量添加学生、小班页面 2016-10-21 17:34:02 +08:00
huang bdfa28e762 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-21 17:14:22 +08:00