Matthew K. Fu JuYuan ca290f3519 Merge commit 'e429aa9425e9648a94a1dd7bb5cea15af7ba854a' into sidebar_config ...

Conflicts:
	app/views/layouts/_side_bar_content.html.erb
	config/locales/zh_tw.yml
	config/mongoid.yml
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
	vendor/built_in_modules/announcement/init.rb

2012-12-05 11:36:32 +08:00

..

ad_banners

Translation changes

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

ad_images

Translation changes

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

app_auths

Translation changes

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

asset_categories

Translation changes

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

assets

Translation changes

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

attributes

Translation changes

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

components

Translation changes

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

dashboards

Change icons

2012-11-29 00:49:53 +08:00

designs

Translation changes

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

items

Fix .class to .class.to_s

2012-07-30 18:34:54 +08:00

links

Translation changes

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

member_selects

member selects

2012-11-26 10:25:34 +08:00

module_apps

Fix: remove i18n_variable from reload_frontend_pages.js.erb

2012-11-15 18:11:01 +08:00

module_apps_new_interface

Translation changes

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

module_store

Module store

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

object_auths

Translation changes

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

object_auths_new_interface

Translation changes

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

page_parts

default widgets and sidebar.

2012-12-03 18:52:36 +08:00

pages

Fix some translations

2012-12-04 01:03:28 +08:00

plugins

Translation changes

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

purchases

Translation changes

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

sites

Module store

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

tags

Translation changes

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

template_store

Module store

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

users_new_interface

Fix some translations

2012-12-04 01:03:28 +08:00