jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
socialforge/public
History
lizanle d26b51c982 Merge branch 'szzh' into dev_zanle 
Conflicts:
	app/controllers/organizations_controller.rb
	db/schema.rb
 		2015-12-31 15:44:57 +08:00
..
assets at名单加宽一点 2015-12-21 15:14:51 +08:00
help error message: Redmine ==> Trustie 2013-08-12 23:42:39 +08:00
images Merge branch 'szzh' into dev_zanle 2015-12-31 11:11:38 +08:00
javascripts Merge branch 'szzh' into dev_zanle 2015-12-31 15:44:57 +08:00
plugin_assets 经测试，转到rspec各方面成熟一点。 2015-05-14 11:41:50 +08:00
statistics/trustie2 Signed-off-by: alan <547533434@qq.com> 2014-10-21 15:13:18 +08:00
stylesheets Merge branch 'szzh' into dev_zanle 2015-12-31 15:44:57 +08:00
themes 学校修改界面修改 2015-10-19 15:51:27 +08:00
404.html 修改contest中出现的逻辑错误 2014-10-23 11:30:34 +08:00
500.html new version 2013-09-12 10:41:15 +08:00
Trustie_Beta1.0.0_201412310917.apk for update 2015-01-04 11:53:16 +08:00
dispatch.fcgi.example first commit 2013-08-01 10:33:49 +08:00
favicon.ico first commit 2013-08-01 10:33:49 +08:00
favicon.old.ico first commit 2013-08-01 10:33:49 +08:00
file_not_found.html Signed-off-by: alan <547533434@qq.com> 2014-11-13 10:18:07 +08:00
file_not_found.html.erb Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-09-15 10:58:14 +08:00
htaccess.fcgi.example first commit 2013-08-01 10:33:49 +08:00
no_file_found.html Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-09-15 10:58:14 +08:00