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

..

confirmations

LDAP connection and modified Devise

2012-02-22 14:43:24 +08:00

mailer

LDAP connection and modified Devise

2012-02-22 14:43:24 +08:00

menu

Ika's changes

2011-08-25 08:07:18 +08:00

passwords

Merge branch 'design_team' into ldap for NCCU 0229 demo on Redmine

2012-02-29 13:07:21 +08:00

registrations

Lots of Update

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

sessions

Fix some translations

2012-12-04 01:03:28 +08:00

shared

LDAP connection and modified Devise

2012-02-22 14:43:24 +08:00

unlocks

LDAP connection and modified Devise

2012-02-22 14:43:24 +08:00