Fu Matthew 9fec7beb47 Merge branch 'development' of github.com:Rulingcom/orbit into development ...

Conflicts:
	app/controllers/default_widget_controller.rb
	lib/tasks/migrate.rake

2013-02-22 17:53:49 +08:00

..

ad_banners

Translation typo

2013-01-09 21:17:50 +08:00

ad_images

Fix the tooltips

2013-01-11 12:13:16 +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

member list edit

2013-02-21 14:13:46 +08:00

components

Translation changes

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

dashboards

Change icons

2013-01-09 21:17:50 +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

first version of app config and modified inits.

2013-01-29 20:33:40 +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 'development' of github.com:Rulingcom/orbit into development

2013-02-22 17:53:49 +08:00

pages

first version of multi categories and tags

2013-02-22 16:32:05 +08:00

plugins

member list edit

2013-02-21 14:13:46 +08:00

purchases

Devin's changes to integrate the store

2012-12-06 23:11:23 +08:00

roles

member list edit

2013-02-21 14:13:46 +08:00

sites

Fix sitemap in page edit

2013-02-19 17:39:43 +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

member list edit

2013-02-21 14:13:46 +08:00