Christophe Vilayphiou 51ee9a4bfa Merge branch 'ad_banner' of github.com:Rulingcom/orbit into ad_banner ... Conflicts: app/views/admin/ad_banners/_ad_banner_tab.html.erb		2012-04-24 14:43:30 +08:00
..
design	Fix bugs in upload design and missing menu	2012-04-06 17:37:45 +08:00
meta	…
purchase	…
user	…
.user.rb.swp	…
ad_banner.rb	Merge branch 'ad_banner' of github.com:Rulingcom/orbit into ad_banner	2012-04-24 14:43:30 +08:00
ad_image.rb	Disable ad_banner_preview. Just show window	2012-04-24 14:37:06 +08:00
app_auth.rb	…
app_manager.rb	…
asset.rb	…
component.rb	…
i18n_variable.rb	…
item.rb	…
link.rb	…
meta.rb	…
module_app.rb	…
object_auth.rb	…
page.rb	Fix several bus when there is no design	2012-04-02 02:41:42 +08:00
page_part.rb	Add sub_menu in r_tags	2012-04-24 02:30:40 +08:00
prototype_auth.rb	…
session.rb	…
site.rb	…
tag.rb	…