Matthew K. Fu JuYuan 430b0fd9ae Merge branch 'ad_banner' of https://github.com/Rulingcom/orbit into ad_banner ...

Conflicts:
	app/views/admin/ad_banners/_ad_image_update.html.erb

2012-04-13 16:52:14 +08:00

..

assets

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

2012-04-13 16:52:14 +08:00

controllers

The new AdBanner.

2012-04-02 03:04:38 +08:00

helpers

Fix side_bar.

2012-04-12 18:14:00 +08:00

models

Fix bugs in upload design and missing menu

2012-04-06 17:37:45 +08:00

uploaders

Modifications for images in html code

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

views

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

2012-04-13 16:52:14 +08:00