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

399 Commits

Author SHA1 Message Date
sw 8dd6bb4afa 课程首页公开资料数显示错误 2015-05-29 18:11:31 +08:00
alan a76b345495 课程首页优化 
Signed-off-by: alan <547533434@qq.com>
 2015-05-29 11:40:12 +08:00
alan 6835fb29cd Signed-off-by: alan <547533434@qq.com> 2015-05-29 10:34:04 +08:00
alan f47d30f22a 项目首页缓存设置 
Signed-off-by: alan <547533434@qq.com>
 2015-05-28 15:14:38 +08:00
yutao 5cb9cc0903 修复bug#2211:course主页--还有空间显示课程老师的姓名就不要以省略号结束 2015-05-19 10:35:17 +08:00
alanlong9278 336b59f606 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 
Conflicts:
	.gitignore
	Gemfile
	app/views/issues/index.html.erb
	app/views/layouts/_base_feedback.html.erb
	app/views/tags/_tag_name.html.erb

Signed-off-by: alanlong9278 <547533434@qq.com>
 2015-05-08 09:15:50 +08:00
sw a5a5ccce41 #2452course网站课程资源个数的显示和主页显示的不一致 2015-05-06 15:05:57 +08:00
whimlex cde4a892e0 竞赛主页竞赛通知条数对主页样式的调整 2015-04-24 17:11:36 +08:00
alanlong9278 0668af4f89 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 
Conflicts:
	app/views/bids/_bid_homework_show.html.erb

Signed-off-by: alanlong9278 <547533434@qq.com>
 2015-04-20 14:54:02 +08:00
whimlex ca1e902a8f #2279 搜索课程进入结果页面，如图，建议将“授课时间”与“课程简介”与上面的“课程名称”等信息对齐 2015-04-16 16:39:52 +08:00
alanlong9278 b704555628 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 
Conflicts:
	.gitignore
	Gemfile
	app/controllers/discuss_demos_controller.rb
	app/models/user.rb
	app/views/bids/_bid_homework_show.html.erb
	app/views/issues/index.html.erb
	app/views/layouts/_base_feedback.html.erb
	app/views/poll/publish_poll.js.erb
	app/views/poll/republish_poll.js.erb
	public/javascripts/application.js

Signed-off-by: alanlong9278 <547533434@qq.com>
 2015-04-15 12:36:19 +08:00
alanlong9278 a51ba0c104 Signed-off-by: alanlong9278 <547533434@qq.com> 2015-04-15 12:30:37 +08:00
whimlex cf4451e998 pre标签换行；contest主页样式调整 2015-04-13 18:34:44 +08:00
sw 1c19114252 去掉发布竞赛的权限判断 2015-04-11 11:15:15 +08:00
whimlex 874dcc2b89 附件上传国际化调整 2015-04-10 17:58:59 +08:00
whimlex 2a35e771c2 项目界面国际化及样式调整；标签模块国际化及样式调整 2015-04-10 12:48:02 +08:00
sw a737342a66 完成个人信息下拉、首页下标的隐藏非项目信息的定制 2015-04-09 11:00:39 +08:00
whimlex b95852dfcd 附件上传国际化：修改页面一些bug：用户主页个人得分身份信息修改 2015-03-19 17:21:11 +08:00
whimlex 4b19463db7 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/layouts/base_projects.html.erb
	app/views/users/show.html.erb
	config/locales/zh.yml
 2015-03-10 10:08:18 +08:00
whimlex 115eb38a02 完善用户资料模块，用户主页课程栏、留言栏、项目栏和标签模块国际化；对一些存储在数据表中的固定的中文属性，比如学期，职称，在helper和model中定义方法封装；平台导航模块，包括各模块内部导航的国际化；课程平台模块国际化整理和修改，去除重复功能标签 2015-03-10 09:45:36 +08:00
sw 6a7c7a732c 修改首页报500 2015-03-07 17:08:36 +08:00
sw e326934027 调整组织首页缺少项目时的显示样式 2015-03-06 10:58:12 +08:00
sw 1f2b5eedb8 Merge branch 'dev_zanle' into szzh 
Conflicts:
	app/views/projects/show.html.erb
	db/schema.rb
 2015-03-06 08:59:29 +08:00
sw 45fe622f26 1、修改进入系统首页报错 
2、增加组织的默认图片
 2015-03-05 14:42:46 +08:00
sw d1edd86e11 1、修改组织首页项目获取 
2、修改此组织没有项目时的样式
 2015-03-05 10:40:10 +08:00
lizanle 7ee58d1d44 项目动态重写，并去掉首页缓存 2015-03-04 15:32:00 +08:00
sw 9233213127 修复未登录时进入指定学校课程列表显示却是国防科大课程列表的BUG 2015-03-03 17:35:46 +08:00
sw 90d9e77b32 修复课程主页没有2015年课程 2015-03-02 17:31:04 +08:00
whimlex 22aae1910b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/welcome/_search_project.html.erb
	config/locales/en.yml
	config/locales/zh.yml
 2015-02-09 22:14:16 +08:00
whimlex 59a2c8283a 国际化结构调整 2015-02-09 22:07:21 +08:00
huang 26b1f9f433 修改企业版中存在的一些bug 
最多只显示十个项目
提示的样式
代码优化
 2015-02-03 11:24:46 +08:00
sw 6261d95eba 首页显示异常 2015-01-31 17:27:52 +08:00
z9hang 836be8c75e 添加企业首页配置功能 2015-01-31 17:14:01 +08:00
sw 79d1a069c2 修改公司名字过长首页显示有问题 2015-01-31 16:19:13 +08:00
huang 3350bb98b6 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	config/locales/zh.yml
 2015-01-31 15:46:30 +08:00
huang 523af8b2a9 修改企业版结构及列表页面 2015-01-31 15:43:35 +08:00
sw 2cc31e5c72 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-31 14:48:08 +08:00
whimlex c413ce1405 项目企业模块国际化修改 2015-01-31 14:44:16 +08:00
sw f3b99ec045 修改项目首页搜索按钮移位 2015-01-31 14:37:24 +08:00
whimlex 57237c76d8 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	config/locales/zh.yml
 2015-01-31 10:55:08 +08:00
whimlex 3e1d90630e 找回密码，邮件激活国际化 2015-01-31 10:48:09 +08:00
huang be9ff9b4bb 修改控制器名 
解决列表中企业重名的bug
 2015-01-30 17:58:41 +08:00
huang 666ebf9b5b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-30 14:45:47 +08:00
huang 9e470fa25c meigia 2015-01-30 14:45:33 +08:00
sw 31c78279ea 删除多余的一个end 2015-01-30 14:31:15 +08:00
huang 29df528af1 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/welcome/index.html.erb
	config/locales/zh.yml
	config/routes.rb
 2015-01-30 14:27:56 +08:00
huang d0a675f2b8 企业版模块 2015-01-30 14:11:35 +08:00
whimlex 617107f0cb Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/welcome/index.html.erb
	config/locales/zh.yml
 2015-01-30 10:34:47 +08:00
whimlex f05e046751 首页国际化 2015-01-30 10:26:26 +08:00
lizanle fd42af1ac4 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-27 14:32:54 +08:00