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

964 Commits

Author SHA1 Message Date
lizanle 3637d1906d Merge branch 'szzh' into dev_zanle 
Conflicts:
	Gemfile
	config/routes.rb
 2015-01-28 12:38:32 +08:00
lizanle 87b230623b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-28 12:32:16 +08:00
sw 950d831108 Merge branch 'api' into szzh 2015-01-27 14:51:15 +08:00
lizanle ff23ecb9a8 Merge branch 'szzh' into dev_zanle 2015-01-27 14:46:04 +08:00
lizanle fd42af1ac4 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-27 14:32:54 +08:00
lizanle b6db353b57 newrelic配置文件 2015-01-27 14:25:06 +08:00
sw 56700f4d62 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-27 11:06:42 +08:00
sw 97c7ccac16 增加关闭问卷功能 2015-01-27 09:45:15 +08:00
whimlex 64cbeddd13 项目“缺陷”修改为“问题跟踪”，sidebar栏“缺陷”修改为“问题”；项目新建新闻按钮样式统一；新建课程样式统一；课程重开和关闭国际化；竞赛导航锁定；翻译缺失修正 2015-01-26 17:37:05 +08:00
z9hang db1cd8851c Merge branch 'szzh' into api 
Conflicts:
	Gemfile
	db/schema.rb
 2015-01-23 16:51:40 +08:00
whimlex 14685f2656 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-23 15:09:03 +08:00
whimlex 38157e560e 课程--资源库--上传资源：当变化屏幕分辨率时，“上传文件”字样显示异常;添加用户或组没有链接;新建课程中，平台按钮样式调整成统一风格;课程主页，竞赛 2015-01-23 15:08:34 +08:00
alan 38da932f4c Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 
Conflicts:
	config/application.rb
 2015-01-23 14:57:09 +08:00
alan 61634585f5 修改《news，forum模块发送邮件的模板》 
Signed-off-by: alan <547533434@qq.com>
 2015-01-23 14:51:11 +08:00
sw 08e646c752 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-23 14:43:48 +08:00
sw 900cff8f8e 1、问卷列表界面发布问卷按钮增加问卷标题不能为空的判断 
2、去掉错误的插件引用
 2015-01-23 14:43:40 +08:00
whimlex 2be757a3d5 翻译缺失完善 2015-01-23 14:19:43 +08:00
whimlex 9886a3212c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-23 14:15:39 +08:00
whimlex 15a8bddfe6 缺失翻译 2015-01-23 14:02:00 +08:00
lizanle b26f2029ef Merge branch 'szzh' into dev_zanle 
Conflicts:
	Gemfile
 2015-01-23 13:49:13 +08:00
lizanle e96302d219 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	Gemfile
 2015-01-23 13:47:38 +08:00
alan fdba8ca986 修改《邮箱地址真实性验证》《课程分班提示重名出错》《留言模块发送邮件模板功能》 
Signed-off-by: alan <547533434@qq.com>
 2015-01-23 11:46:55 +08:00
lizanle 69ced4b14b 添加国际化内容 2015-01-23 11:08:58 +08:00
lizanle 90661374a5 Merge branch 'szzh' into dev_zanle 
Conflicts:
	Gemfile
	app/controllers/projects_controller.rb
	config/locales/zh.yml
 2015-01-23 10:33:07 +08:00
lizanle 0147b30133 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	Gemfile
 2015-01-23 10:25:28 +08:00
lizanle 7bf89c1fc1 开发环境不缓存 2015-01-23 10:00:04 +08:00
lizanle f394c3878e 生产环境日志名字规定为production.log 2015-01-23 09:50:50 +08:00
lizanle d2d1a9659b 开发环境下去掉缓存 2015-01-23 09:49:07 +08:00
lizanle ae74dff89b 添加注释 2015-01-23 09:46:55 +08:00
lizanle 79fd7ebd7a 生产环境下日志分天 2015-01-23 09:46:02 +08:00
whimlex 3fcb2f14a5 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/mailer/issue_edit.html.erb
 2015-01-22 21:02:53 +08:00
sw a0e6b9c2fe Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	config/locales/zh.yml
 2015-01-22 17:51:11 +08:00
huang 388ddac96b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-22 17:46:31 +08:00
huang 84bfd30fc5 修改问题反馈弹框！ 2015-01-22 17:46:12 +08:00
sw 90a81ee1f1 增加网站项目首页加入项目的功能 2015-01-22 17:03:01 +08:00
alan 24dfeb1614 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-01-22 16:32:53 +08:00
alan 432e3a05f2 增加贴吧创建，发帖时发送邮件功能，修改《邮件重发多次》bug 
Signed-off-by: alan <547533434@qq.com>
 2015-01-22 16:30:21 +08:00
lizanle 43c5feb1f7 补丁：修改日志还没有关闭就被重命名的bug： 
https://bugs.ruby-lang.org/issues/7303
 2015-01-22 10:06:16 +08:00
whimlex 0c0160ac2b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-21 18:13:47 +08:00
whimlex 3279928bef 邮件样式调整，国际化；用户资料页面调整 2015-01-21 18:12:04 +08:00
sw 54c8ee9d4d 增加学生答完问卷之后。能看到自己答题结果的功能 2015-01-21 17:51:12 +08:00
lizanle 4d20c8080f 修改国际化文件名字 2015-01-22 17:22:44 +08:00
lizanle 458749b921 添加了国际化代码 2015-01-22 16:46:29 +08:00
lizanle 6c0f47d96d 日志路由 2015-01-22 16:40:22 +08:00
alan 64c0fc7413 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-01-21 11:33:43 +08:00
alan 6ccb154cc3 课程留言，发邮件给课程所有人 
Signed-off-by: alan <547533434@qq.com>
 2015-01-21 11:33:29 +08:00
sw 4caf6ab5f7 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-21 09:19:05 +08:00
alan 9f36469d39 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-01-20 16:34:30 +08:00
alan 40d6c3b19c 添加《邮箱地址验证是否存在及国际化的编写》功能 
Signed-off-by: alan <547533434@qq.com>
 2015-01-20 16:33:59 +08:00
sw 7b9d88ecfe 问卷调查增加重新发布功能 2015-01-20 11:42:28 +08:00