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

1467 Commits

Author SHA1 Message Date
sw 8bb8de7d7f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-05-21 15:31:05 +08:00
sw c7b19d8f2e 修改作业提交流程 2014-05-21 14:10:11 +08:00
wanglinchun 12f3da8416 sdf 2014-05-21 11:34:04 +08:00
wanglinchun 947c0f8f64 竞赛页面中添加参赛作品成功创建的提示语 2014-05-21 11:16:46 +08:00
xianbo 4b063a2c69 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop 
Conflicts:
	db/schema.rb
 2014-05-21 11:09:22 +08:00
nwb 0f340a7cda Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-05-21 11:04:36 +08:00
nwb 624a7f7bdd 还原资源文件管理的tag显示为一行 2014-05-21 11:03:16 +08:00
fanqiang 45fa8b384a 修改字体颜色 2014-05-21 10:24:34 +08:00
fanqiang c5dd0317c2 修改合并后的bug（open_source_project） 2014-05-21 09:54:05 +08:00
yanxd 0ab17f1e90 contest image show 2014-05-21 09:46:40 +08:00
wanglinchun a5cb14274c 修改参赛作品页面中未登录状态下的提示 2014-05-21 09:43:42 +08:00
wanglinchun dd43e2c3fc 竞赛页面我要参赛中添加判断，当用户未登录时提示登录后参赛 2014-05-21 09:38:08 +08:00
xianbo e3fe69c445 Merge branch 'test' of 10.0.47.245:/home/trustie2 into develop 
Conflicts:
	app/views/open_source_projects/_show_topics.html.erb
 2014-05-21 08:25:20 +08:00
fanqiang 973a59042c 修改帖子显示用户名与链接问题 2014-05-20 16:33:50 +08:00
wanglinchun bcb3bf0c19 调整参赛作品编辑页面中托管项目列表的显示宽度 2014-05-20 16:13:59 +08:00
fanqiang aed4b250a0 修改数据库后修复bug 2014-05-20 16:10:05 +08:00
wanglinchun 77b7da81fd 参赛作品页面编辑功能中添加修改托管项目列表完成 2014-05-20 15:58:34 +08:00
yanxd c4bd9aaabd Merge branch 'szzh' into develop 2014-05-20 15:56:51 +08:00
yanxd 4aed14228a project/course/ members remove link 2014-05-20 15:53:23 +08:00
yanxd 85c77ca074 xss, ckeditor js bug. 2014-05-20 15:48:02 +08:00
yanxd dac992548a course_form 2014-05-20 15:47:48 +08:00
nwb 0b4c95711a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-05-20 15:06:18 +08:00
nwb 4156983494 缺陷添加缩略图显示 2014-05-20 15:05:54 +08:00
yanxd 7189d9a14a course_form 2014-05-20 14:52:30 +08:00
yanxd d47facc9e8 Merge branch 'szzh' into develop 
Conflicts:
	app/views/contests/show_attendingcontest.html.erb
	db/schema.rb
 2014-05-20 14:33:50 +08:00
yanxd 9ae8494c97 Merge remote-tracking branch 'origin/szzh' into szzh 2014-05-20 13:58:37 +08:00
nwb 097489e594 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-05-20 11:33:36 +08:00
nwb 4d21933e09 1.优化资源文件上传下载界面 
2.教师的课程界面优化
 2014-05-20 11:33:17 +08:00
