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

1486 Commits

Author SHA1 Message Date
z9hang 4b119e2f00 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-05-29 08:49:37 +08:00
z9hang 97ae2356bf 引用被遮住不能点问题 2014-05-28 20:09:49 +08:00
sw b9550cedb9 课程作业显示界面修改 2014-05-28 19:54:53 +08:00
sw 91497d3f95 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-05-28 17:07:50 +08:00
sw 3546355f70 增加修改昵称功能以及昵称是否重复的判断 2014-05-28 17:07:23 +08:00
z9hang 2d77975221 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/helpers/courses_helper.rb
	app/views/bids/_homework_list.html.erb
	config/locales/en.yml
 2014-05-28 15:40:57 +08:00
z9hang 1c92007ac6 课程个人主页动态改为 昵称（真名） 形式显示（对该课程的老师助教） 
作业里老师助教看到真名
 2014-05-28 15:31:22 +08:00
sw 218fb3f831 Merge remote-tracking branch 'origin/szzh' into szzh 
Conflicts:
	config/locales/zh.yml
 2014-05-28 15:24:37 +08:00
sw e0273d320c 1.登录增加js提示可以用昵称和邮箱登录 
2.修改资料界面增加昵称的修改以及修改昵称的验证
3.修改昵称的描述
 2014-05-28 15:05:11 +08:00
nwb b52690adc2 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-05-28 14:43:32 +08:00
nwb 61135a352a 上传文件表单支持添加文件标签 2014-05-28 14:43:20 +08:00
yanxd 306ae9f685 用户tag点击之后的名字显示修改，用户邮箱隐藏 2014-05-28 10:25:42 +08:00
sw 8227c5222a 修复老师未进行综评的用户进入互评界面报错的BUG 2014-05-28 08:50:38 +08:00
sw 27a30d44be 1.修改判断当前用户是不是为课程老师的方法 
2.增加作业综评功能
3.其他课程的学生是不能互评的，只有本门课程的学生可以互评
4.修改添加评论方法
5.修复当作业无人评论时，作业最终得分只显示一个分字
 2014-05-27 20:01:21 +08:00
z9hang bf12692de4 登录名==》账号/邮箱 
老师在课程动态中看到学生真名
 2014-05-27 17:04:29 +08:00
z9hang ddf5590c54 修复个人主页查看关注的项目时报user_id指代不明的sql错误 2014-05-26 17:04:55 +08:00
z9hang 5d4eec010e 隐藏点击描述用户的标签后跳到的标签页面显示的用户邮箱 2014-05-26 16:49:41 +08:00
z9hang ab85ee5169 admin个人主页项目功能修正 
admin管理用户的搜索功能从/users/search中分离到/admin/search
admin管理用户界面添加管理界面布局
 2014-05-26 16:25:53 +08:00
yanxd 654cb404e2 bootstrap test 2014-05-26 11:27:10 +08:00
yanxd 12b1553a33 Merge branch 'develop' into szzh 2014-05-26 09:05:36 +08:00
yanxd 2273a6fd0b Merge remote-tracking branch 'origin/develop' into develop 2014-05-26 08:56:58 +08:00
yanxd d77d7e14c7 home page memo css no wrap 2014-05-26 08:56:16 +08:00
yanxd 7a4e5afba0 test 2014-05-24 12:12:38 +08:00
z9hang 0e6d9a804a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-05-24 09:03:38 +08:00
t430 fd0a504d84 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into develop 2014-05-23 17:12:10 +08:00
yanxd 5364687160 bootstrap & tag bug 2014-05-23 17:07:58 +08:00
xianbo be1a0e0fea Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop 2014-05-23 14:32:26 +08:00
xianbo 734caef3dc Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop 2014-05-23 14:21:34 +08:00
xianbo a3a95556a3 fix 王林春提交了冲突文件 2014-05-23 14:16:32 +08:00
z9hang ad5ac329f2 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-05-23 11:50:48 +08:00
z9hang 6583ccb001 admin账户个人主页显示修改 
admin账户用户管理功能分离到/admin/users，软件创客功能与普通账户一致
 2014-05-23 11:50:36 +08:00
t430 edfd7372bb Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into develop 2014-05-23 11:42:41 +08:00
yanxd 4eebd48f92 realname 2014-05-23 11:38:30 +08:00
yanxd 3ae7729539 Merge branch 'szzh' into develop 2014-05-23 11:00:46 +08:00
yanxd 213939b474 realname 2014-05-23 10:59:52 +08:00
wanglinchun 4081ef93a3 参赛作品发布人不能打分和评论； 
匿名用户隐藏打分功能
 2014-05-23 10:51:07 +08:00
xianbo e52886cf46 Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop 
Conflicts:
	app/views/softapplications/show.html.erb
	db/schema.rb
 2014-05-23 09:49:36 +08:00
xianbo cda9942723 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop 2014-05-23 09:44:33 +08:00
sw 0ec7d6b4e7 Merge remote-tracking branch 'origin/szzh' into szzh 2014-05-22 20:01:34 +08:00
sw 71bbc50542 增加作业留言的分页显示 2014-05-22 20:01:26 +08:00
yanxd 598429695f Merge branch 'develop' into szzh 2014-05-22 19:59:50 +08:00
yanxd 62f9ed052b issues#655 2014-05-22 19:58:13 +08:00
fanqiang d3ead651fe 动态显示安全问题 2014-05-22 17:04:45 +08:00
sw 5d4226ce79 Merge remote-tracking branch 'origin/szzh' into szzh 2014-05-22 16:38:04 +08:00
sw 65c3bb5eb1 1.作业列表评分结果显示保留2位有效数字 
2.互评界面显示最终评分数值
3.增加互评按钮，修改查看学号、按学号排序等功能的条件
4.修改互评界面作业下载信息显示，取消描述
 2014-05-22 16:37:39 +08:00
ganyiang 5374addb5a Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop 2014-05-22 16:08:08 +08:00
ganyiang c70352011d 修复buglist.css对整体界面的影响 2014-05-22 15:46:22 +08:00
yanxd f44b930037 233 2014-05-22 15:33:38 +08:00
ganyiang f0f807b2de 修改OSP社区的态势分析图表显示； 
仅供演示！
 2014-05-22 15:14:26 +08:00
nwb 4f9625b265 修改BUG 2014-05-22 13:40:41 +08:00