Matt K. Fu 0f6f5aafce fix for both part and page part settings ...

Conflicts:
	app/helpers/admin/page_parts_helper.rb
	app/views/admin/pages/reload_front_end_setting.js.erb
	app/views/admin/pages/reload_frontend_pages.js.erb

2013-04-17 14:12:52 +08:00

..

ad_banners_helper.rb

change ActiveSupport::SecureRandom to SecureRandom in orbit core

2012-12-27 12:19:42 +08:00

app_auths_helper.rb

Changes for helpers, not including all by default

2012-10-09 14:47:16 +08:00

assets_helper.rb

Changes for helpers, not including all by default

2012-10-09 14:47:16 +08:00

attribute_values_view_helper.rb

add new member with role interface. add more not usable.

2012-11-04 20:42:58 +08:00

dashboards_helper.rb

Remove news and fix default_url in ImageUploader

2012-11-22 09:30:25 +08:00

items_helper.rb

Change icons

2013-01-09 21:17:50 +08:00

module_apps_helper.rb

Merge branch 'various_bugs' into nccu_master

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

page_parts_helper.rb

fix for both part and page part settings

2013-04-17 14:12:52 +08:00

plugins_helper.rb

Changes for side_bar

2012-10-26 11:19:56 +08:00

users_helper.rb

Changes for helpers, not including all by default

2012-10-09 14:47:16 +08:00

web_component_helper.rb

complete preview for both new and announcement

2012-09-07 17:55:59 +08:00