wanglinchun 10b34341c7 修改参赛作品编辑页面说明文字：应用--》作品 2014-05-20 10:48:11 +08:00
wanglinchun 2c30008981 竞赛页面中我要参赛下面修改温馨提示内容 2014-05-20 10:32:15 +08:00
yanxd 2aeb12616b Merge remote-tracking branch 'origin/szzh' into szzh 2014-05-20 10:09:09 +08:00
sw 4de089250f 修改删除留言方法为destroy_jour，以及相关路由，访问action的改变 2014-05-20 09:59:33 +08:00
yanxd 112b8de921 issues#575 2014-05-20 09:50:28 +08:00
wanglinchun f815410381 修改了新建参赛作品中托管项目的显示颜色和宽度 2014-05-20 09:40:13 +08:00
yanxd f9166a71a7 issues#555 2014-05-20 09:12:15 +08:00
sw c141501085 Merge remote-tracking branch 'origin/szzh' into szzh 2014-05-20 08:49:00 +08:00
sw 9a62fe22c6 修复作业留言模块先回复留言然后删除回复留言界面不会及时刷新的BUG 2014-05-20 08:48:42 +08:00
yanxd 9373666576 混淆课程数量 2014-05-19 17:56:50 +08:00
sw b80c51475f 1.增加作业参与人员类homework_users及相关代码 
2.homework_attach增加字段：name，description，state
 2014-05-19 17:44:36 +08:00
wanglinchun 9fb9d2dbdf 初步增加了新建参赛作品中参赛作品所属的托管项目列表 2014-05-19 17:39:51 +08:00
yanxd a76620a741 welcome footer 
判断成员列表的查看
 2014-05-19 16:12:18 +08:00
z9hang e78a309842 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-05-19 15:23:43 +08:00
z9hang 19d1682077 修改编辑作业提交文件处样式 2014-05-19 15:23:34 +08:00
z9hang eaa9c94290 自己的用户界面也不现实邮箱 2014-05-19 12:00:13 +08:00
z9hang 2b12d31fb8 去除网站中的邮箱地址显示 2014-05-19 11:02:07 +08:00
sw 7ead12dba6 1.优化路由代码 
2.修改当查询学校课程数数量少于8个时，推荐9-当前学校课程数量门最好的课程给用户，并且排除当前学校课程
 2014-05-19 10:00:24 +08:00
sw 3fee4211a2 Merge remote-tracking branch 'origin/szzh' into szzh 2014-05-17 15:39:28 +08:00
sw 6c9b9841b8 课程作业留言增加回复以及回复的评论删除功能 2014-05-17 15:39:18 +08:00
z9hang ea095a6f61 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-05-17 15:17:09 +08:00
z9hang fc1d5baf95 课程、竞赛、项目的主页的上下间距缩小 
logo和大学名称的居中对齐，以及搜索条的上下居中。
 2014-05-17 15:15:33 +08:00
nwb 5ca9d96acd Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-05-17 14:39:00 +08:00
nwb 7df6be8ff4 调整资源文件界面 2014-05-17 14:07:57 +08:00
sw 8a6fa2166e 课程作业显示列表增加该作业平均评分 2014-05-17 13:49:27 +08:00
sw 4c6b514d03 Merge remote-tracking branch 'origin/szzh' into szzh 2014-05-17 11:15:40 +08:00
sw f79679f05a 1.修改作业列表显示效果 
2.增加作业互评功能
3.增加作业留言、留言删除功能以及相关操作后页面数据刷新
 2014-05-17 11:15:27 +08:00
z9hang cb23b54d01 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-05-16 17:45:31 +08:00
z9hang 5d15349482 编辑作业时显示已添加的附件 2014-05-16 17:45:20 +08:00
t430 00b866f06a Merge branch 'develop' 2014-05-16 17:28:30 +08:00
wanglinchun 31ec9bc353 Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop 
Conflicts:
	db/schema.rb
 2014-05-16 17:06:38 +08:00
nwb 8f153520b4 调整上传资源界面 2014-05-16 16:29:01 +08:00
wanglinchun 84ae8a1cde 调整了新建参赛作品的显示样式 2014-05-16 16:22:59 +08:00
nwb 5c71d7e8be 1.资源上传默认类型修改为课件 
2.调整标签显示
 2014-05-16 15:30:32 +08:00
sw b27b3e0a5a Merge remote-tracking branch 'origin/szzh' into szzh 2014-05-16 11:04:49 +08:00
sw 029eb1a195 作业回复 2014-05-16 11:04:08 +08:00
ganyiang 08562c48fe 修复osp所有帖子页面布局错乱问题 2014-05-16 08:48:53 +08:00
z9hang 0385013905 修复主页跳转 
去除老师删除项目型作业，优化代码
 2014-05-15 19:16:36 +08:00
