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

..

admin

disable all sorted_tags

2013-04-26 18:07:59 +08:00

admin_helper.rb

default widgets and sidebar.

2012-12-24 16:38:35 +08:00

application_helper.rb

Ad_Banner fix for FGU

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

attribute_fields_helper.rb

Change translation

2013-01-14 17:02:51 +08:00

attribute_values_helper.rb

Translation changes

2012-12-03 23:00:04 +08:00

default_widget_helper.rb

Change get_item

2013-07-19 18:39:13 +08:00

front_helper.rb

Fix for link in ad banner

2013-01-11 11:28:13 +08:00

member_helper.rb

user id set & user fields set & role set & member frontend list & user translation & create new member bug fix

2013-04-25 19:59:59 +08:00

orbit_backend_helper.rb

Merge branch 'various_bugs' into nccu_master

2012-10-29 16:10:07 +08:00

orbit_form_helper.rb

fix datepicker helper hidden field value

2013-06-06 18:42:26 +08:00