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

658 Commits

Author SHA1 Message Date
huang d91c0442d1 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-30 14:29:01 +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
sw 36c07f9664 修改拒绝项目成员加入后，页面不会刷新的BUG 2015-01-30 14:16:32 +08:00
huang d0a675f2b8 企业版模块 2015-01-30 14:11:35 +08:00
sw ce526fde77 Merge branch 'dev_zanle' into szzh 
Conflicts:
	config/routes.rb
 2015-01-30 09:05:47 +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
z9hang db1cd8851c Merge branch 'szzh' into api 
Conflicts:
	Gemfile
	db/schema.rb
 2015-01-23 16:51:40 +08:00
alan 61634585f5 修改《news，forum模块发送邮件的模板》 
Signed-off-by: alan <547533434@qq.com>
 2015-01-23 14:51:11 +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 b20204fedd 修改《邮件重发一样引发的bug》 
Signed-off-by: alan <547533434@qq.com>
 2015-01-23 13:42:25 +08:00
alan fdba8ca986 修改《邮箱地址真实性验证》《课程分班提示重名出错》《留言模块发送邮件模板功能》 
Signed-off-by: alan <547533434@qq.com>
 2015-01-23 11:46:55 +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
alan 24a8f4fe7d Signed-off-by: alan <547533434@qq.com> 2015-01-23 10:03:00 +08:00
lizanle 03ae5fdeac 添加注释 2015-01-23 09:47:22 +08:00
alan 8f1249390a 修改《发送多封相同邮件》 
Signed-off-by: alan <547533434@qq.com>
 2015-01-22 17:31:34 +08:00
alan 432e3a05f2 增加贴吧创建，发帖时发送邮件功能，修改《邮件重发多次》bug 
Signed-off-by: alan <547533434@qq.com>
 2015-01-22 16:30:21 +08:00
alan f01d164295 Signed-off-by: alan <547533434@qq.com> 2015-01-21 12:01:02 +08:00
alan 6ccb154cc3 课程留言，发邮件给课程所有人 
Signed-off-by: alan <547533434@qq.com>
 2015-01-21 11:33:29 +08:00
alan 40d6c3b19c 添加《邮箱地址验证是否存在及国际化的编写》功能 
Signed-off-by: alan <547533434@qq.com>
 2015-01-20 16:33:59 +08:00
alan 3315116832 修改《课程--留言：给课程留言却返回404》bug 
Signed-off-by: alan <547533434@qq.com>
 2015-01-19 14:35:30 +08:00
lizanle 2431fea63e 日志查看Helper 2015-01-19 14:05:43 +08:00
sw 1e8c6374d7 Merge branch 'szzh' into Poll 
Conflicts:
	app/views/layouts/_base_feedback.html.erb
 2015-01-17 15:03:59 +08:00
alan ade0720331 邮件系统界面重置 
Signed-off-by: alan <547533434@qq.com>
 2015-01-17 14:19:54 +08:00
alan b9ea3e589e 修改《邮件系统》页面 
Signed-off-by: alan <547533434@qq.com>
 2015-01-17 11:18:24 +08:00
alan 5191411508 <邮件加密自动登录功能，邮件附件下载功能> 
Signed-off-by: alan <547533434@qq.com>
 2015-01-15 18:48:19 +08:00
lizanle 75ba61ed74 issue 1798 ,用户名出现不显示的情况 2015-01-14 16:42:12 +08:00
lizanle aca74bf937 Merge remote-tracking branch 'origin/dev_zanle' into szzh 
Conflicts:
	Gemfile
	app/views/welcome/index.html.erb
 2015-01-14 16:15:09 +08:00
alan 2bba0ddd70 添加《邮件加入附件下载功能及私有项目自动登录》 
Signed-off-by: alan <547533434@qq.com>
 2015-01-14 16:08:56 +08:00
z9hang b6826a74d3 问卷显示 2015-01-14 11:50:59 +08:00
alan 2f147dcddd 增加《邮件地址自动登录功能》 
Signed-off-by: alan <547533434@qq.com>
 2015-01-13 18:24:14 +08:00
z9hang 0f9915fc2a Merge branch 'szzh' into api 
Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/bids_controller.rb
	app/controllers/users_controller.rb
	db/schema.rb
 2015-01-13 15:12:05 +08:00
lizanle 3047b523b0 add expire_helper and change the code way of set cache expire! 2015-01-09 15:28:43 +08:00
sw 7ae9556404 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-08 17:44:17 +08:00
sw ee9d82bfc7 1.实现文件调查的model、control、view的架构 
2.修正完善新增表之间的关系
3.修正代码中单复数不正确的问题
 2015-01-08 17:42:46 +08:00
alan 2262997c31 修改《新建课程时：课程名中有空格或者特殊符号会提示名称无效,》 
《 缺陷 Trustie-Forge#1782 (已解决): lable标签和对应的显示值之间间距过大的问题，例如个人主页左侧的信息，具体如图所示》
    《本地版中关于学生列表的分组出现的问题：当前已存在A组，再次添加A组应给出提示“A组已存在”，该功能目前只有在学生列表首次加载时才正常》
   《托管，课程，竞赛主页中任意点击某一项目，进入该项目主页，右上角的搜索按钮风格和大小不统一。》
   《进入某竞赛主页，点击创新竞赛链接没反应》bug
Signed-off-by: alan <547533434@qq.com>
 2015-01-08 16:16:59 +08:00
sw 4c6ade4c08 定义各model之间的关系 2015-01-08 14:41:28 +08:00
sw c9de30bd83 增加问卷调查相关表，以及对应的model、control、view的文件夹 2015-01-08 12:00:43 +08:00
lizanle 10cde37582 cache using version 2015-01-07 09:27:44 +08:00
z9hang f55d8fe303 1、修正新建课程接口无效问题。2、修正新建课程接口返回的数据中课程名称错误问题 2015-01-05 16:58:11 +08:00
alan ba524675e0 修改<打分更新表单>bug 
Signed-off-by: alan <547533434@qq.com>
 2014-12-31 15:48:45 +08:00
sw 05b9b26314 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	db/schema.rb
 2014-12-29 17:00:35 +08:00
z9hang 3f6b36096c 缺陷查询添加integer_done类型处理（暂未用上） 2014-12-29 11:54:31 +08:00
sw 259799eb89 1.增加评分的model 
2.修改评分表中为教师评分的历史数据的is_teacher_score的值
 2014-12-29 11:38:35 +08:00
alan 0e7f7a4254 优化《作业评分》 
Signed-off-by: alan <547533434@qq.com>
 2014-12-24 18:31:45 +08:00
sw 819c4c0bc1 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/controllers/users_controller.rb
 2014-12-24 09:45:23 +08:00
sw b512bc53e9 修改用户搜索无法精确搜索的bUG 2014-12-24 09:08:42 +08:00
alan 2a94c61a3e 修改bug(项目--缺陷：更新图片时在历史记录中没有相关记录，删除图片只显示一个更新时间也不合理) 
Signed-off-by: alan <547533434@qq.com>
 2014-12-23 17:37:45 +08:00