chris 1e89c30150 Merge branch 'make_jsFunc_for_journalP' of github.com:Rulingcom/orbit into make_jsFunc_for_journalP		2012-11-26 05:02:58 +08:00
..
assets	Merge branch 'make_jsFunc_for_journalP' of github.com:Rulingcom/orbit into make_jsFunc_for_journalP	2012-11-26 05:02:58 +08:00
controllers	Merge branch 'make_jsFunc_for_journalP' of github.com:Rulingcom/orbit into make_jsFunc_for_journalP	2012-11-26 05:02:58 +08:00
helpers	disable data transform when switching attribute field type. new member stable	2012-11-22 21:10:35 +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	disable data transform when switching attribute field type. new member stable	2012-11-22 21:10:35 +08:00
uploaders	Remove news and fix default_url in ImageUploader	2012-11-22 09:30:25 +08:00
views	Merge branch 'make_jsFunc_for_journalP' of github.com:Rulingcom/orbit into make_jsFunc_for_journalP	2012-11-26 05:02:58 +08:00