Commit Graph

14 Commits

Author SHA1 Message Date
z9hang c1c05067e7 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	app/controllers/admin_controller.rb
	db/schema.rb
2015-03-06 15:36:47 +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
z9hang 3334299808 app版本管理功能(表添加,页面部分添加) 2015-03-05 17:37:33 +08:00
sw bcc8abdee9 1、增加组织相关数据表
2、增加组织和项目的关联关系
2015-03-05 09:27:13 +08:00
lizanle 7ee58d1d44 项目动态重写,并去掉首页缓存 2015-03-04 15:32:00 +08:00
huang d0a675f2b8 企业版模块 2015-01-30 14:11:35 +08:00
zhuhao 6a49d7a04f 返回匿名和用户全名方法测试 2015-01-27 15:38:32 +08:00
zhuhao a38b3c89fe 添加预构件生产测试数据 2015-01-24 10:36:19 +08:00
zhuhao ca17058750 添加预构件 2015-01-24 10:35:46 +08:00
zhuhao 230b98d704 注册测试 2015-01-24 10:18:32 +08:00
zhuhao 965703a80e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	.rspec
2015-01-23 10:21:26 +08:00
zhuhao f24d0e6b54 user模型数据验证测试 2015-01-23 10:16:46 +08:00
alan 432e3a05f2 增加贴吧创建,发帖时发送邮件功能,修改《邮件重发多次》bug
Signed-off-by: alan <547533434@qq.com>
2015-01-22 16:30:21 +08:00
alan 6ccb154cc3 课程留言,发邮件给课程所有人
Signed-off-by: alan <547533434@qq.com>
2015-01-21 11:33:29 +08:00