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
..
admin	member roles edit	2013-01-14 17:02:51 +08:00
default_widget	change *default* to *defulat*	2013-01-10 09:40:52 +08:00
desktop	new desktop framework updates	2012-12-27 18:25:54 +08:00
desktop_widgets	update for desktop widgets	2012-11-05 11:40:11 +08:00
devise	view update	2012-12-06 07:59:43 +08:00
front	Fix for link in ad banner	2013-01-11 11:28:13 +08:00
js	Integrate Harry's modifications to reload pop-up content	2011-12-29 14:09:06 +08:00
kaminari	Add mobile but remove news in it	2013-01-07 03:03:38 +08:00
layouts	Merge branch 'back' of github.com:Rulingcom/orbit into back	2013-01-14 17:46:27 +08:00
mobile	Merge branch 'back' of github.com:Rulingcom/orbit into back	2013-01-14 17:46:27 +08:00
shared	Change translation	2013-01-14 17:02:51 +08:00