developers/Orbit
2
0 Fork 0
Code Issues Pull Requests 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 chris committed 2013-03-29 12:03:15 +08:00
1 parent 474e8b9b57
commit a62ff9308f
38 files changed
+3205 -1533
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Gemfile
+1 -1
View File
@@ -13,7 +13,7 @@ gem 'exception_notification' # Send error trace
gem 'execjs'
gem 'jquery-rails', '2.1.4'
gem 'jquery-ui-rails'
gem "select2-rails"
gem "select2-rails", '3.3.1'
gem 'kaminari', :git => 'git://github.com/amatsuda/kaminari.git'
# gem "memcached", "~> 1.4.3"