Commit Graph

1540 Commits

Author SHA1 Message Date
huang 537cc20e06 已repository_id为范围,version唯一性控制 2016-07-22 10:34:59 +08:00
huang 4e4ff4958f 修改changeset触发事件 2016-07-21 17:19:45 +08:00
huang 466a25c121 提交后更新项目动态表update时间 2016-07-21 17:02:50 +08:00
huang 246923a335 版本库新增提交次数表,增加至项目动态 2016-07-21 16:09:07 +08:00
huang f979e80f24 Gitlab数据清理及迁移,主要是历史数据 2016-07-20 17:05:55 +08:00
huang 14e6db457b rake 2016-07-20 09:38:23 +08:00
huang 0c0dfbd093 changeset关联 2016-07-19 17:38:11 +08:00
huang cf04bb5ec6 迁移上线 2016-07-19 15:59:52 +08:00
huang facf3ae8f8 提交次数写入动态中 2016-07-18 16:45:49 +08:00
cxt e260c0b7cc Merge branch 'cxt_course' into develop 2016-07-15 15:49:27 +08:00
cxt 05fe987a8b 新手注册三条留言 2016-07-15 15:43:35 +08:00
yuanke 15ccf5cfbe Merge branch 'yuanke' into develop 2016-07-13 15:56:44 +08:00
yuanke b4ac13c157 修改编程作业没main函数系统评分100的BUG 2016-07-13 09:36:43 +08:00
guange 8279d9385c 区分是课程邀请,还是意见反馈 2016-07-09 10:13:05 +08:00
guange 7c98e0f392 merge 2016-07-08 20:00:49 +08:00
guange 5c0468f8fd 二维码过期改为一个月有效期 2016-07-08 17:18:09 +08:00
guange 068c8967e1 新增班级时名称为1个字符时报错 2016-07-08 17:04:17 +08:00
cxt cc4b24cdb9 Merge branch 'cxt_course' into develop
Conflicts:
	db/schema.rb
2016-07-08 13:18:46 +08:00
cxt 13bae8f8a5 线下作业 2016-07-08 13:17:14 +08:00
huang ef8b127225 Merge branch 'cxt_course' into develop
Conflicts:
	db/schema.rb
	public/javascripts/application.js
2016-07-08 11:33:51 +08:00
huang e588321ada Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-07-08 11:31:02 +08:00
cxt 37dd447fcb Merge branch 'daiao_dev' into cxt_course
Conflicts:
	app/views/admin/courses.html.erb
	public/stylesheets/new_user.css
2016-07-07 15:14:11 +08:00
huang b90c90bc60 add model error_list 2016-07-07 14:22:48 +08:00
cxt a99b03ff76 管理员界面增加配置课程 2016-07-07 09:02:41 +08:00
cxt c5840d75da Merge branch 'daiao_dev' into cxt_course
Conflicts:
	db/schema.rb
2016-07-05 16:49:50 +08:00
yuanke da19bbd3a0 优化了下修改资料界面的代码 2016-07-05 09:02:34 +08:00
guange 48fb02a2d6 管理课程 2016-07-04 17:04:06 +08:00
guange 60367415fa 新建课程功能完成 2016-07-04 16:19:05 +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 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
yuanke 397c4cc2a5 1.重新发送注册邮件修改2.个人资料修改页面修改3.问题反馈处增加直接加入QQ群的按钮 2016-06-30 16:08:36 +08:00
cxt ebb697a49f 班级列表、课程大纲的编辑、回复、课程列表 2016-06-30 10:44:11 +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
cxt e066445036 课程大纲的显示和编辑 2016-06-29 10:45:56 +08:00
guange 222855ea79 越过course表的validate,以防save invitecode 失败 2016-06-28 19:19:59 +08:00
guange 3c425edc3c 修复邀请码会变的问题 2016-06-28 17:46:27 +08:00
cxt 383483de26 课程大纲的左侧栏base,新建课程大纲、新建班级的调整 2016-06-28 15:13:04 +08:00
Your Name dd6b19a8b5 some status of sonar 2016-06-28 14:48:09 +08:00
guange 1e6454efc0 加入我的资源 2016-06-27 17:24:06 +08:00
guange 3b383dfa65 老师课程界面 2016-06-27 16:03:07 +08:00
guange 05f09c4595 Merge remote-tracking branch 'origin/develop' into weixin_guange 2016-06-27 11:09:31 +08:00
guange c501af70ba . 2016-06-27 11:09:25 +08:00
huang 012eae9b93 gems 2016-06-24 19:54:01 +08:00
huang 46cde061a6 Merge branch 'rep_quality' into develop
Conflicts:
	db/schema.rb
	public/stylesheets/project.css
	public/stylesheets/public.css
2016-06-24 19:17:26 +08:00
Your Name 537f152562 0 2016-06-24 18:47:54 +08:00
Your Name 244c178758 666 2016-06-24 17:39:10 +08:00
Your Name eae70f9c71 some config 2016-06-24 16:18:17 +08:00
cxt 260759e4db Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-06-24 15:36:03 +08:00