devin a62ff9308f 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-03-29 12:03:15 +08:00

..

admin

fix for both part and page part settings

2013-03-29 11:12:52 +08:00

default_widget

Pagination or more link for default widget

2013-03-07 21:21:48 +08:00

desktop

Lots of Update

2013-03-29 12:03:15 +08:00

desktop_widgets

update for desktop widgets

2012-11-05 11:40:11 +08:00

devise

Lots of Update

2013-03-29 12:03:15 +08:00

front

Fix breadcrumb again

2013-02-19 17:50:46 +08:00

js

Integrate Harry's modifications to reload pop-up content

2011-12-29 14:09:06 +08:00

kaminari

Add mobile but remove news in it

2013-01-07 03:03:38 +08:00

layouts

app manager changed plus some changes

2013-03-21 18:25:37 +08:00

mobile

Changes for mobile copyright

2013-02-04 18:02:11 +08:00

shared

Changes in I18n (except personal_conference and personal_journal)

2013-03-12 18:13:48 +08:00