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

188 Commits

Author SHA1 Message Date
sw b51cd1aabb 取消教师列表的搜索功能 2014-12-06 11:00:15 +08:00
alan b5d007ccf7 增加《点击分组名，该分组名底色发生改变》 
Signed-off-by: alan <547533434@qq.com>
 2014-12-06 00:52:06 +08:00
alan fbe6ce16d7 修改《分组界面》样式 
Signed-off-by: alan <547533434@qq.com>
 2014-12-05 23:34:16 +08:00
alan 62497913d7 修改《分组名可以为空格》bug 
Signed-off-by: alan <547533434@qq.com>
 2014-12-05 17:13:05 +08:00
alan 63a9fcd483 修改《加入分组后分组人数未改变》bug 
Signed-off-by: alan <547533434@qq.com>
 2014-12-05 16:44:05 +08:00
alan 747fb84ef6 修改《添加，修改分组名》bug 
Signed-off-by: alan <547533434@qq.com>
 2014-12-05 16:33:55 +08:00
alan c5a7baa454 修改合并引起的bug 
Signed-off-by: alan <547533434@qq.com>
 2014-12-05 16:21:53 +08:00
alan 9d0e39e708 修改孙涛提出的bug 
Signed-off-by: alan <547533434@qq.com>
 2014-12-05 16:03:41 +08:00
alan 020242a8c9 增减《查询显示人数以及显示全部人数》功能 
Signed-off-by: alan <547533434@qq.com>
 2014-12-05 11:27:51 +08:00
alan cfb8edbfe2 分组功能样式微调 
Signed-off-by: alan <547533434@qq.com>
 2014-12-05 10:53:43 +08:00
alan c9b84d0a35 增加《学生加入，退出分组》功能 
Signed-off-by: alan <547533434@qq.com>
 2014-12-04 22:02:10 +08:00
alan 66f93150f6 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into course_group 2014-12-04 19:09:51 +08:00
alan 9765f11f7e 增加<修改，添加分组>功能 
Signed-off-by: alan <547533434@qq.com>
 2014-12-04 19:09:10 +08:00
alan 3d12d6f0e8 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into course_group 
Conflicts:
	db/schema.rb
 2014-12-03 19:20:25 +08:00
alan 615bc7d444 增加课程分组的功能 
Signed-off-by: alan <547533434@qq.com>
 2014-12-03 19:17:10 +08:00
sw 19b61118ac 修改加入按钮失败后变为加入课程按钮 2014-12-02 18:00:57 +08:00
alan 63c9804da8 添加course_group表单到数据库中，并建立对应于members和courses之间的关联， 
对相应页面的修改

Signed-off-by: alan <547533434@qq.com>
 2014-12-02 14:41:36 +08:00
zhuhao 21c1b63c6d 新建作业和留言两处的提交按钮样式统一 2014-11-27 17:34:27 +08:00
sw 86413df277 #1624 新建课程/课程配置：”学时总数“后面显示两个学时 2014-11-26 17:09:52 +08:00
sw e68900b9a0 #1616 修改课程时开课日期选项错误 2014-11-26 16:08:14 +08:00
sw 3e3d103828 1.增加开启匿评之后学生能提交作业 
2.修改学生作业编辑和删除样式
 2014-11-25 10:15:34 +08:00
sw f1aca94a30 老师配置课程时成员列表显示异常 2014-11-24 15:03:34 +08:00
sw ea19c1aeef 取消教师评分所占比例选项 2014-11-22 09:33:37 +08:00
sw 1adb5925b5 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-11-20 15:56:45 +08:00
alan 972b788687 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 
Conflicts:
	public/stylesheets/application.css

Signed-off-by: alan <547533434@qq.com>
 2014-11-19 17:30:53 +08:00
alan b2ce8c78bd <修改资料>页面<课程成员><admin/settings>页面样式修改，注册后页面跳转路由修改 
Signed-off-by: alan <547533434@qq.com>
 2014-11-19 17:25:10 +08:00
sw 91cb6e29d5 数据库增加是否开启匿评字段 
新建作业是增加是否开启匿评功能以及相关页面效果显示
修改相关js判断
 2014-11-19 10:34:36 +08:00
sw 2de2355e5c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-11-18 15:24:40 +08:00
sw 3ac023e7a5 悬浮框增加屏幕绝对定位 
问题：貌似IE6不兼容
 2014-11-18 11:18:00 +08:00
moon e0571a888e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-11-18 10:57:18 +08:00
moon e359b987e5 增加“课程作业”权限提示 2014-11-18 10:56:56 +08:00
sw 90f5cd2e60 修改缩放html页面时悬浮框位置显示不正确的BUG 2014-11-18 10:39:50 +08:00
sw 3aaf2247dc 修改作业右侧悬浮框css、js 2014-11-18 10:29:00 +08:00
moon c086009313 国际化 2014-11-17 15:48:05 +08:00
moon 34d7208deb 课程联系界面 2014-11-17 15:21:36 +08:00
z9hang 096b0e271f 课程页面页脚偏移问题 2014-11-17 09:54:21 +08:00
z9hang ae19532601 修改帮助的浮动边框 2014-11-14 17:35:07 +08:00
zhuhao b1e58f3fd5 新增弹框 2014-11-14 16:38:14 +08:00
z9hang e6aa9d3592 修复用户、课程、项目、竞赛、留言模块样式，去除回复时的回复某某字样，及字数控制 2014-11-12 15:09:39 +08:00
sw 7d93a4e4aa Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/models/user.rb
	app/views/courses/_course_form.html.erb
	db/schema.rb
 2014-11-11 08:38:58 +08:00
sw 460ba55dde Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/models/user.rb
	app/views/courses/_course_form.html.erb
	db/schema.rb
 2014-11-08 16:40:36 +08:00
sw 6178919735 修改创建课程时当前学期的默认选择设置 2014-11-05 14:46:01 +08:00
sw 0151caa00c Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework 2014-11-05 10:14:24 +08:00
sw 55b7d12908 增加判断：匿评分配数量必须大于0 2014-11-05 10:14:02 +08:00
sw 54a9044679 修改匿评个数可配置、以及增加其相关js验证 2014-11-05 10:06:20 +08:00
z9hang 7d4d3f590c 项目、课程、竞赛留言模块分页控件修复 2014-11-05 09:51:30 +08:00
sw cf952b5012 Merge branch 'Homework' into develop 2014-11-04 18:34:34 +08:00
z9hang 07c21e97d6 修复竞赛、课程、项目留言模块样式 2014-11-04 18:30:45 +08:00
sw 4d1730f92e 修改 2014-11-04 17:48:18 +08:00
alan 495c4db43e 增加功能<增加学生列表是否公开功能> 
Signed-off-by: alan <547533434@qq.com>
 2014-11-03 17:00:01 +08:00