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

2886 Commits

Author SHA1 Message Date
sw f560e9f494 1.修改未开启匿评学生界面取消匿评列表界面显示 
2.修改未开启匿评学生直接进入众评点赞界面
 2014-11-19 11:11:28 +08:00
sw ff185852eb 未开启匿评时老师界面取消开启/关闭匿评按钮显示 2014-11-19 10:53:22 +08:00
sw 91cb6e29d5 数据库增加是否开启匿评字段 
新建作业是增加是否开启匿评功能以及相关页面效果显示
修改相关js判断
 2014-11-19 10:34:36 +08:00
sw 861dbc854e 修复个人动态主页课程连接错误 2014-11-18 16:51:19 +08:00
sw 6245b6ba33 修改编辑、启动匿评、关闭匿评、提交作业按钮样式 2014-11-18 16:47:04 +08:00
sw 6bfbf5bd2b 1.增加匿评阶段课程作业列表界面不可提交作业 
2.增加匿评关闭阶段可提交作业
 2014-11-18 16:13:11 +08:00
sw d0e549fc85 增加作业倒计时显示 2014-11-18 16:00:04 +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 804b23f0f6 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-11-18 10:29:20 +08:00
sw 3aaf2247dc 修改作业右侧悬浮框css、js 2014-11-18 10:29:00 +08:00
z9hang 4b5ad833b0 课程资源界面各按钮失效问题 2014-11-18 10:26:33 +08:00
z9hang 33555e598e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-11-17 16:21:05 +08:00
z9hang 22696fe4f9 #985 micros版：资源搜索，下载资源控件显示错误 2014-11-17 16:20:48 +08:00
moon f21767cb16 增加其他角色新建课程权限 2014-11-17 16:13:40 +08:00
moon c086009313 国际化 2014-11-17 15:48:05 +08:00
moon 34d7208deb 课程联系界面 2014-11-17 15:21:36 +08:00
sw aa0f10e9fd 修改课程通知页面访问报404 2014-11-17 11:34:53 +08:00
sw c74b5d7bb4 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-11-17 10:33:01 +08:00
sw 63a141a75a 1.修改右上侧课程作业快捷栏显示js、css 2014-11-17 10:32:33 +08:00
z9hang 46e97b7ae4 删除多出来的页脚 2014-11-17 10:31:48 +08:00
z9hang 096b0e271f 课程页面页脚偏移问题 2014-11-17 09:54:21 +08:00
z9hang ae19532601 修改帮助的浮动边框 2014-11-14 17:35:07 +08:00
zhuhao 3fd1f77535 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-11-14 16:38:57 +08:00
zhuhao b1e58f3fd5 新增弹框 2014-11-14 16:38:14 +08:00
sw 512f16a036 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-11-14 15:04:53 +08:00
sw 61c8feac8f 课程后增加课程作业的快捷栏 2014-11-14 15:04:35 +08:00
alan 857578dc92 修改bug<contest网站的作品提交界面需要改进> 
Signed-off-by: alan <547533434@qq.com>
 2014-11-14 11:15:46 +08:00
alan e0cf3bd6de 修改bug<贴吧换行显示不正确> 
Signed-off-by: alan <547533434@qq.com>
 2014-11-14 10:54:05 +08:00
alan e7545b1cd9 增加《注册后跳转邮箱》页面 
Signed-off-by: alan <547533434@qq.com>
 2014-11-13 10:20:55 +08:00
alan 12de248e87 Signed-off-by: alan <547533434@qq.com> 2014-11-13 10:18:07 +08:00
alan e86ef8e6f0 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2014-11-13 09:59:34 +08:00
alan b7a89d6108 Merge branch 'shaproup' into szzh 
Conflicts:
	app/models/course.rb
	app/models/project.rb
	app/views/contests/show_attendingcontest.html.erb
	app/views/files/_course_file.html.erb
	app/views/files/_course_new.html.erb
	app/views/layouts/_base_footer.html.erb

Signed-off-by: alan <547533434@qq.com>
 2014-11-13 09:59:20 +08:00
alan e9d75bde6f 《修改资料》页面：工作单位为不必填 
Signed-off-by: alan <547533434@qq.com>
 2014-11-13 09:14:40 +08:00
alan baacf328b7 增加《注册跳转邮箱页面》 
Signed-off-by: alan <547533434@qq.com>
 2014-11-13 09:13:44 +08:00
sw 56cc2a7ad3 修复老师编辑作业时课程作业tab没有高亮显示 2014-11-12 17:07:27 +08:00
z9hang 227a7c1f31 z作业留言的字数控制 2014-11-12 17:02:35 +08:00
sw a24d1493f9 1.修复点击课程动态，课程动态tab页不高亮显示 
2.修复点击新建作业，课程作业tab页不高亮显示
 2014-11-12 16:51:07 +08:00
z9hang e6aa9d3592 修复用户、课程、项目、竞赛、留言模块样式，去除回复时的回复某某字样，及字数控制 2014-11-12 15:09:39 +08:00
alan ad6b32ff50 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2014-11-11 17:01:29 +08:00
alan 2cea3178d6 添加邮箱验证功能 
Signed-off-by: alan <547533434@qq.com>
 2014-11-11 17:01:07 +08:00
sw dbf08bc486 Merge branch 'Homework' into szzh 2014-11-11 15:19:28 +08:00
sw 3c2c9149b1 取消新建、修改作业的必填标志 2014-11-11 11:51:17 +08:00
z9hang 2b829db804 教师打开评分界面时，评分处显示其上次的评分 2014-11-11 11:05:56 +08:00
sw 9d971069b5 Merge branch 'Homework' into szzh 2014-11-11 08:49:42 +08:00
sw e3d735ecfc Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-11-11 08:48:27 +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