nwb b736dc91ed Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-05-15 17:36:52 +08:00
nwb 4f7087f9ae 课程修正为只有的教师才能查看学生学号 2014-05-15 17:36:39 +08:00
z9hang e0592cd6f8 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-05-15 17:33:58 +08:00
wanglinchun 73175aa9b8 调整好了参加竞赛的项目列表显示样式 2014-05-15 17:26:39 +08:00
xianbo 9cdd101cc7 fix 2014-05-15 17:10:02 +08:00
wanglinchun 44ec6eabf6 完成了竞赛中参赛应用列表显示的调整 2014-05-15 16:50:30 +08:00
z9hang 06706b577d 贴吧、讨论区回复的样式修改 2014-05-15 16:27:56 +08:00
yanxd 4db228f88e 调整tag高度为啥要修改两个地方我自己也忘了，改天再说 2014-05-15 15:52:25 +08:00
wanglinchun a0a2d04bd7 参赛项目取出提交的人 2014-05-15 15:07:20 +08:00
nwb be73a232e8 修改显示 2014-05-15 13:58:54 +08:00
nwb f2f81e1d02 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-05-15 13:54:06 +08:00
nwb 4b064f3c2a 1.用户留言添加了竞赛类信息 
2.优化跳转显示
 2014-05-15 13:53:45 +08:00
nwb 8ef716b920 1.个人动态留言显示出留言人 
2.留言添加跳转链接
 2014-05-15 13:37:24 +08:00
yanxd 2e0e8e6a8e Merge remote-tracking branch 'origin/develop' into szzh 2014-05-15 11:26:45 +08:00
z9hang dcc2789aae 修正附件型作业已提交数量显示问题 2014-05-15 11:14:44 +08:00
z9hang fb9d6f74af Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-05-15 10:50:57 +08:00
z9hang c48b850cf7 添加删除项目型作业功能 2014-05-15 10:50:46 +08:00
wanglinchun bb3536a7d5 调整了参赛作品页面中最终得分和打分总人数和下面文字的剧中对其 2014-05-15 10:46:05 +08:00
wanglinchun 65f1e2a8d1 参赛作品页面添加托管项目网址+超链接+判断网址是否为空 2014-05-15 10:25:24 +08:00
wanglinchun f88322f2a1 参赛作品页面添加托管项目网址+超链接 2014-05-15 10:06:51 +08:00
xianbo 66a5db5ad3 Merge branch 'szzh' into develop 
Conflicts:
	config/routes.rb
	db/schema.rb
 2014-05-15 09:46:38 +08:00
nwb aa89900813 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/files/index.html.erb
 2014-05-15 09:26:32 +08:00
nwb 81596d674b 屏蔽了温馨提示 2014-05-15 09:20:36 +08:00
z9hang 6086b25db7 贴吧帖子倒序去掉楼层 2014-05-15 09:19:59 +08:00
nwb cea01b4df5 优化错误提示 2014-05-14 18:33:27 +08:00
z9hang 7137f2663c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-05-14 18:27:06 +08:00
z9hang d2fd2f90e6 作业删除图标添加 2014-05-14 18:26:11 +08:00
wanglinchun cea41a7aab df 2014-05-14 18:10:08 +08:00
wanglinchun fd87245251 sdew 2014-05-14 17:27:20 +08:00
yanxd 14e4bf5bcc typo 2014-05-14 17:20:31 +08:00
wanglinchun 75853bca01 调整竞赛中参赛作品各项指标的位置 2014-05-14 17:15:19 +08:00
yanxd 829c77879a typo 2014-05-14 17:12:04 +08:00
z9hang a19a1b74a7 修正作业数显示不一致问题 2014-05-14 17:05:51 +08:00
wanglinchun d019a4d9ce 重新调整了：评奖，暂未评奖，未评奖 2014-05-14 16:29:46 +08:00