developers/orbit-4-1
Archived
2
0 Fork 0
Code Issues Packages Projects Releases Wiki Activity

Lots of Update

Browse Source 
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
This commit is contained in:
devin authored and Matt K. Fu committed 2013-04-17 14:14:23 +08:00
1 parent 0f6f5aafce
commit c8aa50ee87
38 files changed
+3206 -1533
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/assets/javascripts/orbitdesktopAPI.js
+6
View File
@@ -201,6 +201,12 @@ var orbitDesktopAPI = function(){
});
}
}
};
this.use_select2 = function(){
$('select:not(.select2-offscreen)').select2({
minimumResultsForSearch: -1
// minimumInputLength: -1
});
}
};
orbitDesktopAPI.prototype.notifyImgPath = "temp";