Fu Matthew bfaa22052f Merge commit 'fc702a6210d901cd3beea220e72f71a3b7f7d41e' into sidebar_config ...

Conflicts:
	app/controllers/admin/page_parts_controller.rb
	app/controllers/default_widget_controller.rb
	app/uploaders/gprs_uploader.rb
	app/uploaders/location_uploader.rb
	app/views/admin/page_parts/_module_widget.html.erb
	app/views/admin/page_parts/reload_widget_styles.js.erb
	app/views/admin/page_parts/reload_widgets.js.erb
	app/views/layouts/_side_bar_content.html.erb
	config/locales/zh_tw.yml
	lib/parsers/parser_front_end.rb
	vendor/built_in_modules/announcement/init.rb
	vendor/built_in_modules/gprs/app/assets/javascripts/panel/gprs/back_end/locations.js
	vendor/built_in_modules/gprs/app/assets/stylesheets/panel/gprs/back_end/locations.css
	vendor/built_in_modules/gprs/app/controllers/panel/gprs/back_end/locations_controller.rb
	vendor/built_in_modules/gprs/app/views/panel/gprs/back_end/locations/index.html.erb
	vendor/built_in_modules/gprs/test/functional/panel/gprs/back_end/locations_controller_test.rb
	vendor/built_in_modules/location/README.rdoc
	vendor/built_in_modules/location/app/assets/javascripts/panel/gprs/back_end/locations.js
	vendor/built_in_modules/location/app/assets/javascripts/panel/location/back_end/locations.js
	vendor/built_in_modules/location/app/assets/stylesheets/panel/gprs/back_end/locations.css
	vendor/built_in_modules/location/app/assets/stylesheets/panel/location/back_end/locations.css
	vendor/built_in_modules/location/app/controllers/panel/location/back_end/locations_controller.rb
	vendor/built_in_modules/location/app/controllers/panel/locations/back_end/locations_controller.rb
	vendor/built_in_modules/location/app/models/location.rb
	vendor/built_in_modules/location/app/uploaders/locations_uploader.rb
	vendor/built_in_modules/location/app/views/panel/location/back_end/locations/index.html.erb
	vendor/built_in_modules/location/app/views/panel/locations/back_end/locations/_form.html.erb
	vendor/built_in_modules/location/app/views/panel/locations/back_end/locations/edit.html.erb
	vendor/built_in_modules/location/app/views/panel/locations/back_end/locations/index.html.erb
	vendor/built_in_modules/location/app/views/panel/locations/back_end/locations/new.html.erb
	vendor/built_in_modules/location/config/routes.rb
	vendor/built_in_modules/location/lib/location.rb
	vendor/built_in_modules/location/location.gemspec
	vendor/built_in_modules/location/test/functional/panel/gprs/back_end/locations_controller_test.rb
	vendor/built_in_modules/location/test/functional/panel/location/back_end/locations_controller_test.rb

2013-01-24 16:30:02 +08:00

..

ad_banners_controller.rb

Restore "force_order_for_user" for ad_banner

2012-11-20 12:38:35 +08:00

ad_images_controller.rb

Fix for ad_image

2012-11-20 15:47:07 +08:00

app_auths_controller.rb

add "all_user" for app&object auth

2012-02-29 18:56:42 +08:00

asset_categories_controller.rb

Changes for i18n yml

2012-09-24 09:02:45 +08:00

asset_tags_controller.rb

Add tags to assets

2012-05-16 18:19:41 +08:00

assets_controller.rb

Changes for i18n yml

2012-09-24 09:02:45 +08:00

dashboards_controller.rb

Remove news and fix default_url in ImageUploader

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

designs_controller.rb

Preventing site default design being deleted.

2012-12-27 10:26:27 +08:00

infos_controller.rb

member role edit

2013-01-14 19:00:08 +08:00

items_controller.rb

Changes for i18n yml

2012-09-24 09:02:45 +08:00

links_controller.rb

Fix these bugs:

2012-11-15 15:51:44 +08:00

member_selects_controller.rb

.not_guest_user

2012-12-19 19:48:13 +08:00

module_apps_controller.rb

page can use default widget

2013-01-21 16:56:37 +08:00

module_apps_new_interface_controller.rb

.not_guest_user

2012-12-19 19:48:13 +08:00

module_store_controller.rb

Module store

2012-11-29 02:02:37 +08:00

object_auths_controller.rb

default widgets and sidebar.

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

object_auths_new_interface_controller.rb

Merge branch 'sidebar_config' into ntu

2013-01-08 14:17:21 +08:00

page_parts_controller.rb

Merge commit 'fc702a6210d901cd3beea220e72f71a3b7f7d41e' into sidebar_config

2013-01-24 16:30:02 +08:00

pages_controller.rb

daily commit

2013-01-23 18:51:18 +08:00

plugins_controller.rb

Changes for side_bar

2012-10-15 15:30:48 +08:00

purchases_controller.rb

Redirect to designs after buying template

2012-12-07 09:07:49 +08:00

roles_controller.rb

member roles edit

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

sessions_controller.rb

Replace PrototypeR4 by Orbit.

2012-03-16 14:58:32 +08:00

sites_controller.rb

Only one parser for front end

2012-12-19 17:15:31 +08:00

sub_roles_controller.rb

member roles edit

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

tags_controller.rb

Fix old tags

2013-01-03 19:15:08 +08:00

template_store_controller.rb

Add images to store

2012-12-07 02:37:05 +08:00

users_new_interface_controller.rb

Merge branch 'sidebar_config' into ntu

2013-01-08 14:17:21 +08:00