Orbit/vendor/built_in_modules/personal_conference/app
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 all none for conf done 2013-04-17 11:23:03 +08:00
controllers section page fixed.. 2013-04-17 14:01:48 +08:00
helpers fixed checkout and start in personal plugin 2013-04-17 11:08:58 +08:00
mailers relpace seminar to conference 2013-02-04 18:01:38 +08:00
models correct model method 2013-04-17 14:07:24 +08:00
views Lots of Update 2013-04-17 14:14:23 +08:00