Commit Graph

157 Commits

Author SHA1 Message Date
huang cf04bb5ec6 迁移上线 2016-07-19 15:59:52 +08:00
huang 25da65d565 恢复gemfile 2016-07-19 15:24:50 +08:00
huang facf3ae8f8 提交次数写入动态中 2016-07-18 16:45:49 +08:00
guange 8c2ae92d31 加入性能分析 2016-07-15 14:45:01 +08:00
guange c7bb53d2bd 在服务端加上imagemagick 2016-07-09 13:39:50 +08:00
guange 7c98e0f392 merge 2016-07-08 20:00:49 +08:00
huang 2f8079e85c 版本 库存 2016-07-06 16:07:17 +08:00
guange 373e3d3422 merge 2016-07-04 17:06:26 +08:00
txz bd1aae07fd 微信动态页面样式更新 2016-07-04 14:43:51 +08:00
yuanke c151a61980 把几个gem包位置放下 2016-06-29 09:14:53 +08:00
guange 222855ea79 越过course表的validate,以防save invitecode 失败 2016-06-28 19:19:59 +08:00
guange 0c4f8810c8 修改一个centos能安装成功的rmagick 2016-06-27 21:36:59 +08:00
guange 3b383dfa65 老师课程界面 2016-06-27 16:03:07 +08:00
guange 05f09c4595 Merge remote-tracking branch 'origin/develop' into weixin_guange 2016-06-27 11:09:31 +08:00
guange c501af70ba . 2016-06-27 11:09:25 +08:00
huang 012eae9b93 gems 2016-06-24 19:54:01 +08:00
huang 6f2ce2668c 注释掉gem 2016-06-24 19:23:13 +08:00
huang 46cde061a6 Merge branch 'rep_quality' into develop
Conflicts:
	db/schema.rb
	public/stylesheets/project.css
	public/stylesheets/public.css
2016-06-24 19:17:26 +08:00
guange 52d4d36097 邀请码页面 2016-06-24 09:01:12 +08:00
huang e3b6bd19e1 修改质量分支控制器名 2016-06-21 16:50:45 +08:00
Your Name d5631defb5 added xml to jenkins and added some gems 2016-06-20 17:53:56 +08:00
huang 0c25e3b13d 版本库质量分析 ssh链接 2016-06-13 15:21:29 +08:00
huang 74ee3205bd 淘宝源 2016-06-02 15:47:17 +08:00
cxt 617649129e Gemfile 2016-05-18 11:20:14 +08:00
cxt 28edaf2246 课程/项目留言:快速点击提交按钮重复产生多条记录的问题 2016-05-18 10:57:56 +08:00
huang 7759670fa1 Merge branch 'yuanke' into develop
Conflicts:
	Gemfile
	public/stylesheets/new_user.css
2016-05-13 11:39:01 +08:00
yuanke 6237bcb6cd 加个gem 'certified' 2016-05-13 09:10:08 +08:00
yuanke a39702f962 图片自动上传,代码测试编译错误过长。 2016-05-13 08:38:28 +08:00
yuanke 135e02504e 图片自动上传 2016-05-11 11:40:01 +08:00
guange dfdd301f2f sso同步登录功能完成 2016-05-05 14:06:47 +08:00
guange 0635c1e98b 添加单点登录controller 2016-05-04 14:05:46 +08:00
guange 483f99f401 注释掉profile的GEM 2016-04-29 20:09:42 +08:00
guange cc9825e6a2 将wechat放到项目里面 2016-04-26 10:50:54 +08:00
guange 2c23b88998 boards#index性能优化 2016-04-24 12:48:03 +08:00
guange ae08031440 开放跨域 2016-04-05 15:54:30 +08:00
guange 6ae4cd0767 merge 2016-03-21 16:02:30 +08:00
guange 24a278d7d6 加上atall 2016-03-11 18:50:37 +08:00
guange a59f65a455 wechat 2016-03-01 16:13:37 +08:00
guange 9f49a20a69 停用miniprofiler 2016-01-20 21:55:50 +08:00
guange 932b0923b1 change wechat to guange2015 2016-01-15 23:49:03 +08:00
guange 587d347178 added wechat 2016-01-15 17:01:30 +08:00
huang 8d0463169e gemfile文件冲突问题 2015-12-18 17:16:25 +08:00
houxiang fc2eae4c62 add something by hx 2015-12-17 20:56:30 +08:00
houxiang e9cfe007bb modify by hx 2015-12-10 15:59:31 +08:00
guange 55bb9f68e0 gemfile处理 2015-12-06 10:48:05 +08:00
lizanle c28b8bab14 全站搜索 2015-11-27 13:09:20 +08:00
lizanle bf1c1cf0a1 全站搜索 2015-11-27 13:07:09 +08:00
lizanle 4efb660214 全站搜索 2015-11-26 09:57:53 +08:00
lizanle c2be8b4eec 课程大纲界面 2015-10-28 15:54:27 +08:00
huang 150ee3d28d Merge branch 'szzh' into gitlab_guange
Conflicts:
	db/schema.rb
2015-10-16 09:07:38 +08:00