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

..

assets

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

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

controllers

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

2013-02-22 17:53:49 +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 'development' of github.com:Rulingcom/orbit into development

2013-02-22 17:53:49 +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

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

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

uploaders

Merge commit 'fc702a6210d901cd3beea220e72f71a3b7f7d41e' into sidebar_config

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

views

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

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