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

..

_drop_down_menu.html.erb

Changes for i18n yml

2012-09-24 09:02:45 +08:00

_guest_orbit_menu.erb

Change icons

2013-01-09 21:17:50 +08:00

_lang_menu.html.erb

Chris's first commit at Fri Jan 28 2011 10:14:32 GMT+0800 (CST)

2011-04-13 18:19:51 +08:00

_member_orbit_menu.erb

Change icons

2013-01-09 21:17:50 +08:00

_orbit_bar.html.erb

Fix mobile banner, icons, announcement css

2013-01-11 18:34:20 +08:00

_side_bar_content.html.erb

Change icons

2013-01-09 21:17:50 +08:00

_side_bar.html.erb

Fix typo

2012-12-04 01:12:15 +08:00

_users_checkbox_ary.html.erb

fix for not working cache

2012-07-13 18:32:17 +08:00

admin.html.erb

new code for attribute fields and values for new member interface

2012-10-26 11:19:55 +08:00

application.html.erb

Merge server and rails_3_1

2011-08-18 13:43:33 +08:00

desktop.html.erb

Desktop Commit

2012-04-06 17:47:02 +08:00

devise.html.erb

Changes for IE9 with html5

2012-03-21 15:51:55 +08:00

mobile.mobile.erb

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

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

module_widget.html.erb

Changes for widgets

2012-05-13 21:55:39 +08:00

new_admin.html.erb

Changes for side_bar

2012-10-26 11:19:56 +08:00

page_layout.html.erb

Change icons

2013-01-09 21:17:50 +08:00

site_editor.html.erb

Changes for structure

2012-05-22 14:45:49 +08:00