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

..

assets

Fix ad_banner

2012-04-24 14:37:06 +08:00

controllers

Disable ad_banner_preview. Just show window

2012-04-24 14:37:06 +08:00

helpers

Fix side_bar for tags

2012-04-23 16:12:07 +08:00

models

Merge branch 'ad_banner' of github.com:Rulingcom/orbit into ad_banner

2012-04-24 14:43:30 +08:00

uploaders

Modifications for images in html code

2011-10-18 11:21:24 +08:00

views

Changes for Billingual

2012-04-24 14:37:06 +08:00