Matthew K. Fu JuYuan b4a2737407 Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member ...

Conflicts:
	app/helpers/attribute_fields_helper.rb
	app/views/admin/infos/_form.html.erb
	config/locales/zh_tw.yml

2012-11-16 15:42:39 +08:00

..

.designs_controller.rb.swp

completing the code with segment fault

2011-08-16 12:14:01 +08:00

ad_banners_controller.rb

guest user

2012-09-12 16:20:15 +08:00

ad_images_controller.rb

Changes for i18n yml

2012-09-24 09:02:45 +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

guest user

2012-09-12 16:20:15 +08:00

designs_controller.rb

Edit uploaded package

2012-10-24 18:40:38 +08:00

infos_controller.rb

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

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

items_controller.rb

Changes for i18n yml

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

links_controller.rb

Changes for i18n yml

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

module_apps_controller.rb

Merge branch 'various_bugs' into nccu_master

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

module_apps_new_interface_controller.rb

Merge branch 'various_bugs' into nccu_master

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

object_auths_controller.rb

Changes for i18n yml

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

object_auths_new_interface_controller.rb

Merge branch 'various_bugs' into nccu_master

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

page_parts_controller.rb

Merge branch 'various_bugs' into nccu_master

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

pages_controller.rb

Merge branch 'various_bugs' into nccu_master

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

plugins_controller.rb

Changes for side_bar

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

purchases_controller.rb

Edit uploaded package

2012-10-24 18:40:38 +08:00

roles_controller.rb

Proof i18n_variable for categories

2012-05-18 10:28:28 +08:00

sessions_controller.rb

Replace PrototypeR4 by Orbit.

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

sites_controller.rb

Sitemap done for backend and fronted

2012-07-27 19:13:40 +08:00

tags_controller.rb

guest user

2012-09-12 16:20:15 +08:00

users_controller.rb

Changes for i18n yml

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

users_new_interface_controller.rb

Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member

2012-11-16 15:42:39 +08:00