Orbit/app
chris 6ca52226ba Merge branch 'make_jsFunc_for_journalP' of github.com:Rulingcom/orbit into make_jsFunc_for_journalP
Conflicts:
	app/views/desktop/journal_p.html.erb
2012-11-21 18:38:28 +08:00
..
assets routes fixed 2012-11-21 18:36:56 +08:00
controllers small fix for journal_pages desktop 2012-11-21 18:36:56 +08:00
helpers for openness 2012-11-20 20:20:59 +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 add co-author db and curd page, but it can't destory it... 2012-11-21 18:36:32 +08:00
uploaders Edit uploaded package 2012-10-26 11:19:57 +08:00
views Merge branch 'make_jsFunc_for_journalP' of github.com:Rulingcom/orbit into make_jsFunc_for_journalP 2012-11-21 18:38:28 +08:00