Commit Graph

17715 Commits

Author SHA1 Message Date
yuanke 9720f84fce js的自动转换URL函数autoUrl加上个异常处理 2016-11-23 13:29:02 +08:00
yuanke 40c7afbc38 Merge branch 'yuanke_youhua' of https://git.trustie.net/jacknudt/trustieforge into yuanke_youhua 2016-11-23 09:28:04 +08:00
yuanke c571d19548 项目简介单词不换行 2016-11-22 10:16:09 +08:00
yuanke 88057fdf4e Merge branch 'develop' into yuanke_youhua
Conflicts:
	app/views/projects/show.html.erb
2016-11-22 10:15:15 +08:00
yuanke 8d980b16db 换行修改 2016-11-22 10:10:53 +08:00
yuanke f1ad70bb33 关注BUG修改,修改密码BUG修改 2016-11-22 08:52:19 +08:00
huang 30d0c73e4b 修复描述过长导致版本库不能创建的问题 2016-11-21 17:17:54 +08:00
yuanke 2bccca3c42 Merge branch 'cxt_course' into develop 2016-11-21 17:00:45 +08:00
yuanke c40288b8c3 修改密码,输入原密码时的下拉框要去掉 2016-11-21 16:26:14 +08:00
cxt 62ea9d12f7 项目简介的样式调整 2016-11-21 14:11:35 +08:00
yuanke 3099b37f5e 个人主页关注BUG修改 2016-11-21 12:07:14 +08:00
yuanke 6cb711d66b Merge branch 'develop' into yuanke_youhua 2016-11-21 10:14:08 +08:00
yuanke 14552abd56 博客人气排序修改,个人主页关注BUG修改 2016-11-21 10:08:27 +08:00
cxt c822892e46 Merge branch 'develop' into cxt_course 2016-11-21 09:57:26 +08:00
daiao c74fe9278a Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-18 21:31:01 +08:00
huang 8238f5bcfb Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-18 21:21:38 +08:00
huang 90cf429a10 fork 弹出新页面 2016-11-18 21:20:44 +08:00
cxt 14e457dc6a 360浏览器的“请选择作业类型”没显示完全 2016-11-18 21:19:36 +08:00
daiao 609d1d2fb4 新建和编辑issue时,里程碑被清空的bug 2016-11-18 21:19:34 +08:00
cxt 94c4afd6de 样式调整 2016-11-18 20:11:32 +08:00
cxt 0338e80f34 班级左侧导航栏的“+” 2016-11-18 19:39:36 +08:00
cxt edca878701 输入框的边框不显示 2016-11-18 19:31:52 +08:00
cxt 2786495774 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-18 19:28:31 +08:00
cxt 58ee1eb745 去掉500页面的“给我留言” 2016-11-18 19:28:18 +08:00
daiao f9a384b253 Merge branch 'dai_ao' into develop 2016-11-18 19:18:36 +08:00
cxt cf6acd48c4 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-18 19:17:47 +08:00
daiao 286422e1c5 我的issue样式调整 2016-11-18 19:17:35 +08:00
cxt afd90d6da3 500页面调整 2016-11-18 19:17:35 +08:00
huang c7d781d58c 删除和fork弹框居中并统一值 2016-11-18 19:13:14 +08:00
huang a58a3c0655 项目成员新弹框ajax局部刷新 2016-11-18 19:00:44 +08:00
cxt 003c6a7551 新建作业初始显示调整 2016-11-18 18:37:41 +08:00
daiao f91722a422 我的issue样式调整 2016-11-18 17:46:51 +08:00
cxt 20465ef281 导航栏题库“发送”后的提示弹框丢失了 2016-11-18 17:37:25 +08:00
cxt 4da94a5bb0 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-18 17:32:55 +08:00
cxt 149ecc0b99 只有班级创建者才能归档和恢复 2016-11-18 17:32:45 +08:00
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