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
..
admin	Merge branch 'design_team' of https://github.com/Rulingcom/orbit into nccu_0509	2012-05-16 12:13:07 +08:00
application_controller.rb	Change to apply page to had object_auth	2012-05-14 12:40:50 +08:00
gridfs_controller.rb	The new AdBanner.	2012-04-02 03:04:38 +08:00
orbit_backend_controller.rb	First version of app and object auth for web_resource module. Basic fund is ok. backend need to be secued	2012-05-15 18:55:16 +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	Change Obit to Orbit	2012-03-16 11:54:31 +08:00
pages_controller.rb	Add impressionist	2012-05-15 21:26:09 +08:00