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

247 Commits

Author SHA1 Message Date
yanxd 63cd19c15c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-06-16 09:18:48 +08:00
z9hang eae3918074 添加用户得数统计功能 
帖子内的踩顶横排
 2014-06-13 16:09:43 +08:00
yanxd 70abac4c1e Merge branch 'competition' into develop 
Conflicts:
	app/controllers/application_controller.rb
	config/locales/en.yml
	config/locales/zh.yml
	db/schema.rb
 2014-06-13 10:59:43 +08:00
wanglinchun a40db3dc4b 首页添加了竞赛所获奖项显示 2014-06-10 17:17:31 +08:00
yanxd 73f5bab075 document css/ 
wiki h2 bug
 2014-06-10 15:59:57 +08:00
wanglinchun 9d783a7caa 修改竞赛通知等tab-menu的显示状态 2014-06-03 21:52:16 +08:00
z9hang 2e9251530c 修改缺陷状态留言处引用的链接被遮住问题 2014-05-30 16:27:05 +08:00
yanxd b33ee17343 Merge remote-tracking branch 'remotes/origin/develop' into szzh 
Conflicts:
	Gemfile
	app/controllers/users_controller.rb
	db/schema.rb
 2014-05-30 10:57:13 +08:00
ganyiang b4c299bff8 修复osp中“热帖”下显示“没有帮助”的问题 2014-05-30 09:35:06 +08:00
ganyiang e901e8046d 修改osp中allbug的显示界面 2014-05-29 22:25:53 +08:00
ganyiang c8ca5277a6 新增osp项目“聚焦”标签 （演示用） 2014-05-29 21:43:50 +08:00
ganyiang 6ca1d7f7ab 修改osp的css文件，解决标题过长的显示问题 2014-05-29 20:04:09 +08:00
yanxd 006e4ae45e user tab bar 2014-05-29 18:34:51 +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
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 cda9942723 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop 2014-05-23 09:44:33 +08:00
yanxd 2681c3ce88 ... 2014-05-22 16:12:42 +08:00
ganyiang c70352011d 修复buglist.css对整体界面的影响 2014-05-22 15:46:22 +08:00
yanxd 34aa8433de import hubspot 2014-05-22 11:00:13 +08:00
yanxd 3517dbb88b Merge branch 'szzh' into develop 
Conflicts:
	db/schema.rb
 2014-05-22 09:58:19 +08:00
yanxd 9edb8a49de fontsize fix 2014-05-21 18:38:46 +08:00
yanxd c5a3a5bac3 user_courses.html 2014-05-21 18:21:57 +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
yanxd 0ab17f1e90 contest image show 2014-05-21 09:46:40 +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
yanxd a76620a741 welcome footer 
判断成员列表的查看
 2014-05-19 16:12:18 +08:00
z9hang 19d1682077 修改编辑作业提交文件处样式 2014-05-19 15:23:34 +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 7df6be8ff4 调整资源文件界面 2014-05-17 14:07:57 +08:00
nwb 8f153520b4 调整上传资源界面 2014-05-16 16:29:01 +08:00
yanxd 4db228f88e 调整tag高度为啥要修改两个地方我自己也忘了，改天再说 2014-05-15 15:52:25 +08:00
xianbo 66a5db5ad3 Merge branch 'szzh' into develop 
Conflicts:
	config/routes.rb
	db/schema.rb
 2014-05-15 09:46:38 +08:00
yanxd 14e4bf5bcc typo 2014-05-14 17:20:31 +08:00
yanxd 829c77879a typo 2014-05-14 17:12:04 +08:00
ganyiang 27ade53af3 针对OSP社区的新需求的界面展示： 
1.开源项目社区(OSP)index界面增加[软件安全漏洞]展示
2.osp项目主页增加[项目安全态势]、[技术创新趋势] 展示

ps.此次为不负责任的提交~
 2014-05-14 09:45:11 +08:00
z9hang 6e14e0b262 提交作业窗口删除全部图标位置修正 2014-05-13 12:01:43 +08:00
z9hang a80da022cb Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-05-12 09:33:19 +08:00
yanxd 19ddb38e1b 异步验证注册字段合法 2014-05-10 09:22:45 +08:00
z9hang 7a341972e7 course网站中大学名加上该大学在本站的链接 2014-05-09 11:47:41 +08:00
yanxd 2f47cc1cd8 Merge branch 'test', remote-tracking branch 'origin/szzh' into develop 2014-05-08 18:15:58 +08:00
z9hang 268dc1acce 主页讨论吧动态前显示吧名 2014-05-08 17:37:38 +08:00
yanxd cc2f359e8c 1. Three expressions syntax 
2. 留言显示重复
3. 发送邮件内容
4. show_contest.html typo
5. welcome.css typo
 2014-05-08 15:27:16 +08:00
yanxd 8770599352 css typo 2014-05-07 10:58:49 +08:00
yanxd eb19b0cb1f welcome css改标点错误 2014-05-06 17:14:36 +08:00