orbit-basic/app/assets/javascripts
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
..
desktop modularize conference 2013-02-04 18:01:42 +08:00
inc fix javascript disable checkbox failed after cate and tags being reloaded. 2013-02-27 10:49:51 +08:00
lib Date picker separated: reset time when reset date 2013-01-09 21:17:50 +08:00
mobile Changes for mobile map 2013-02-04 18:02:11 +08:00
ad_banner.js fix js bugs,partial bugs 2012-02-06 16:17:07 +08:00
admin.js Integration of pop-up and generic js.erb 2011-12-28 20:49:53 +08:00
ajax_form.js.erb Merge branch 'various_bugs' into nccu_master 2012-10-29 16:10:07 +08:00
application.js first version of fb_share 2012-08-08 11:04:19 +08:00
archive_form.js.erb update archive 2012-08-30 15:17:39 +08:00
archive_plugin_form.js.erb Plugins 2012-09-14 00:05:31 +08:00
attribute_form.js.erb Merge with sub_roles 2011-12-23 18:34:21 +08:00
bootstrap.js Update bootstrap version 2.2.2 2013-01-07 17:25:32 +08:00
bulletin_form.js.erb Changes for i18n yml 2012-09-24 09:02:45 +08:00
datetimepicker.js Update disable time when separated picker new or reset date 2013-01-09 21:17:50 +08:00
design.js Modify assets 2011-12-05 09:54:41 +08:00
desktop.js have done conference author filter, journal haven't been done, yet 2013-04-17 11:04:52 +08:00
desktopload.js.erb Dock change and getting values from db 2012-04-06 17:49:22 +08:00
devise.js.erb Changes for orbit bar, login 2012-02-19 16:33:22 +08:00
event.js Ray's changes 2012-05-09 04:15:02 +08:00
html5.js Changes for IE9 with html5 2012-03-21 15:51:55 +08:00
jquery.cycle.js Devin's changes to integrate the store 2012-12-06 23:11:23 +08:00
jquery.form.js Integration of pop-up and generic js.erb 2011-12-28 20:49:53 +08:00
jquery.gridster.js Lot of changes in gridster 2013-03-04 12:37:29 +08:00
jquery.isotope.min.js Add isotope, categories for announcement page, sort for announcement 2012-02-23 15:52:58 +08:00
jquery.masonry.min.js Ray's changes for new backend 2012-09-14 02:38:56 +08:00
jquery.miniColors.min.js custom theme settings 2012-04-10 17:44:36 +08:00
jquery.mu.image.resize.degsin.js demo site widget 2012-07-26 16:39:29 +08:00
jquery.mu.image.resize.js demo site widget 2012-07-26 16:39:29 +08:00
jquery.tinyscrollbar.js compatibility page added and tinyscrollbar drag event fixed.. 2013-04-17 11:07:20 +08:00
jquery.tinyscrollbar.min.js Ray's changes for new backend 2012-09-14 02:38:56 +08:00
jquery.tokeninput.js authors auto-complete 2013-03-04 12:16:46 +08:00
mobile.js Add mobile but remove news in it 2013-01-07 03:03:38 +08:00
module.js.erb Changes for widgets 2012-05-13 21:55:39 +08:00
modules.js Devin's changes to integrate the store 2012-12-06 23:11:23 +08:00
new_admin.js Remove isotope 2013-02-04 18:01:42 +08:00
orbit-1.0.js Ray's changes for new backend 2012-09-14 02:38:56 +08:00
orbit-1.0.js.backup20120913 Ray's changes for new backend 2012-09-14 02:38:56 +08:00
orbit-bar-member.js Ray's changes in tags, css and js 2012-04-02 02:55:36 +08:00
orbit-bar-search.js fixed orbit bar that like nccu bar now, and add rails version in Gemfile 2013-02-04 18:01:03 +08:00
orbitTimeline.js desktop api update.. 2012-11-12 15:11:36 +08:00
orbit_bar.js Ray's changes 2012-05-04 19:11:28 +08:00
orbitdesktop.js Lots of Update 2013-04-17 14:14:23 +08:00
orbitdesktopAPI.js Lots of Update 2013-04-17 14:14:23 +08:00
page_edit.js.erb fix for both part and page part settings 2013-04-17 14:12:52 +08:00
plugin.js Revert ff82391b7d0d17c17568ed21176b8b0112a34e31^..HEAD 2011-10-20 10:06:06 +08:00
rc.js Ray's modification before redesign 2012-01-24 11:57:27 +08:00
rss.js authorization 2012-08-20 23:18:50 +08:00
rulingorbit.js Devin's changes to integrate the store 2012-12-06 23:11:23 +08:00
side_bar_history.js Changes for structure 2012-05-22 14:45:49 +08:00
site_editor.js Remove isotope 2013-02-04 18:01:42 +08:00
sort_header.js.erb Fix js for ie in list 2012-08-16 01:09:45 +08:00
tinymce_orbit.js.erb Fix urls in tinymce source editor 2012-12-28 15:03:02 +08:00
translation_page.js Remove js from html 2011-12-05 10:36:25 +08:00
user_form.js Merge with sub_roles 2011-12-23 18:34:21 +08:00