Christophe Vilayphiou ef49df448d Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team ...

Conflicts:
	app/helpers/admin/item_helper.rb

2012-05-11 18:09:34 +08:00

..

ad_banner_helper.rb

ad banner preview

2012-04-09 12:44:08 +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

Dashboard partial implementation

2012-05-09 05:53:07 +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

user_helper.rb

Merge with sub_roles

2011-12-23 18:34:21 +08:00