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

53 Commits

Author SHA1 Message Date
guange 52d4d36097 邀请码页面 2016-06-24 09:01:12 +08:00
guange d3d31ca3a2 Merge remote-tracking branch 'origin/develop' into weixin_guange 2016-06-12 17:18:34 +08:00
guange 793b651393 压缩angularjs 2016-06-09 19:48:58 +08:00
cxt fa58fbdca1 微信的menu.yml和wechat.yml不提交 2016-06-08 11:21:02 +08:00
cxt b72ad364db 微信模板消息：用户绑定成功、作业消息、个人留言、班级通知 2016-06-02 10:39:11 +08:00
cxt 1fa6ac89ce 微信的配置 2016-05-27 11:07:27 +08:00
guange 5a60702412 删除1234567 2016-04-25 21:23:52 +08:00
huang aa4710d872 git中忽略配置文件 
提交记录新界面
修改获取用户路径
 2015-10-30 15:46:06 +08:00
guange ee35de5447 忽略redis配置文件 2015-05-29 20:05:49 +08:00
alanlong9278 b1a60d3118 Signed-off-by: alanlong9278 <547533434@qq.com> 2015-05-26 00:01:15 +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 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
sw 19edc8f586 1、忽略logo文件夹 
2、忽略editor上传图片文件夹
 2015-04-12 14:24:09 +08:00
guange af6db916d9 将files文件夹忽略 2015-04-11 14:49:44 +08:00
guange 0880ca2e1d --amend 2015-03-12 22:01:49 +08:00
huang f898e2aa91 16:22 2015-03-06 16:22:07 +08:00
sw ce526fde77 Merge branch 'dev_zanle' into szzh 
Conflicts:
	config/routes.rb
 2015-01-30 09:05:47 +08:00
lizanle a3aea4434b 忽略newrelic.yml 2015-01-27 14:24:30 +08:00
z9hang db1cd8851c Merge branch 'szzh' into api 
Conflicts:
	Gemfile
	db/schema.rb
 2015-01-23 16:51:40 +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 bb9ab0755c 忽略tmp文件 2015-01-23 09:54:18 +08:00
lizanle 3047b523b0 add expire_helper and change the code way of set cache expire! 2015-01-09 15:28:43 +08:00
lizanle 7d351e9794 change cache files sites 2015-01-07 09:53:52 +08:00
guange 5eba06ddf9 加入api在线文档 2014-12-10 15:11:10 +08:00
guange 4be329db11 osx忽略.DS_Store 2014-12-04 17:15:17 +08:00
hhuai b34e74bd1c issue 1012, table中td撑坏的问题 2014-08-18 17:00:52 +08:00
sw ec41054008 将configuration.yml从版本库删除 2014-07-24 16:26:19 +08:00
nwb d1b438953a wiki_format更新 2014-06-24 16:26:29 +08:00
wanglinchun 4188c046c7 Merge branch 'develop' 2014-05-05 10:05:10 +08:00
yanxd 2b5cdf161c 不能删除帖子问题 2014-05-04 18:49:56 +08:00
yan a191b634c5 forum memocount error, footer margin 2014-04-28 20:37:12 +08:00
xianbo cd278cb795 erge branch 'develop' 
Conflicts:
	.gitignore
 2014-04-21 20:24:27 +08:00
xianbo ca032b659b fix 2014-04-21 20:21:36 +08:00
xianbo 4de9f959ac clean repository 2014-04-21 20:14:58 +08:00
xianbo 1aae4291a5 fix gitignore 2014-04-21 14:15:57 +08:00
yanxd 7efaa8aba3 gitignore idea 2014-04-19 09:13:08 +08:00
yanxd 02a03f7c54 导航栏防止意外http参数不全的错误 2014-02-17 15:37:04 +08:00
xianbo 95ed1880b5 fix setting about migrate path 2014-01-02 09:11:38 +08:00
xianbo 0af3d4488f fix 2013-12-16 19:41:07 +08:00
yanxd 733524b413 ref gitignore 2013-12-15 15:25:50 +08:00
yanxd 763f217f5e . 2013-12-15 15:13:18 +08:00
yanxd 759a0ad1f5 change gitignore 2013-10-29 20:58:10 +08:00
xianbo 806fae7b19 Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop 
Conflicts:
	app/controllers/account_controller.rb
	app/controllers/my_controller.rb
	app/controllers/projects_controller.rb
	app/controllers/users_controller.rb
	app/helpers/projects_helper.rb
	app/helpers/users_helper.rb
	app/models/project.rb
	app/models/user.rb
	app/models/user_extensions.rb
	app/views/account/register.html.erb
	app/views/bids/_bid_show.html.erb
	app/views/bids/_history.html.erb
	app/views/bids/_project_list.html.erb
	app/views/bids/show.html.erb
	app/views/files/index.html.erb
	app/views/layouts/base_bids.html.erb
	app/views/layouts/base_users.html.erb
	app/views/my/account.html.erb
	app/views/users/watch_bids.html.erb
	config/locales/en.yml
	config/locales/zh.yml
	config/routes.rb
	db/schema.rb
	lib/redmine.rb
	public/stylesheets/application.css
 2013-09-23 20:18:03 +08:00
fanqiang 1781d3ba8d Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop 
Conflicts:
	app/views/layouts/base_bids.html.erb
 2013-08-01 20:59:29 +08:00
huangjingquan bf1f9b8e19 remove .bundle from ignored file list 2013-08-01 11:08:59 +08:00