chris
|
bd3e9fe4f6
|
Fix js bug and asset url after merge
|
2013-03-29 17:50:21 +08:00 |
devin
|
4bb5e18f44
|
recover .gitignore file
Conflicts:
.gitignore
|
2013-03-29 12:33:35 +08:00 |
|
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 |
 Harry Bomrah
|
5685e11511
|
app manager changed plus some changes
|
2013-03-21 18:25:37 +08:00 |
|
Harry Bomrah
|
0e39de56e2
|
section page fixed..
|
2013-03-21 18:25:36 +08:00 |
|
devin
|
677faf1811
|
add browser compatibility page
|
2013-03-21 18:25:36 +08:00 |
|
devin
|
80a2f67dda
|
tinyscrollbar css minor update
|
2013-03-21 18:09:39 +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 |