Fu Matthew 39f715319b Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu ...

Conflicts:
	lib/tasks/migrate.rake

2013-01-03 19:41:52 +08:00

..

assets

fix preview filed after ad_banner created.

2013-01-02 17:51:53 +08:00

controllers

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

2013-01-03 19:41:52 +08:00

errors

show error message when trying to show a not existed page

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

helpers

fix object auth. show error message if user try to do object auth in a wrong way.

2013-01-02 14:34:34 +08:00

jobs

merge

2012-10-01 21:09:09 +08:00

mailer

Add mail_settings

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

models

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

2013-01-03 19:41:52 +08:00

uploaders

Devin's changes to integrate the store

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

views

make default widget works without init

2013-01-03 19:38:14 +08:00