devin
|
e7bffe4c0f
|
devin's new branch
|
2013-04-17 14:14:24 +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
|
1d06bcaae7
|
Major tinyscrollbar update
|
2013-04-17 10:54:38 +08:00 |
devin
|
4e24223c78
|
desktop CSS update
|
2013-03-05 09:39:01 +08:00 |
Harry Bomrah
|
c82e9a646d
|
tinyscrollbar fixed
|
2013-02-27 18:55:26 +08:00 |
Harry Bomrah
|
08b99011d0
|
all sections and sections megerd
|
2012-12-07 10:10:38 +08:00 |
Harry Bomrah
|
8094ddc967
|
section fixed and some other fixes
|
2012-12-06 17:43:19 +08:00 |
devin
|
bfc4507696
|
Connection page design
|
2012-05-01 18:05:17 +08:00 |
Harry Bomrah
|
670ec2a40e
|
Themes from db fixed..
|
2012-04-23 21:04:02 +08:00 |
devin
|
19750d69e0
|
some update
|
2012-04-20 05:38:53 +08:00 |
Harry Bomrah
|
64a9579b92
|
final on 13 april 00:00
|
2012-04-13 00:00:24 +08:00 |
Harry Bomrah
|
193cee2df7
|
new icons and widgets
|
2012-04-12 22:18:58 +08:00 |
Harry Bomrah
|
01af32aa60
|
added divs with id
|
2012-04-12 16:52:32 +08:00 |
Harry Bomrah
|
7b423877bf
|
new updates
|
2012-04-12 14:50:45 +08:00 |
Harry Bomrah
|
48323ac1af
|
lot of changes in fetching
|
2012-04-12 14:44:08 +08:00 |
devin
|
67d1f7ad08
|
lots of change
|
2012-04-12 14:19:53 +08:00 |
Harry Bomrah
|
25ca29403c
|
section page added
|
2012-04-11 17:58:52 +08:00 |