Commit Graph

657 Commits

Author SHA1 Message Date
cxt 57e2ab9ff1 竞赛作品的在线评审分布 2016-12-30 19:35:43 +08:00
cxt b92bb88985 匿评的rake 2016-12-30 17:25:44 +08:00
cxt 73350e34f1 竞赛作品的相关设置 2016-12-30 10:30:21 +08:00
cxt bdd2a60d00 竞赛:加入竞赛、发布竞赛、发布通知等的消息 2016-12-28 11:30:31 +08:00
cxt e22e1caaed bug修复 2016-12-24 18:48:50 +08:00
daiao e86bd6728e Merge branch 'cxt_course' into develop
Conflicts:
	app/controllers/users_controller.rb
	app/helpers/application_helper.rb
	app/views/users/_user_activities.html.erb
	db/schema.rb
2016-12-24 16:48:48 +08:00
huang 0877aae0d6 竞赛通知 index方法 2016-12-23 17:00:11 +08:00
huang 37f1aa1442 邮件相关改进 2016-12-23 14:29:48 +08:00
huang 5527adb795 版本406异常处理,pull request 冲突接受后406异常提醒 2016-12-15 17:03:59 +08:00
siteen be1fc144da rake 任务异常跳过 2016-12-14 13:32:25 +08:00
siteen 5f56edda15 rake 任务异常处理 2016-12-14 10:28:14 +08:00
siteen 1561a1176a 修改rake 任务获取gitlab roles方法 2016-12-14 10:22:49 +08:00
siteen f82ea16102 版本库数据同步任务 2016-12-14 10:08:41 +08:00
siteen 413efa8d02 gitlab数据同步一致性任务 2016-12-13 17:21:58 +08:00
黄井泉 b8eee2b131 Merge branch 'cxt_course' into 'develop'
本周上线任务



See merge request !50
2016-12-09 16:43:00 +08:00
huang d98b1e17cc Gitlab提供搜索接口,commit 关联提供搜索功能及局部刷新 2016-12-08 16:36:11 +08:00
cxt c24f9b8c3b 作业的小齿轮菜单增加“启用匿评”的选项,同时更新“禁用匿评”的提示信息、禁用匿评的作业截止后也可以编辑“是否启用匿评” 2016-12-07 17:23:52 +08:00
cxt ff6434d456 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
	db/schema.rb
2016-12-02 10:35:05 +08:00
cxt 0afed6624d 未参与匿评的缺评扣分 2016-12-02 10:04:11 +08:00
huang 890b0e80fd 邮件发送至发送邮件重要信息, 去掉掉按天发送功能 2016-11-30 10:58:13 +08:00
huang a19f6ffd38 项目文件历史记录显示内容区分历史新增和删除
项目变更文件高亮显示
2016-11-29 17:05:14 +08:00
guange a2439f0a14 git文件比较功能 2016-11-26 17:47:39 +08:00
guange c2629ebdc0 有几处相同的content key 2016-11-26 17:06:17 +08:00
huang 58790bcb72 版本库删除数据一致性 解决Gitlab本身bug,删除操作会报异常的问题 2016-11-25 10:31:03 +08:00
huang 30d0c73e4b 修复描述过长导致版本库不能创建的问题 2016-11-21 17:17:54 +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 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 6584cd88f1 pull request 使用优化 2016-11-18 16:08:50 +08:00
huang 00d12fdeb3 pull reqeust相关 2016-11-17 17:30:15 +08:00
cxt 3ebc3c6492 老师、学生测验列表的调整 2016-11-17 17:04:00 +08:00
huang cceadb02ce Merge branch 'develop' into dev_newproject 2016-11-07 17:19:47 +08:00
huang ce3bfee27c 甘特图一些修改 2016-11-07 17:18:00 +08:00
cxt f8316ee1ee 分组作业的缺评扣分 2016-11-07 14:06:11 +08:00
huang 6d6c268138 甘特图排序 2016-11-07 13:52:16 +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
huang ef43488861 admin添加导出用户所有代码提交量 2016-11-03 15:35:09 +08:00
cxt 4575b8274e 不限定匿评人数 2016-11-03 10:25:53 +08:00
cxt ecae600546 启动匿评、关闭匿评的提示 2016-11-02 16:46:47 +08:00
huang dbdd0b52bf 解决课程新闻不能发送的问题 2016-11-02 09:46:29 +08:00
huang 6735d574b5 去掉项目module中多余的模块 2016-11-01 10:24:26 +08:00
huang fce6c407c8 Merge branch 'rep_quality' into dev_newproject
Conflicts:
	app/controllers/projects_controller.rb
	app/views/layouts/base_projects.html.erb
	app/views/projects/settings/_new_edit.html.erb
	public/stylesheets/css/project.css
2016-10-19 11:27:49 +08:00
huang 207273839b Merge branch 'dev_newrep' into dev_newproject
Conflicts:
	app/controllers/projects_controller.rb
	app/views/projects/settings/_new_repositories.html.erb
2016-10-19 08:53:38 +08:00
huang 2b2af428eb Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-10-16 16:16:30 +08:00
huang 8bb483406e 取消gitlab rake日志 2016-10-16 16:16:18 +08:00
huang 9acef36369 gitlab.rake添加日志 2016-10-16 15:44:42 +08:00
cxt 1d7529b8d2 定时任务增加日志 2016-10-15 16:09:21 +08:00
huang 3f667a7afc rake任务添加log 2016-10-15 15:13:15 +08:00
cxt 5aab3fdb75 rake中加打印日志 2016-10-15 12:36:07 +08:00
cxt 13b1d7bb78 作业发布的rake 2016-10-14 20:31:42 +08:00