Fu Matthew 76296ab29b Merge branch 'sidebar_config' into ntu ... Conflicts: app/controllers/admin/object_auths_new_interface_controller.rb app/controllers/orbit_backend_controller.rb app/controllers/orbit_widget_controller.rb app/models/module_app.rb app/views/admin/page_parts/_module_widget.html.erb config/locales/zh_tw.yml lib/parsers/parser_common.rb lib/parsers/parser_front_end.rb		2013-01-08 14:17:21 +08:00
..
ad_banners	fix preview filed after ad_banner created.	2013-01-02 17:51:53 +08:00
ad_images	Only one parser for front end	2012-12-19 17:15:31 +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	add info field	2012-12-06 07:58:39 +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	Remove test	2012-12-07 12:32:43 +08:00
items	soft structure order	2012-12-27 14:37:29 +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	Redirect to designs after buying template	2012-12-07 09:07:49 +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	Merge branch 'sidebar_config' into ntu	2013-01-08 14:17:21 +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	Devin's changes to integrate the store	2012-12-06 23:11:23 +08:00
sites	Add mobile version in site settings	2013-01-07 03:57:36 +08:00
tags	Translation changes	2012-12-03 23:00:04 +08:00
template_store	Redirect to designs after buying template	2012-12-07 09:07:49 +08:00
users_new_interface	Fix some translations	2012-12-04 01:03:28 +08:00