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 |
| .. |
|
select2.png
|
Lots of Update
|
2013-04-17 14:14:23 +08:00 |
|
select2x2.png
|
Lots of Update
|
2013-04-17 14:14:23 +08:00 |
|
spinner.gif
|
Lots of Update
|
2013-04-17 14:14:23 +08:00 |
