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

295 Commits

Author SHA1 Message Date
cxt 3aa891acf6 Merge branch 'cxt_course' into develop 
Conflicts:
	app/controllers/student_work_controller.rb
	app/views/praise_tread/_praise.html.erb
	db/schema.rb
 2016-04-27 16:27:55 +08:00
cxt 766026e3cf 教师评分为最终评分 2016-04-27 16:21:35 +08:00
yuanke 5aba3fb11b 修改查重有时候失败的问题 2016-04-15 18:48:39 +08:00
cxt 36e8b05f9c Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-04-15 11:32:38 +08:00
cxt bca0a4bf39 Merge branch 'cxt_course' into develop 2016-04-15 11:32:24 +08:00
yuanke e58f1ab94b Merge branch 'yuanke' into develop 2016-04-15 11:29:40 +08:00
yuanke 998106b37b 修改代码查重的一些弹框显示效果等问题 2016-04-15 11:28:20 +08:00
cxt 3b4f6f4846 添加分班和修改分班名称时刷新学生列表 2016-04-14 17:24:56 +08:00
cxt 2d4f724e33 导出的学生列表作品排序按作业发布时间升序排列 2016-04-14 15:01:18 +08:00
cxt d948536a10 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-04-14 12:33:15 +08:00
yuanke ef4b256313 Merge branch 'yuanke' into develop 
Conflicts:
	app/models/homework_common.rb
	config/locales/zh.yml
	db/schema.rb
 2016-04-14 11:32:35 +08:00
cxt 5e1284605f Merge branch 'hjq_beidou' into cxt_course 
Conflicts:
	app/views/layouts/new_base_user.html.erb
 2016-04-14 11:29:26 +08:00
yuanke a8dce5e520 代码查重功能增加,管理员界面增加代码测试列表. 2016-04-14 11:29:22 +08:00
huang acf4e15f09 统计数左侧刷新 2016-04-14 10:26:25 +08:00
cxt 2befcd6634 Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/layouts/new_base_user.html.erb
 2016-04-13 16:52:52 +08:00
cxt 062af3c57a 作业积分出现负分 2016-04-13 16:11:57 +08:00
huang 478311128d 优化project_controller show方法 2016-03-22 12:42:53 +08:00
cxt 9917e802cb 课程推荐的资源统计 2016-03-18 15:15:25 +08:00
alan 050a266985 Merge branch 'FX-alan-message-access-slow' into alan_develop 2016-03-16 11:17:35 +08:00
Tim 45f1cfa477 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-11 15:51:59 +08:00
huang 8079254089 首页增加访问统计 2016-03-11 15:51:45 +08:00
alan 55983093fd 优化课程反馈页面 2016-03-11 09:40:10 +08:00
cxt a7b9d8424a 只有全部列表中的学生可编辑分班 2016-03-10 17:41:53 +08:00
cxt 0d8052da28 老师把学生加入某一个分班 2016-03-10 17:04:26 +08:00
cxt 5b4ff5ec8a 学生列表中的作业积分为负分 2016-03-10 09:22:49 +08:00
cxt 09c8e57f1c 复制课程时可复制资源和作业 2016-02-26 10:41:14 +08:00
guange 71778ba948 拷贝课程图标 2016-01-29 22:10:04 +08:00
cxt d3ba23bc64 课程的作业列表增加搜索按钮 2016-01-29 15:37:03 +08:00
cxt e9a7f6f826 导出学生作业成绩列表 2016-01-29 11:02:57 +08:00
cxt 19003f27fc 课程添加is_copy属性 2016-01-26 15:05:45 +08:00
huang b93b86b9a0 创建课程发送board 2016-01-18 17:16:33 +08:00
cxt 66c3cee3f8 课程关联组织列表 2016-01-08 22:30:04 +08:00
cxt a3370b693c 课程关联组织列表为空 2016-01-08 21:46:10 +08:00
ouyangxuhua 626e3da1e6 Merge branch 'szzh' into dev_hjq 
Conflicts:
	public/stylesheets/new_user.css
	public/stylesheets/public.css
 2016-01-08 18:09:21 +08:00
cxt 151c08ac5c 复制学期 2016-01-07 15:29:25 +08:00
ouyangxuhua 8dd34f91c3 课程/项目配置关联组织，仅关联用户的组织 2016-01-04 15:12:38 +08:00
cxt 6bdd6d3e03 课程添加设置菜单，设置页面的信息更改 2015-12-29 10:15:53 +08:00
cxt 82fa0f0aaf 公开的课程不勾选“学生列表公开”，但非课程成员却可以通过url访问该课程学生列表 2015-12-24 15:28:11 +08:00
ouyangxuhua acb604883d 项目/课程配置关联组织，左边的组织列表由每页10个组织增至15个组织。 2015-12-17 10:01:28 +08:00
huang c7b2c9e3af 课程删除功能 
admin中课程列表取消删除按钮
 2015-12-10 18:59:54 +08:00
huang 4f7f4acb1f 课程删除 2015-12-10 17:26:03 +08:00
huang 916d99be82 课程删除功能 2015-12-08 16:45:26 +08:00
huang 42f5b86d95 添加字段删除课程 2015-12-08 10:32:10 +08:00
huang 068c305c06 Merge branch 'hjq_new_course' of http://repository.trustie.net/xianbo/trustie2 into hjq_new_course 
Conflicts:
	app/views/courses/member.html.erb
	app/views/courses/settings.html.erb
	app/views/repositories/show.html.erb
	db/schema.rb

处理冲突
 2015-12-08 09:10:21 +08:00
huang 9716e99533 课程成员提交“修改角色” 2015-12-04 16:33:56 +08:00
huang b6edabed9c 修改角色 2015-12-04 16:21:48 +08:00
huang 057d9a3337 0 2015-12-04 00:15:47 +08:00
ouyangxuhua af981f841e 添加组织时，翻页提醒功能改善 2015-11-18 16:52:03 +08:00
ouyangxuhua 71bf80c7a5 1.创建组织课程关联表，建立相应模型及控制器； 
2.在课程设置中，添加加入组中功能；
3.解决添加项目后，组织列表的上一页和下一页链接问题。
 2015-11-17 17:34:50 +08:00
ouyangxuhua 7980d92ff7 搜索课程，使结果按照开课时间、创建时间倒排 2015-11-02 15:46:21 +08:00