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 |
Rueshyna
|
625f2e9ad6
|
have done conference author filter, journal haven't been done, yet
|
2013-04-17 11:04:52 +08:00 |
|
devin
|
4e24223c78
|
desktop CSS update
|
2013-03-05 09:39:01 +08:00 |
 Harry Bomrah
|
e9c0f443b7
|
Lot of changes in gridster
|
2013-02-26 11:47:39 +08:00 |
|
Harry Bomrah
|
9f362d9ae6
|
gridster, url code fixed, views removed.
|
2013-02-25 11:08:56 +08:00 |
chris
|
9c6c622a49
|
Add missing icons and css for icons in layout
|
2012-12-03 22:31:00 +08:00 |
Harry Bomrah
|
9cc518b456
|
autocomplete done
|
2012-11-27 15:55:32 +08:00 |
|
Christophe Vilayphiou
|
194773f064
|
Fix bugs after merge
|
2012-09-14 02:27:49 +08:00 |
|
Harry Bomrah
|
555ec86403
|
Timeline commit
|
2012-06-26 15:59:28 +08:00 |
|
devin
|
887bda1491
|
lots of change
|
2012-05-02 17:04:16 +08:00 |
|
devin
|
360e5228b7
|
custom theme settings
|
2012-04-10 17:44:36 +08:00 |
unknown
|
11d3906951
|
new icons
|
2012-04-03 18:06:16 +08:00 |
|
Harry Bomrah
|
2e283a039d
|
Desktop Commit
|
2012-03-28 18:53:30 +08:00 |