devin
|
e7bffe4c0f
|
devin's new branch
|
2013-04-17 14:14:24 +08:00 |
chris
|
dd10b3147c
|
Fix js bug and asset url after merge
|
2013-04-17 14:14:24 +08:00 |
|
devin
|
cae43e8acd
|
recover .gitignore file
Conflicts:
.gitignore
|
2013-04-17 14:14:23 +08:00 |
|
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 |
 Harry Bomrah
|
dae3f069ff
|
app manager changed plus some changes
|
2013-04-17 11:09:56 +08:00 |
|
Harry Bomrah
|
b1d7d5345e
|
section page fixed..
|
2013-04-17 11:08:58 +08:00 |
|
devin
|
0d5ab20efa
|
add browser compatibility page
|
2013-04-17 11:07:45 +08:00 |
|
devin
|
84dfb44e78
|
tinyscrollbar css minor update
|
2013-04-17 10:56:15 +08:00 |
|
devin
|
db2b371744
|
tinyscrollbar minor update
|
2013-03-05 17:22:53 +08:00 |
|
devin
|
4e24223c78
|
desktop CSS update
|
2013-03-05 09:39:01 +08:00 |