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

781 Commits

Author SHA1 Message Date
sw 717be2b045 修改部分用户的用户首页报错 2015-03-12 10:29:19 +08:00
sw 69eecf49d1 还原冲突 2015-03-12 09:52:57 +08:00
whimlex 65ee3fdc74 项目主页国际化，项目主页JS冲突解决 2015-03-12 09:47:42 +08:00
huang c773e0fd39 JS冲突，去掉多余标点 2015-03-12 08:42:39 +08:00
huang 29655838f0 项目超过的部分用“展示更多信息”拉开 2015-03-11 23:50:37 +08:00
huang c36db9fd63 项目左侧按钮实现配置-模块进行显示/隐藏管理 2015-03-11 22:42:42 +08:00
whimlex 11da65c9ad Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/layouts/base_projects.html.erb
	config/locales/en.yml
	config/locales/zh.yml
 2015-03-11 17:27:02 +08:00
whimlex 57c8575470 新版项目模块国际化，目前完成各项目主页，项目动态，项目评分 2015-03-11 17:23:38 +08:00
huang 3ee9ac2b50 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/layouts/base_projects.html.erb
 2015-03-11 16:44:54 +08:00
huang 8f0af4c00d 修改了未登陆情况下通过URL访问不允访问的 2015-03-11 16:42:02 +08:00
sw 52dfb0b0ed Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-11 15:16:43 +08:00
sw 27e72c1f39 #2000 增加项目每个模块的访问控制 2015-03-11 15:14:23 +08:00
huang cbfb72bd5b 修改新建资源库显示 2015-03-11 14:32:29 +08:00
whimlex 540ddd4a1b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	config/locales/zh.yml
 2015-03-11 11:55:13 +08:00
whimlex 0eafbb92d5 意见反馈模块国际化 2015-03-11 11:53:42 +08:00
huang 32a2e7ae1f 修改默认情况下 用户反馈框处于关闭状态 2015-03-11 11:38:09 +08:00
sw 9060c9acbc #1977 项目发布新贴跳转有问题 2015-03-11 10:16:06 +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 81b58e5c87 修改base_project中代码错误 2015-03-09 15:32:55 +08:00
huang d947ebff0c 添加国际化 2015-03-09 10:31:05 +08:00
huang e22b389971 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-07 11:15:30 +08:00
huang b043d07d61 修改发布新贴显示问题 2015-03-07 11:02:12 +08:00
alan 5ff43fdea7 项目添加新用户邮件发送功能 
Signed-off-by: alan <547533434@qq.com>
 2015-03-07 10:52:20 +08:00
huang ce792f6ce8 修改邮件发送界面 2015-03-07 09:32:27 +08:00
huang b3cbfd39ca 修改一些缺陷，删掉多余的文件 2015-03-07 01:07:50 +08:00
huang c159bb2c48 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/controllers/projects_controller.rb
	app/views/issues/show.html.erb
	app/views/layouts/base_projects.html.erb
	app/views/projects/_form.html.erb
	app/views/projects/new.html.erb
	app/views/projects/show.html.erb
 2015-03-06 15:23:42 +08:00
huang beac15475d 新项目及用户反馈框的修改！！ 2015-03-06 14:55:21 +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 a2d986f70c 修改页面代码 2015-03-04 16:55:25 +08:00
sw 032e28067d #1959 项目评分是0的，就不显示了！ 2015-03-04 11:34:01 +08:00
sw 5bba54432d #1930 项目缺陷显示个数修改 2015-03-04 09:52:01 +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
lizanle d902d76ae2 将google统计换为了百度统计 2015-02-06 10:15:18 +08:00
sw 78d8a0a1c6 修改意见反馈折叠后背景为透明 2015-02-02 09:09:45 +08:00
alan b5e49e2e1c Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-01-31 10:10:28 +08:00
sw a265556cfe 搜索项目时增加js验证增加 2015-01-30 11:00:18 +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
sw ce526fde77 Merge branch 'dev_zanle' into szzh 
Conflicts:
	config/routes.rb
 2015-01-30 09:05:47 +08:00
sw 2978d9020f Merge branch 'develop' into szzh 2015-01-29 17:44:37 +08:00
sw b71d714103 #1887 用户职称显示问题 2015-01-29 16:39:25 +08:00
sw bf75f32903 修改个人留言界面，左侧个人信息样式显示不正确 2015-01-29 16:22:26 +08:00
whimlex b7c7cc4c64 意见反馈栏实现cookie缓存收拉属性，实现页面刷新跳转，意见反馈栏收拉一致 2015-01-28 12:13:17 +08:00
lizanle ff23ecb9a8 Merge branch 'szzh' into dev_zanle 2015-01-27 14:46:04 +08:00
sw 5950f0404b #1832 不显示无数据的字段，字段名 2015-01-27 11:35:19 +08:00
whimlex 0ff22b1ac0 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-26 17:47:47 +08:00
whimlex e5e24c1163 resolve conflict 2015-01-26 17:47:33 +08:00
whimlex 64cbeddd13 项目“缺陷”修改为“问题跟踪”，sidebar栏“缺陷”修改为“问题”；项目新建新闻按钮样式统一；新建课程样式统一；课程重开和关闭国际化；竞赛导航锁定；翻译缺失修正 2015-01-26 17:37:05 +08:00