developers
/
Orbit
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Orbit/app
History
Matthew K. Fu JuYuan 49e6c33b57 Merge branch 'sidebar_config' of github.com:Rulingcom/orbit into sidebar_config 
Conflicts:
	app/controllers/admin/object_auths_new_interface_controller.rb
	app/views/layouts/_side_bar_content.html.erb
	config/locales/zh_tw.yml
	config/routes.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
	vendor/built_in_modules/announcement/init.rb
	vendor/built_in_modules/archive/init.rb
	vendor/built_in_modules/miss_module/config/locales/zh_tw.yml
 		2012-12-25 11:01:36 +08:00
..
assets Fix css bug when precompiling assets 2012-12-20 14:34:02 +08:00
controllers default widgets and sidebar. 2012-12-24 16:38:35 +08:00
helpers default widgets and sidebar. 2012-12-24 16:38:35 +08:00
jobs merge 2012-10-01 21:09:09 +08:00
mailer Add mail_settings 2012-05-09 11:38:29 +08:00
models fix serval bugs on sidebar. 2012-12-24 16:39:53 +08:00
uploaders rename of GPRS 2012-12-24 16:39:53 +08:00
views Merge branch 'sidebar_config' of github.com:Rulingcom/orbit into sidebar_config 2012-12-25 11:01:36 +08:00