Fu Matthew 76296ab29b Merge branch 'sidebar_config' into ntu ...

Conflicts:
	app/controllers/admin/object_auths_new_interface_controller.rb
	app/controllers/orbit_backend_controller.rb
	app/controllers/orbit_widget_controller.rb
	app/models/module_app.rb
	app/views/admin/page_parts/_module_widget.html.erb
	config/locales/zh_tw.yml
	lib/parsers/parser_common.rb
	lib/parsers/parser_front_end.rb

2013-01-08 14:17:21 +08:00

..

admin

Merge branch 'sidebar_config' into ntu

2013-01-08 14:17:21 +08:00

desktop

fixed bug about co-author-relation

2012-12-07 04:21:26 +08:00

application_controller.rb

Add mobile version in site settings

2013-01-07 03:57:36 +08:00

default_widget_controller.rb

Merge branch 'sidebar_config' into ntu

2013-01-08 14:17:21 +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

Fix site map and menu order

2012-12-28 11:37:37 +08:00

gridfs_controller.rb

Multi language and side bar update

2012-08-20 23:14:11 +08:00

mobile_controller.rb

Add mobile but remove news in it

2013-01-07 03:03:38 +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

complete page error handler logic

2013-01-03 15:35:14 +08:00