Commit Graph

15026 Commits

Author SHA1 Message Date
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
huang b731b05a5a 中文 2016-06-29 14:12:24 +08:00
Your Name 77387778d8 some css 2016-06-29 14:08:30 +08:00
huang 653520763a Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-06-29 11:22:10 +08:00
huang 1225a33cec 提示 2016-06-29 11:21:46 +08:00
Your Name 3390a2d05f 500 2016-06-29 11:10:19 +08:00
cxt e066445036 课程大纲的显示和编辑 2016-06-29 10:45:56 +08:00
huang 36944e8cce 提示信息 2016-06-29 10:06:23 +08:00
Your Name c8178fc023 allert 2016-06-29 09:59:21 +08:00
Your Name e887ac5c7c git data from sonar 2016-06-29 09:38:30 +08:00
yuanke c151a61980 把几个gem包位置放下 2016-06-29 09:14:53 +08:00
Your Name 3c3fb29bb2 Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality 2016-06-29 09:11:13 +08:00
Your Name 22b40c082c resole some nil problems 2016-06-29 09:10:47 +08:00
yuanke 233e7d5c91 Merge branch 'lingbing' into yuanke_org
Conflicts:
	Gemfile
2016-06-29 08:51:43 +08:00
Linda c24fdee134 个人资料页面新版修改 2016-06-29 08:48:13 +08:00
yuanke 376ec39035 Merge branch 'develop' into yuanke_org 2016-06-29 08:48:07 +08:00
huang 0a684227b8 如果sonar没扫描完成则暂时不读取数据 2016-06-28 22:01:44 +08:00
guange 222855ea79 越过course表的validate,以防save invitecode 失败 2016-06-28 19:19:59 +08:00
daiao cb11cac506 Merge branch 'develop' into daiao_dev
Conflicts:
	app/views/admin/excellent_all_courses.html.erb
2016-06-28 18:39:32 +08:00
guange 7fdfc02821 Merge remote-tracking branch 'origin/develop' into weixin_guange 2016-06-28 17:47:32 +08:00
guange 3c425edc3c 修复邀请码会变的问题 2016-06-28 17:46:27 +08:00
Your Name 300ad68405 default path for sonar 2016-06-28 17:39:58 +08:00
Your Name a08edcca8a quanxian 2016-06-28 17:18:50 +08:00
cxt 4983d5283b 关联成员能多次添加 2016-06-28 16:30:33 +08:00
cxt cbe34ea0a7 分组作业提交作品时关联成员列表为空 2016-06-28 15:57:56 +08:00
cxt 383483de26 课程大纲的左侧栏base,新建课程大纲、新建班级的调整 2016-06-28 15:13:04 +08:00
daiao d8284e45ed 在课程列表下增加动态时间一栏 2016-06-28 15:06:08 +08:00
txz b2b6536a0f 微信css样式更新 2016-06-28 14:48:33 +08:00
Your Name dd6b19a8b5 some status of sonar 2016-06-28 14:48:09 +08:00
daiao 863cdee37c 在精品课程的全部课程界面下增加公开属性 2016-06-28 14:39:43 +08:00
guange 436de8ce5a 优先取env中的wechat url 2016-06-28 11:33:54 +08:00
guange 57cdc1d5ec 协议修改 2016-06-28 11:30:06 +08:00
guange e9f280b4aa . 2016-06-28 11:07:15 +08:00
guange 047903ddff 重构课程地址 2016-06-28 10:57:58 +08:00
Your Name f930bbddad modified create 2016-06-28 09:45:45 +08:00
guange 0c4f8810c8 修改一个centos能安装成功的rmagick 2016-06-27 21:36:59 +08:00
Your Name e5b93ac7ed modified main method 2016-06-27 18:13:46 +08:00
guange 1e6454efc0 加入我的资源 2016-06-27 17:24:06 +08:00
guange f6f329b00f erge remote-tracking branch 'origin/develop' into weixin_guange 2016-06-27 16:06:20 +08:00
guange 5477c794ba Merge remote-tracking branch 'origin/develop' into weixin_guange 2016-06-27 16:03:55 +08:00
huang 845141a189 注释掉代码质量分析入口 2016-06-27 16:03:43 +08:00
guange 3b383dfa65 老师课程界面 2016-06-27 16:03:07 +08:00