Commit Graph

14908 Commits

Author SHA1 Message Date
txz 25e77497e7 consloe pring 2016-07-01 17:50:08 +08:00
cxt 8b87c141cc bug修复 2016-07-01 17:47:35 +08:00
yuanke 547d5409bb 组织中的课程字样改为班级 2016-07-01 17:43:38 +08:00
cxt 0f8cc584a9 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-07-01 17:27:40 +08:00
cxt 5a1090c0e1 bug修复 2016-07-01 17:27:34 +08:00
yuanke 1edc63721f 修改课程列表班级时间显示问题 2016-07-01 17:03:05 +08:00
Tim afbf62fd64 当课程数为0时,课程列表点击无效 2016-07-01 17:02:52 +08:00
cxt 6867a88a94 课程大纲样式调整 2016-07-01 16:41:13 +08:00
cxt 0ff8f0a774 课程大纲的删除和课程大纲描述的删除 2016-07-01 16:25:52 +08:00
Tim 3493136aab Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-07-01 16:25:50 +08:00
yuanke 89e42ac776 将姓氏改为姓名 2016-07-01 16:10:48 +08:00
huang a5f3b304d7 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
Conflicts:
	app/views/repositories/show.html.erb
2016-07-01 16:00:34 +08:00
yuanke 8db5852a61 激活邮箱界面显示邮箱,激活邮箱界面留言太长不能留言解决 2016-07-01 15:49:25 +08:00
txz 7178c50b1d branch's total commits 2016-07-01 15:37:39 +08:00
cxt 25b5d74a42 课程大纲的修改 2016-07-01 15:25:30 +08:00
txz 21be94cbe1 add some links 2016-07-01 15:05:01 +08:00
txz 1fbb65b906 获取结果ajax加载中 2016-07-01 14:39:40 +08:00
Tim 5f1fd2239b 数据迁移 2016-07-01 14:20:48 +08:00
cxt f70b51769c Merge branch 'cxt_course' into develop 2016-07-01 14:14:13 +08:00
cxt afe16cc99c 课程大纲列表的js调整 2016-07-01 14:13:40 +08:00
Tim def0d79271 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
	app/views/users/_user_syllabus_list.html.erb
2016-07-01 13:56:07 +08:00
Tim 7633761bbe 课程大纲列表展开收起js 2016-07-01 13:54:00 +08:00
cxt b2aee9b1b8 新建课程大纲的描述 2016-07-01 13:52:22 +08:00
cxt 18d677c5eb Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
	public/stylesheets/courses.css
2016-07-01 11:31:51 +08:00
cxt bdaa9983e3 Merge branch 'cxt_course' into develop
Conflicts:
	db/schema.rb
2016-07-01 11:30:24 +08:00
cxt 3b7679b254 课程大纲列表 2016-07-01 11:29:03 +08:00
cxt a50e15b2ab Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
	app/views/users/_user_syllabus_list.html.erb
	db/schema.rb
2016-07-01 11:15:03 +08:00
cxt 2c1e0f534c 课程大纲 2016-07-01 11:11:53 +08:00
yuanke dfd381fc99 Merge branch 'yuanke_org' into develop
Conflicts:
	db/schema.rb
2016-07-01 09:31:19 +08:00
txz db1ad932c6 Function : update jenkins job 2016-07-01 09:31:05 +08:00
yuanke a8bd91754d 修改博客详情里面内容前面多空格的BUG 2016-07-01 09:27:46 +08:00
txz 24f1375a4e modified job 2016-06-30 17:36:33 +08:00
yuanke 5cc40408ee 修改KE单倍行距显示的时候不一致的BUG 2016-06-30 16:30:02 +08:00
Tim 10f52f110f 课程大纲列表点击展开收起,配置按钮链接跳转实现 2016-06-30 16:12:25 +08:00
yuanke 397c4cc2a5 1.重新发送注册邮件修改2.个人资料修改页面修改3.问题反馈处增加直接加入QQ群的按钮 2016-06-30 16:08:36 +08:00
cxt 4314f6e36a Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
	db/schema.rb
2016-06-30 15:37:16 +08:00
cxt ac4218bfb0 课程大纲列表 2016-06-30 15:36:46 +08:00
huang 587ab510e5 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-06-30 10:58:30 +08:00
cxt ebb697a49f 班级列表、课程大纲的编辑、回复、课程列表 2016-06-30 10:44:11 +08:00
Your Name 5c83414828 update 2016-06-30 10:17:53 +08:00
guange c248249983 注册没有loading图问题 2016-06-29 21:11:21 +08:00
guange 0bb5c8b5fb 注册绑定问题 2016-06-29 21:09:49 +08:00
huang f003959ca4 Merge branch 'develop' into rep_quality 2016-06-29 18:16:51 +08:00
Tim 590b879f02 追加附件弹框不固定bug修复 2016-06-29 16:54:12 +08:00
guange 2886bba2bc Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 2016-06-29 15:58:45 +08:00
txz 2596231ce7 微信新动态样式更新 2016-06-29 15:44:32 +08:00
huang f7e872cb6c 权限修改,项目成员都可以提交质量分析job 2016-06-29 15:20:14 +08:00
huang 984aeb2783 Merge branch 'rep_quality' into develop 2016-06-29 15:05:11 +08:00
huang daf14178cd 修改权限,只有项目成员能够代码质量分析 2016-06-29 14:20:02 +08:00
huang 2105d2bbdb Merge branch 'develop' into rep_quality
Conflicts:
	app/views/repositories/show.html.erb
	db/migrate/20160624103411_add_name_to_quality_analyses.rb
	db/schema.rb
2016-06-29 14:18:17 +08:00