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

194 Commits

Author SHA1 Message Date
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
huang 94d60e4150 修改邮件配置文件 
更新gem镜像路径
 2015-10-15 17:02:16 +08:00
lizanle b3d15b886a 学校的查询与现实问题重做 2015-10-15 12:04:55 +08:00
huang 7c1bb8b9ed Merge branch 'szzh' into gitlab_guange 
Conflicts:
	Gemfile
	app/models/user.rb
	db/schema.rb
	lib/trustie.rb

解决冲突
 2015-10-10 16:09:05 +08:00
guange 216bc7f70f 动态中作业的提交状态修改 2015-09-06 22:59:27 +08:00
guange d36da76685 Merge remote-tracking branch 'origin/szzh' into guange_dev 2015-08-15 19:47:53 +08:00
guange 9d8596a14c 新增gitlab adapter用于适配gitlab命令 2015-08-01 18:48:55 +08:00
guange 7d0a53ec86 merge 2015-07-21 20:56:33 +08:00
sw 0718a28382 增加gem 2015-07-17 14:17:42 +08:00
guange 6fa67051e1 本项目的成员可以使用自己的用户名和密码克隆 2015-07-01 22:54:07 +08:00
guange 797ed5081d 同步登录 2015-06-30 22:12:34 +08:00
guange b3abf610d9 add rest_client 2015-06-01 23:10:25 +08:00
alan f47d30f22a 项目首页缓存设置 
Signed-off-by: alan <547533434@qq.com>
 2015-05-28 15:14:38 +08:00
alan 32a6c29c7c Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into redis_cache 
Conflicts:
	Gemfile
	app/views/layouts/base_projects.html.erb
	app/views/projects/_development_group.html.erb
	app/views/projects/_research_team.html.erb

Signed-off-by: alan <547533434@qq.com>
 2015-05-27 17:42:25 +08:00
guange f3a15ce313 加入性能分析 oneapm 2015-05-26 23:09:10 +08:00
alan 799f561d77 Merge branch 'szzh' into memcached_alan 
Conflicts:
	Gemfile
	app/views/issues/index.html.erb
	db/schema.rb

Signed-off-by: alan <547533434@qq.com>
 2015-05-20 17:42:26 +08:00
alan 34893db465 Signed-off-by: alan <547533434@qq.com> 2015-05-18 14:53:01 +08:00
guange df8aa72055 测试去除spork,有条件可以用zeus 2015-05-14 12:44:30 +08:00
guange 69afe8809e 经测试，转到rspec各方面成熟一点。 2015-05-14 11:41:50 +08:00
guange eed39ef0ef 上传头像会进行压缩 2015-05-08 14:28:17 +08:00
alan 54078e114c redis缓存服务器的搭建以及对首页的缓存设置 
Signed-off-by: alan <547533434@qq.com>
 2015-05-04 15:20:40 +08:00
alan c80263a66e Merge branch 'guange_dev' into memcached_alan 
Conflicts:
	.gitignore
	Gemfile
	app/views/issues/index.html.erb
	app/views/layouts/_base_feedback.html.erb
	app/views/tags/_tag_name.html.erb
	config/environments/production.rb
	db/schema.rb

Signed-off-by: alan <547533434@qq.com>
 2015-05-04 14:58:11 +08:00
guange 3baba9c95e 清理gemfile 2015-04-27 11:56:10 +08:00
guange 336dba414e 缓存修改为redis存储 2015-04-22 13:01:33 +08:00
alanlong9278 945192f1d8 添加memcached配置 
Signed-off-by: alanlong9278 <547533434@qq.com>
 2015-04-21 09:41:40 +08:00
alanlong9278 b704555628 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 
Conflicts:
	.gitignore
	Gemfile
	app/controllers/discuss_demos_controller.rb
	app/models/user.rb
	app/views/bids/_bid_homework_show.html.erb
	app/views/issues/index.html.erb
	app/views/layouts/_base_feedback.html.erb
	app/views/poll/publish_poll.js.erb
	app/views/poll/republish_poll.js.erb
	public/javascripts/application.js

Signed-off-by: alanlong9278 <547533434@qq.com>
 2015-04-15 12:36:19 +08:00
alanlong9278 a51ba0c104 Signed-off-by: alanlong9278 <547533434@qq.com> 2015-04-15 12:30:37 +08:00
guange 893f6af856 用回rubyzip, zipruby有bug. 2015-04-03 11:29:37 +08:00
guange 56df5ce9a7 优化zip重复打包问题 2015-04-02 17:20:52 +08:00
guange 02e83ea776 将邮件发送放到后台进程中 2015-03-31 11:51:34 +08:00
guange f139427f03 Merge remote-tracking branch 'origin/szzh' into guange_dev 
Conflicts:
	app/controllers/zipdown_controller.rb
	app/views/bids/_homework_list.html.erb
	config/routes.rb
	db/schema.rb
	public/javascripts/attachments.js
 2015-03-27 18:17:46 +08:00
