This repository has been archived on 2024-03-16. You can view files and clone it, but cannot push or open issues or pull requests.

devin c8aa50ee87 Lots of Update ... 1. CSS to SCSS 2. Journal Paper update Conflicts: Gemfile.lock app/assets/javascripts/orbitdesktop.js app/assets/stylesheets/desktop/desktop-main.css vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/index.html.erb vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_authors/index.html.erb vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/journal_type.html.erb		2013-04-17 14:14:23 +08:00
..
assets	Lots of Update	2013-04-17 14:14:23 +08:00
controllers	fix for both part and page part settings	2013-04-17 14:12: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 for both part and page part settings	2013-04-17 14:12:52 +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	fix for both part and page part settings	2013-04-17 14:12:52 +08:00
uploaders	Merge commit 'fc702a6210d901cd3beea220e72f71a3b7f7d41e' into sidebar_config	2013-01-24 16:30:02 +08:00
views	Lots of Update	2013-04-17 14:14:23 +08:00