binling
/
trustieforge
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
18,034 Commits 86 Branches 0 Tags 114 MiB
Commit Graph

169 Commits

Author SHA1 Message Date
huang c88d214bb9 处理冲突 
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into dev_cache

Conflicts:
	app/views/courses/_course_activity.html.erb
	app/views/courses/_course_heroes.html.erb
	app/views/users/_message_contents.html.erb
 2016-12-12 16:38:15 +08:00
huang 6fccc7b50c Merge branch 'develop' into dev_cache 
Conflicts:
	.gitignore
	app/controllers/blogs_controller.rb
	app/controllers/users_controller.rb
	app/helpers/application_helper.rb
	app/models/comment.rb
	app/models/journals_for_message.rb
	app/models/news.rb
	app/views/courses/_course_activity_users.html.erb
	app/views/layouts/new_base_user.html.erb
	app/views/projects/_act_messages.html.erb
	app/views/projects/_project_message_contents.html.erb
	app/views/users/_course_homework.html.erb
	app/views/users/_course_journalsformessage.html.erb
	app/views/users/_course_message.html.erb
	app/views/users/_course_news.html.erb
	app/views/users/_homework_post_reply.html.erb
	app/views/users/_message_contents.html.erb
	app/views/users/_news_contents.html.erb
	app/views/users/_project_message.html.erb
	app/views/users/_user_blog.html.erb
	app/views/users/_user_journalsformessage.html.erb
 2016-12-12 16:35:20 +08:00
cxt 098d42cbd1 更改作业的截止日期时也应重新判断作品是否迟交、作业id为4198的作品数据迁移 2016-12-06 14:47:17 +08:00
cxt 2fd4cb9064 班级作业增加设置选项：成绩公开范围 2016-12-02 13:30:49 +08:00
cxt 0afed6624d 未参与匿评的缺评扣分 2016-12-02 10:04:11 +08:00
yuanke 2d5fbdfaaa Merge branch 'develop' into yuanke_objectcache 
Conflicts:
	app/views/projects/_project_message_contents.html.erb
 2016-11-22 17:07:35 +08:00
cxt 9a30369cef 班级作业：两种身份（助教和学生）的成员匿评扣分错误 2016-11-18 16:37:25 +08:00
yuanke 6ba203b224 修改BUG 2016-11-15 17:26:12 +08:00
yuanke cec157944b Merge branch 'develop' into yuanke_objectcache 
Conflicts:
	app/models/homework_common.rb
	app/views/courses/_course_activity_users.html.erb
	app/views/users/_course_message.html.erb
 2016-11-14 10:11:27 +08:00
yuanke 88d489b485 作业列表设留言at消息为已读改为delay_job执行 2016-11-10 10:41:35 +08:00
yuanke 8e98ac2700 Merge branch 'yuanke_objectcache' of https://git.trustie.net/jacknudt/trustieforge into yuanke_objectcache 2016-11-09 09:21:29 +08:00
yuanke 895cb77323 缓存修改 2016-11-09 09:19:36 +08:00
cxt a102bb531f 挂起作业 2016-11-08 16:01:41 +08:00
yuanke 7debb74164 Merge branch 'develop' into yuanke_objectcache 
Conflicts:
	app/models/news.rb
	app/views/users/_message_contents.html.erb
	app/views/users/_news_contents.html.erb
 2016-11-08 09:51:32 +08:00
cxt f8316ee1ee 分组作业的缺评扣分 2016-11-07 14:06:11 +08:00
cxt 59a4514950 关闭匿评时出现比例大于100%的情况 2016-11-04 19:10:22 +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
yuanke c9a0561694 作业列表加缓存 2016-11-04 11:04:55 +08:00
yuanke b84c9cb55d 班级资源、作业缓存更新 2016-11-03 16:01:16 +08:00
cxt 4575b8274e 不限定匿评人数 2016-11-03 10:25:53 +08:00
cxt fea07e07c1 分组作业：基本作业编辑为分组作业后，组长提交作品的时候不能添加组员 2016-11-02 17:17:12 +08:00
cxt ecae600546 启动匿评、关闭匿评的提示 2016-11-02 16:46:47 +08:00
cxt 54f45f18a5 匿评设置的调整 2016-11-02 15:19:17 +08:00
cxt 0ccb6b884a 编辑作业时分组作业的评分比例 2016-10-20 17:31:48 +08:00
cxt b123192286 分组作业的匿评分配 2016-10-09 09:48:55 +08:00
cxt f0e334d33d 分组作业的迟交扣分和缺评扣分 2016-10-09 09:16:05 +08:00
cxt 12d70c6999 分组作业编辑时“基于项目实施”的设置不起作用 2016-10-08 18:06:09 +08:00
cxt d1c284c953 作业详情页 2016-09-21 10:34:38 +08:00
cxt ba4a1c64d9 作业动态的重构 2016-09-19 17:14:14 +08:00
cxt abdc08c7af 提交作品时左侧导航栏对应班级的导航栏 2016-09-14 20:58:15 +08:00
cxt e4efc8c302 作业编辑 2016-09-14 16:45:10 +08:00
cxt 9002844188 新版发布作业 2016-09-13 16:18:57 +08:00
cxt b8dc444cc7 普通作业和编程作业在题库发送后，编辑并进行发布，没有自动创建作品列表 
复制班级功能里，勾选“作业”，同上

对应方法：在作业的发布时间点（不用考虑作业是通过何种途径生成的），除了发布作业外，应该为该作业自动创建完整的作品列表（分组作业除外）
 2016-08-23 10:17:08 +08:00
cxt d3db6719eb “我的作业”中编辑作业不跳转到“题库”，而是返回到“我的作业” 2016-08-05 18:41:32 +08:00
cxt 9422e2886c 新版班级主页 2016-07-22 15:32:37 +08:00
cxt 3362ebe321 线下作业 2016-07-08 18:22:59 +08:00
cxt 13bae8f8a5 线下作业 2016-07-08 13:17:14 +08:00
cxt ccf29c980a 作业列表搜索作业：搜索结果中包括不包含关键字的作业、作业回复框加载不出 2016-05-24 10:34:36 +08:00
cxt 0f2f4717b6 作业列表增加序号和翻页、按创建时间倒排 2016-05-19 13:50:45 +08:00
cxt 3b3cafbc81 微信模板消息的还原 2016-05-18 14:49:49 +08:00
huang 922958e732 Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-05-11 16:23:58 +08:00
cxt 644e097dc8 定时更新关联项目的作业更新时间 2016-05-09 16:16:03 +08:00
cxt 1b309d4bf0 时间的比较 2016-05-09 10:36:38 +08:00
cxt fc95d048a5 作业列表打不开 2016-05-09 10:32:41 +08:00
cxt e03bc42c53 Merge branch 'cxt_course' into develop 
Conflicts:
	app/controllers/words_controller.rb
 2016-05-06 22:53:16 +08:00
cxt 9526962c69 翻页时不更新作业动态 2016-05-06 22:06:24 +08:00
cxt b8f7672424 项目动态的更新时间更新到作业动态中 2016-05-06 22:02:45 +08:00
huang 00d0bc0ce1 Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-05-06 22:02:22 +08:00
huang df1c70880a Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/users/_homework_repository.html.erb
	public/stylesheets/new_user.css
 2016-05-06 12:22:43 +08:00
cxt 0fafbffa49 项目的更新加到作业的最后更新时间中 2016-05-06 08:52:54 +08:00