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
..
ad_banner_helper.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
ad_images_helper.rb	Fix site_locale_default_head and active for current locale	2012-05-07 00:53:52 +08:00
app_auth_helper.rb	First version for App and Object auth.Taking Announcement as experiment	2012-02-29 18:55:55 +08:00
dashboard_helper.rb	Add impressionist	2012-05-15 21:26:09 +08:00
item_helper.rb	Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team	2012-05-11 18:09:34 +08:00
module_app_helper.rb	Integrate App & Object Auth to announcement with i18n variables. Also changed Role and SubRole i18n var. Checked with Allen	2012-04-30 00:24:11 +08:00
page_content_helper.rb	Change to apply page to had object_auth	2012-05-14 12:40:50 +08:00
user_helper.rb	Merge with sub_roles	2011-12-23 18:34:21 +08:00
web_link_helper.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