Matthew K. Fu JuYuan a31a9c4792 Merge branch 'design_team' of https://github.com/Rulingcom/orbit into nccu_0509 ... Conflicts: app/controllers/admin/object_auths_new_interface_controller.rb app/helpers/application_helper.rb app/models/ad_banner.rb		2012-05-16 12:13:07 +08:00
..
announcement	Merge branch 'design_team' of https://github.com/Rulingcom/orbit into nccu_0509	2012-05-16 12:13:07 +08:00
news	Add impressionist	2012-05-15 21:26:09 +08:00
page_content	Add each page name to page_context index	2012-05-15 21:31:54 +08:00
web_resource	Fix sidebar and hide some links by roles	2012-05-16 12:10:16 +08:00