orbit-basic/app/controllers
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
desktop fixed bug about co-author-relation 2012-12-07 04:21:26 +08:00
application_controller.rb Merge branch 'back' of github.com:Rulingcom/orbit into back 2013-01-14 17:46:27 +08:00
default_widget_controller.rb change *default* to *defulat* 2013-01-10 09:40:52 +08:00
desktop_appstore_controller.rb new page add and timeline changes 2012-06-28 17:31:48 +08:00
desktop_controller.rb all sections and sections megerd 2012-12-07 12:38:23 +08:00
desktop_orbit_controller.rb design update 2012-09-12 01:58:23 +08:00
desktop_publications_controller.000.rb member selects 2012-11-26 10:25:34 +08:00
desktop_publications_controller.rb add edit function 2012-11-21 07:37:43 +08:00
desktop_research_controller.rb Page added for desktop 2012-08-20 23:17:31 +08:00
desktop_widgets_controller.rb Desktop Widgtes updates.. 2012-11-06 10:36:34 +08:00
front_controller.rb add ad_banner inner page,pic title. 2013-01-09 16:54:33 +08:00
gridfs_controller.rb Multi language and side bar update 2012-08-20 23:14:11 +08:00
mobile_controller.rb Remove bottom padding if no footer in mobile 2013-01-11 19:14:48 +08:00
orbit_backend_controller.rb fix calendar broken 2013-01-03 10:58:52 +08:00
orbit_frontend_component_controller.rb Changes for widgets 2012-05-13 21:55:39 +08:00
orbit_frontend_controller.rb First version for App and Object auth.Taking Announcement as experiment 2012-02-29 18:55:55 +08:00
orbit_widget_controller.rb Fix album widget options 2013-01-07 00:40:43 +08:00
otheraccounts_controller.rb update for desktop widgets 2012-11-05 11:40:11 +08:00
pages_controller.rb add ad_banner inner page,pic title. 2013-01-09 16:54:33 +08:00