developers
/
orbit-basic
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
orbit-basic/app/controllers
History
Fu Matthew bfaa22052f Merge commit 'fc702a6210d901cd3beea220e72f71a3b7f7d41e' into sidebar_config 
Conflicts:
	app/controllers/admin/page_parts_controller.rb
	app/controllers/default_widget_controller.rb
	app/uploaders/gprs_uploader.rb
	app/uploaders/location_uploader.rb
	app/views/admin/page_parts/_module_widget.html.erb
	app/views/admin/page_parts/reload_widget_styles.js.erb
	app/views/admin/page_parts/reload_widgets.js.erb
	app/views/layouts/_side_bar_content.html.erb
	config/locales/zh_tw.yml
	lib/parsers/parser_front_end.rb
	vendor/built_in_modules/announcement/init.rb
	vendor/built_in_modules/gprs/app/assets/javascripts/panel/gprs/back_end/locations.js
	vendor/built_in_modules/gprs/app/assets/stylesheets/panel/gprs/back_end/locations.css
	vendor/built_in_modules/gprs/app/controllers/panel/gprs/back_end/locations_controller.rb
	vendor/built_in_modules/gprs/app/views/panel/gprs/back_end/locations/index.html.erb
	vendor/built_in_modules/gprs/test/functional/panel/gprs/back_end/locations_controller_test.rb
	vendor/built_in_modules/location/README.rdoc
	vendor/built_in_modules/location/app/assets/javascripts/panel/gprs/back_end/locations.js
	vendor/built_in_modules/location/app/assets/javascripts/panel/location/back_end/locations.js
	vendor/built_in_modules/location/app/assets/stylesheets/panel/gprs/back_end/locations.css
	vendor/built_in_modules/location/app/assets/stylesheets/panel/location/back_end/locations.css
	vendor/built_in_modules/location/app/controllers/panel/location/back_end/locations_controller.rb
	vendor/built_in_modules/location/app/controllers/panel/locations/back_end/locations_controller.rb
	vendor/built_in_modules/location/app/models/location.rb
	vendor/built_in_modules/location/app/uploaders/locations_uploader.rb
	vendor/built_in_modules/location/app/views/panel/location/back_end/locations/index.html.erb
	vendor/built_in_modules/location/app/views/panel/locations/back_end/locations/_form.html.erb
	vendor/built_in_modules/location/app/views/panel/locations/back_end/locations/edit.html.erb
	vendor/built_in_modules/location/app/views/panel/locations/back_end/locations/index.html.erb
	vendor/built_in_modules/location/app/views/panel/locations/back_end/locations/new.html.erb
	vendor/built_in_modules/location/config/routes.rb
	vendor/built_in_modules/location/lib/location.rb
	vendor/built_in_modules/location/location.gemspec
	vendor/built_in_modules/location/test/functional/panel/gprs/back_end/locations_controller_test.rb
	vendor/built_in_modules/location/test/functional/panel/location/back_end/locations_controller_test.rb
 		2013-01-24 16:30:02 +08:00
..
admin Merge commit 'fc702a6210d901cd3beea220e72f71a3b7f7d41e' into sidebar_config 2013-01-24 16:30:02 +08:00
desktop move journal code to persional_journal modulaar 2013-01-14 17:53:59 +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 Merge commit 'fc702a6210d901cd3beea220e72f71a3b7f7d41e' into sidebar_config 2013-01-24 16:30:02 +08:00
desktop_appstore_controller.rb new page add and timeline changes 2012-06-28 17:31:48 +08:00
desktop_controller.rb amend file value to correct format 2013-01-14 17:53:59 +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 modularized personal journal 2013-01-14 17:54:52 +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 Merge branch 'sidebar_config' into ntu 2013-01-08 14:17:21 +08:00
orbit_frontend_component_controller.rb Changes for widgets 2012-05-13 21:55:39 +08:00
orbit_frontend_controller.rb default widgets and sidebar. 2012-12-24 16:38:35 +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