chris 8e0331449f Merge branch 'patrial_Select_for_default_widget_style' of github.com:Rulingcom/orbit into patrial_Select_for_default_widget_style ...

Conflicts:
	app/controllers/admin/pages_controller.rb
	app/helpers/admin/page_parts_helper.rb

2013-03-21 18:51:16 +08:00

..

assets

app manager changed plus some changes

2013-03-21 18:25:37 +08:00

controllers

add conditions for making multi cates and tags more stable

2013-03-21 18:49:53 +08:00

errors

show error message when trying to show a not existed page

2013-01-03 13:50:27 +08:00

helpers

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

2013-03-21 18:51:16 +08:00

jobs

Schedule job for tag_cloud

2013-01-08 12:36:50 +08:00

mailer

Add mail_settings

2012-05-09 11:38:29 +08:00

models

first version of multi categories and tags

2013-02-27 10:49:48 +08:00

uploaders

Merge commit 'fc702a6210d901cd3beea220e72f71a3b7f7d41e' into sidebar_config

2013-01-24 16:30:02 +08:00

views

now default options can be chosen by developer at init

2013-03-21 18:46:57 +08:00