sw 728f2896d8 windows下无法打断点 2015-03-27 17:43:19 +08:00
lizanle 0de09e3b36 将editor路径指向本工程lib下的editor包 2015-03-26 16:20:04 +08:00
guange 15accd7d9f 下载功能优化, 功能已实现 2015-03-25 10:41:42 +08:00
guange e007920cb6 Merge remote-tracking branch 'origin/szzh' into guange_dev 
Conflicts:
	Gemfile
	app/views/attachments/_form.html.erb
 2015-03-19 17:41:45 +08:00
guange 6c87cd40c1 加入git回调接口 2015-03-17 20:52:12 +08:00
lizanle 0c86ba210d Merge remote-tracking branch 'origin/szzh' into szzh 
Conflicts:
	db/schema.rb
 2015-03-17 09:38:24 +08:00
lizanle 48b08a20ee 增加gem包 2015-03-16 15:26:24 +08:00
guange 39f1fb879f 对Gemfile作了一些优化 
1.  源可以从taobao源安装
2. 所有放在lib下的gem删除，从网上下载
 2015-03-15 23:09:44 +08:00
guange bcb162c600 #1968 解决IE8不能上传的问题， 只是解决，体验还是没有chrome,firefox的好 2015-03-14 12:01:08 +08:00
guange 5d1a5a0b11 #1738 修复图片下载次数不正确问题 2015-03-10 11:50:27 +08:00
alan f50ea0f780 Signed-off-by: alan <547533434@qq.com> 2015-03-06 16:36:12 +08:00
alan f374bfd7e2 修复《窗口跳转问题》 
Signed-off-by: alan <547533434@qq.com>
 2015-03-02 14:47:50 +08:00
alan 4bfc4493eb 添加《邮件周日发送》功能，修改《贴吧》邮件发送策略 
Signed-off-by: alan <547533434@qq.com>
 2015-02-11 20:23:50 +08:00
alan 6e72e07028 Merge branch 'szzh' into email_verify 
Conflicts:
	Gemfile
	Gemfile.lock
 2015-02-06 18:16:20 +08:00
alan 6f9e2bad63 mail weekly 2015-02-06 18:15:08 +08:00
alan 48cb0e0450 email verify 2015-01-31 15:04:48 +08:00
alan 2f168dd4d7 修改《课程动态》样式 
Signed-off-by: alan <547533434@qq.com>
 2015-01-30 17:47:57 +08:00
lizanle 3637d1906d Merge branch 'szzh' into dev_zanle 
Conflicts:
	Gemfile
	config/routes.rb
 2015-01-28 12:38:32 +08:00
zhuhao 2acca17e27 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	Gemfile
 2015-01-27 15:48:25 +08:00
zhuhao d32c4c8e86 预制件gem 2015-01-27 15:32:12 +08:00
lizanle d3f975434c 增加了new Relic gem 包 2015-01-27 14:22:25 +08:00
z9hang db1cd8851c Merge branch 'szzh' into api 
Conflicts:
	Gemfile
	db/schema.rb
 2015-01-23 16:51:40 +08:00
alan fdba8ca986 修改《邮箱地址真实性验证》《课程分班提示重名出错》《留言模块发送邮件模板功能》 
Signed-off-by: alan <547533434@qq.com>
 2015-01-23 11:46:55 +08:00
lizanle 240678673d 最新GemFile 2015-01-23 10:53:51 +08:00
lizanle 9b96d99d6f 无改动 2015-01-23 10:05:36 +08:00
alan 40d6c3b19c 添加《邮箱地址验证是否存在及国际化的编写》功能 
Signed-off-by: alan <547533434@qq.com>
 2015-01-20 16:33:59 +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
alan 9f807438d6 教师数目显示：-1 ，同时动态大量不显示。是不是只显示近期3个月的？ 
Signed-off-by: alan <547533434@qq.com>
 2015-01-12 14:58:11 +08:00
alan 74af44a826 修改《修改个人资料页面》bug 
Signed-off-by: alan <547533434@qq.com>
 2015-01-10 18:01:41 +08:00
alan a0d6bf4603 gemfile恢复 
Signed-off-by: alan <547533434@qq.com>
 2015-01-10 16:30:56 +08:00
z9hang 320c01994b 去除部分gem 2015-01-10 15:50:52 +08:00
alanlong9278 9e2bff7778 托管平台中创建某项目后进入该项目主页，点击tab的配置---信息，form表单没对齐 2015-01-07 14:59:41 +08:00
lizanle 10cde37582 cache using version 2015-01-07 09:27:44 +08:00