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

Conflicts:
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/setting.html.erb

2012-04-24 16:32:00 +08:00

..

assets

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

2012-04-24 16:32:00 +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