Manson Wang 9849b5c7dd Ad_Banner fix for FGU ...

Conflicts:

	app/views/front/show_banner.html.erb
	public/static/kernel.js

2013-10-16 09:56:00 +08:00

..

jquery.cycle.all.latest.js

include ad_banner query code. cleaned up parser

2012-02-15 00:34:21 +08:00

jquery.js

Orbit-bar in front-end and back-end, side-bar and drop-down menu

2012-02-15 00:34:22 +08:00

kernel.js

Ad_Banner fix for FGU

2013-10-16 09:56:00 +08:00

nccu_calendar.xml

merge

2012-10-01 21:09:09 +08:00

Other.xml

Ray's changes for structure and web_links

2012-04-27 11:02:56 +08:00