orbit-basic

0 Fork 0

Files

T

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

ad_banners

Page by page changes for i18n yml

2012-09-24 09:06:44 +08:00

ad_images

Page by page changes for i18n yml

2012-09-24 09:06:44 +08:00

app_auths

Fix typos after i18n yml

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

asset_categories

Changes for i18n yml

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

assets

Merge branch 'various_bugs' into nccu_master

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

attributes

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

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

components

Changes for i18n yml

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

dashboards

Merge branch 'various_bugs' into nccu_master

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

designs

Merge branch 'various_bugs' into nccu_master

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

infos

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

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

items

Fix .class to .class.to_s

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

links

Changes for i18n yml

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

module_apps

Merge branch 'various_bugs' into nccu_master

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

module_apps_new_interface

Page by page changes for i18n yml

2012-09-24 09:06:44 +08:00

object_auths

Changes for i18n yml

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

object_auths_new_interface

object_auth change to reload

2012-10-04 18:20:21 +08:00

page_parts

Merge branch 'various_bugs' into nccu_master

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

pages

Merge branch 'various_bugs' into nccu_master

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

plugins

Merge branch 'various_bugs' into nccu_master

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

purchases

Fix typos after i18n yml

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

roles

Add missing translations

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

sites

Merge branch 'various_bugs' into nccu_master

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