developers
/
Orbit
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Orbit/vendor/built_in_modules
History
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
..
ad_banner Changes in I18n (except personal_conference and personal_journal) 2013-03-12 18:13:48 +08:00
announcement now default options can be chosen by developer at init 2013-03-21 18:46:57 +08:00
archive Spen's changes in archive 2013-03-21 14:38:04 +08:00
calendar Changes in I18n (except personal_conference and personal_journal) 2013-03-12 18:13:48 +08:00
faq faq app 2013-03-29 11:09:56 +08:00
gallery Changes in I18n (except personal_conference and personal_journal) 2013-03-12 18:13:48 +08:00
location fix member sidebar 2013-02-19 14:21:54 +08:00
miss_module/config/locales member plugin init edit 2013-02-21 17:53:08 +08:00
page_content Changes in I18n (except personal_conference and personal_journal) 2013-03-12 18:13:48 +08:00
personal_book Changes in I18n (except personal_conference and personal_journal) 2013-03-12 18:13:48 +08:00
personal_conference Lots of Update 2013-03-29 12:03:15 +08:00
personal_diploma Changes in I18n (except personal_conference and personal_journal) 2013-03-12 18:13:48 +08:00
personal_experience Changes in I18n (except personal_conference and personal_journal) 2013-03-12 18:13:48 +08:00
personal_honor Changes in I18n (except personal_conference and personal_journal) 2013-03-12 18:13:48 +08:00
personal_journal Lots of Update 2013-03-29 12:03:15 +08:00
personal_lab Changes in I18n (except personal_conference and personal_journal) 2013-03-12 18:13:48 +08:00
personal_patent Changes in I18n (except personal_conference and personal_journal) 2013-03-12 18:13:48 +08:00
personal_project Changes in I18n (except personal_conference and personal_journal) 2013-03-12 18:13:48 +08:00
personal_research Changes in I18n (except personal_conference and personal_journal) 2013-03-12 18:13:48 +08:00
web_resource Changes in I18n (except personal_conference and personal_journal) 2013-03-12 18:13:48 +08:00