jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
12,518 Commits 98 Branches 0 Tags 0 B
Commit Graph

12518 Commits

Author SHA1 Message Date
cxt 64b6af6177 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-07 17:02:03 +08:00
cxt 91d000c8f3 编程作业：编程测试集的弹框中，多行却只显示一行 2016-03-07 17:01:10 +08:00
ouyangxuhua 2ea553e988 Merge branch 'ouyangxuhua' into develop 2016-03-07 16:15:13 +08:00
ouyangxuhua 0df34dd3ee 组织资源栏目，过滤条件“其他”内容 2016-03-07 16:14:44 +08:00
cxt f8ce6d48d3 模拟答题的返回按钮应该回到课程作业列表 2016-03-07 14:31:58 +08:00
cxt cdd8deb340 Merge branch 'szzh' into develop 2016-03-07 13:57:50 +08:00
cxt 0532c68044 Merge branch 'cxt_course' into szzh 2016-03-07 13:57:11 +08:00
cxt e30c26aa09 课程报500 2016-03-07 13:56:28 +08:00
ouyangxuhua a0363b5511 组织资源发送后，发送次数动态增加 2016-03-07 12:57:24 +08:00
ouyangxuhua 319f286a65 解决一下问题：1.组织的资源的引用计数不会增加；2.组织资源栏目中，文件的宽度不合适 2016-03-07 12:19:48 +08:00
cxt fcae91ecc1 “课程通知”改为“通知” 2016-03-07 11:27:47 +08:00
cxt cff5e9171f 导入作业后页面不应跳转到被导入的作业页面 2016-03-07 11:21:58 +08:00
cxt 0090c89dd1 数据迁移 2016-03-07 10:53:58 +08:00
cxt 849bc0149f Merge branch 'develop' into cxt_course 2016-03-07 10:32:32 +08:00
ouyangxuhua 984cd76b7f Merge branch 'develop' into ouyangxuhua 2016-03-07 10:30:09 +08:00
ouyangxuhua b77b63bbf1 解决私有组织栏目通过url能访问的问题 2016-03-07 10:29:37 +08:00
huang d6dedf03cb 去掉puts注释 2016-03-06 12:18:57 +08:00
huang d30e73795d 积分规则 2016-03-06 12:15:57 +08:00
huang 4f2937e1a2 英雄榜 2016-03-05 10:38:21 +08:00
huang 0a18f365ab 新的迁移 2016-03-05 08:00:56 +08:00
huang a079a61c82 回复数 2016-03-05 04:29:10 +08:00
huang 0d1c9f90ab Merge branch 'hjq_new_course' into develop 2016-03-05 04:22:46 +08:00
huang 094af07a2f 数据迁移 2016-03-05 04:22:01 +08:00
huang d54609075b 区分新闻和新闻回复得分 2016-03-05 04:01:10 +08:00
huang 6ceb4f4549 Merge branch 'develop' into hjq_new_course 
Conflicts:
	app/models/course_contributor_score.rb
	app/views/organizations/_org_course_homework.html.erb
	app/views/users/_homework_search_input.html.erb
	app/views/users/_show_user_homeworks.html.erb
	app/views/users/_user_homework_detail.html.erb
	app/views/users/_user_homework_form.html.erb
	app/views/users/user_homework_type.js.erb
	app/views/users/user_homeworks.html.erb
	app/views/users/user_homeworks.js.erb
 2016-03-05 03:17:47 +08:00
huang bafa151c0d 0 2016-03-05 03:16:04 +08:00
huang 3f56fa3405 0 2016-03-05 03:14:57 +08:00
huang f381784a3c 数据迁移 2016-03-05 03:13:58 +08:00
huang 814e766577 课程过滤 2016-03-04 21:22:47 +08:00
huang e4d669251f 英雄榜得分 2016-03-04 21:13:24 +08:00
huang 4cf80fe441 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-04 21:11:07 +08:00
huang 6ce947667d 课程英雄榜提示 2016-03-04 21:10:45 +08:00
cxt 782bbc775b 公共资源库的统计 2016-03-04 21:04:21 +08:00
huang de1c2e18c8 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-04 18:37:46 +08:00
huang fdaaaf9d20 Merge branch 'hjq_new_course' into develop 2016-03-04 18:37:23 +08:00
huang 38fca02193 注释搜索 2016-03-04 18:36:42 +08:00
cxt 4289c3a107 Merge branch 'szzh' into develop 2016-03-04 18:23:52 +08:00
cxt 0f063b9541 Merge branch 'cxt_course' into szzh 2016-03-04 18:22:55 +08:00
huang ae40a4ea61 公共资源相关功能 2016-03-04 18:22:22 +08:00
cxt 3deaa492b2 编辑作业时作业描述被解析了 2016-03-04 18:11:23 +08:00
cxt 4f3055c990 讨论区改为问答区，且放开课程的“问答区”，就是课外的用户也能在公开课内发帖或回帖。 2016-03-04 17:11:52 +08:00
cxt fd8b40a36e 对于编程作业，系统评分的前几名能否也显示出来 2016-03-04 16:53:36 +08:00
huang 91b8a81b9d 去掉全站搜索 2016-03-04 16:10:41 +08:00
huang bbbf13084e 修改搜索功能，页面跳转 2016-03-04 16:05:58 +08:00
cxt 947e6ea469 作业--“禁用匿评”处增加提示语：匿评是同学之间的双盲互评过程：每个同学将评阅系统分配给他/她的若干个作品。 2016-03-04 16:00:20 +08:00
cxt ffac8164f1 管理员的课程和项目列表，按照时间倒排 2016-03-04 15:55:45 +08:00
cxt a5cb3d5e6a 新建作品时的输入框改为“请输入作品名称”、“请输入作品描述” 2016-03-04 15:14:38 +08:00
cxt d2920c64ea 题库作业发送到课程后增加提示 2016-03-04 15:12:03 +08:00
cxt 6416b01037 课程里的“课程作业”改为“作业” 2016-03-04 14:28:06 +08:00
huang dfddb30ca3 附件引用 2016-03-04 14:21:39 +08:00