chris 282604d1fa Merge branch 'back' of github.com:Rulingcom/orbit into back ...

Conflicts:
	app/assets/javascripts/mobile/orbit.mobile.js.erb
	app/assets/stylesheets/mobile.css
	app/assets/stylesheets/mobile/orbit-mobile.css.erb
	app/controllers/application_controller.rb
	app/controllers/mobile_controller.rb
	app/views/layouts/mobile.mobile.erb
	app/views/mobile/_footer.mobile.erb
	app/views/mobile/_header.mobile.erb
	app/views/mobile/_menu.mobile.erb
	app/views/mobile/index.mobile.erb
	config/routes.rb

2013-01-14 17:46:27 +08:00

..

assets

Merge branch 'back' of github.com:Rulingcom/orbit into back

2013-01-14 17:46:27 +08:00

controllers

Merge branch 'back' of github.com:Rulingcom/orbit into back

2013-01-14 17:46:27 +08:00

errors

show error message when trying to show a not existed page

2013-01-03 13:50:27 +08:00

helpers

Change translation

2013-01-14 17:02:51 +08:00

jobs

Schedule job for tag_cloud

2013-01-08 12:36:50 +08:00

mailer

Add mail_settings

2012-05-09 11:38:29 +08:00

models

member roles edit

2013-01-14 17:02:51 +08:00

uploaders

Devin's changes to integrate the store

2012-12-06 23:11:23 +08:00

views

Merge branch 'back' of github.com:Rulingcom/orbit into back

2013-01-14 17:46:27 +08:00