Merge branch 'master' of github.com:Rulingcom/orbit into openness

2012-11-21 11:46:44 +08:00 · 2012-11-21 11:46:44 +08:00 · fda7c43efc
parent ee053cd8ac 4966537491
commit fda7c43efc
726 changed files with 2078 additions and 1903 deletions
--- a/2
+++ b/2
@ -2,6 +2,7 @@ source 'http://rubygems.org'
 gem 'rails', '>=3.1.0', '<3.2.0'

 gem "brakeman"
+gem 'mime-types'

 gem 'bson_ext'
 gem 'carrierwave'
@ -24,6 +25,7 @@ gem "mongo_session_store-rails3"
 gem 'mysql2'
 gem 'nokogiri'

+
 gem 'radius'
 gem 'rake'
 # gem 'remotipart'
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/accdb/accdb-128_32.png
+++ b/app/assets/images/ft-icons/accdb/accdb-128_32.png
--- a/app/assets/images/ft-icons/accdb/accdb-16_32.png
+++ b/app/assets/images/ft-icons/accdb/accdb-16_32.png
--- a/app/assets/images/ft-icons/accdb/accdb-24_32.png
+++ b/app/assets/images/ft-icons/accdb/accdb-24_32.png
--- a/app/assets/images/ft-icons/accdb/accdb-256_32.png
+++ b/app/assets/images/ft-icons/accdb/accdb-256_32.png
--- a/app/assets/images/ft-icons/accdb/accdb-32_32.png
+++ b/app/assets/images/ft-icons/accdb/accdb-32_32.png
--- a/app/assets/images/ft-icons/accdb/accdb-48_32.png
+++ b/app/assets/images/ft-icons/accdb/accdb-48_32.png
--- a/app/assets/images/ft-icons/accdb/accdb-64_32.png
+++ b/app/assets/images/ft-icons/accdb/accdb-64_32.png
--- a/app/assets/images/ft-icons/accdb/accdb-72_32.png
+++ b/app/assets/images/ft-icons/accdb/accdb-72_32.png
--- a/app/assets/images/ft-icons/accdb/accdb-80_32.png
+++ b/app/assets/images/ft-icons/accdb/accdb-80_32.png
--- a/app/assets/images/ft-icons/accdb/accdb-96_32.png
+++ b/app/assets/images/ft-icons/accdb/accdb-96_32.png
--- a/app/assets/images/ft-icons/accdb/accdb-sm-16_32.png
+++ b/app/assets/images/ft-icons/accdb/accdb-sm-16_32.png
--- a/app/assets/images/ft-icons/accdb/accdb-sm-24_32.png
+++ b/app/assets/images/ft-icons/accdb/accdb-sm-24_32.png
--- a/app/assets/images/ft-icons/accdb/accdb-sm-32_32.png
+++ b/app/assets/images/ft-icons/accdb/accdb-sm-32_32.png
--- a/app/assets/images/ft-icons/accdb/accdb-sm.ico
+++ b/app/assets/images/ft-icons/accdb/accdb-sm.ico
--- a/app/assets/images/ft-icons/accdb/accdb.ico
+++ b/app/assets/images/ft-icons/accdb/accdb.ico
--- a/app/assets/images/ft-icons/avi/avi-128_32.png
+++ b/app/assets/images/ft-icons/avi/avi-128_32.png
--- a/app/assets/images/ft-icons/avi/avi-16_32.png
+++ b/app/assets/images/ft-icons/avi/avi-16_32.png
--- a/app/assets/images/ft-icons/avi/avi-24_32.png
+++ b/app/assets/images/ft-icons/avi/avi-24_32.png
--- a/app/assets/images/ft-icons/avi/avi-256_32.png
+++ b/app/assets/images/ft-icons/avi/avi-256_32.png
--- a/app/assets/images/ft-icons/avi/avi-32_32.png
+++ b/app/assets/images/ft-icons/avi/avi-32_32.png
--- a/app/assets/images/ft-icons/avi/avi-48_32.png
+++ b/app/assets/images/ft-icons/avi/avi-48_32.png
--- a/app/assets/images/ft-icons/avi/avi-64_32.png
+++ b/app/assets/images/ft-icons/avi/avi-64_32.png
--- a/app/assets/images/ft-icons/avi/avi-72_32.png
+++ b/app/assets/images/ft-icons/avi/avi-72_32.png
--- a/app/assets/images/ft-icons/avi/avi-80_32.png
+++ b/app/assets/images/ft-icons/avi/avi-80_32.png
--- a/app/assets/images/ft-icons/avi/avi-96_32.png
+++ b/app/assets/images/ft-icons/avi/avi-96_32.png
--- a/app/assets/images/ft-icons/avi/avi-sm-16_32.png
+++ b/app/assets/images/ft-icons/avi/avi-sm-16_32.png
--- a/app/assets/images/ft-icons/avi/avi-sm-24_32.png
+++ b/app/assets/images/ft-icons/avi/avi-sm-24_32.png
--- a/app/assets/images/ft-icons/avi/avi-sm-32_32.png
+++ b/app/assets/images/ft-icons/avi/avi-sm-32_32.png
--- a/app/assets/images/ft-icons/avi/avi-sm.ico
+++ b/app/assets/images/ft-icons/avi/avi-sm.ico
--- a/app/assets/images/ft-icons/avi/avi.icns
+++ b/app/assets/images/ft-icons/avi/avi.icns
--- a/app/assets/images/ft-icons/avi/avi.ico
+++ b/app/assets/images/ft-icons/avi/avi.ico
--- a/app/assets/images/ft-icons/bmp/bmp-128_32.png
+++ b/app/assets/images/ft-icons/bmp/bmp-128_32.png
--- a/app/assets/images/ft-icons/bmp/bmp-16_32.png
+++ b/app/assets/images/ft-icons/bmp/bmp-16_32.png
--- a/app/assets/images/ft-icons/bmp/bmp-24_32.png
+++ b/app/assets/images/ft-icons/bmp/bmp-24_32.png
--- a/app/assets/images/ft-icons/bmp/bmp-256_32.png
+++ b/app/assets/images/ft-icons/bmp/bmp-256_32.png
--- a/app/assets/images/ft-icons/bmp/bmp-32_32.png
+++ b/app/assets/images/ft-icons/bmp/bmp-32_32.png
--- a/app/assets/images/ft-icons/bmp/bmp-48_32.png
+++ b/app/assets/images/ft-icons/bmp/bmp-48_32.png
--- a/app/assets/images/ft-icons/bmp/bmp-64_32.png
+++ b/app/assets/images/ft-icons/bmp/bmp-64_32.png
--- a/app/assets/images/ft-icons/bmp/bmp-72_32.png
+++ b/app/assets/images/ft-icons/bmp/bmp-72_32.png
--- a/app/assets/images/ft-icons/bmp/bmp-80_32.png
+++ b/app/assets/images/ft-icons/bmp/bmp-80_32.png
--- a/app/assets/images/ft-icons/bmp/bmp-96_32.png
+++ b/app/assets/images/ft-icons/bmp/bmp-96_32.png
--- a/app/assets/images/ft-icons/bmp/bmp-sm-16_32.png
+++ b/app/assets/images/ft-icons/bmp/bmp-sm-16_32.png
--- a/app/assets/images/ft-icons/bmp/bmp-sm-24_32.png
+++ b/app/assets/images/ft-icons/bmp/bmp-sm-24_32.png
--- a/app/assets/images/ft-icons/bmp/bmp-sm-32_32.png
+++ b/app/assets/images/ft-icons/bmp/bmp-sm-32_32.png
--- a/app/assets/images/ft-icons/bmp/bmp-sm.ico
+++ b/app/assets/images/ft-icons/bmp/bmp-sm.ico
--- a/app/assets/images/ft-icons/bmp/bmp.icns
+++ b/app/assets/images/ft-icons/bmp/bmp.icns
--- a/app/assets/images/ft-icons/bmp/bmp.ico
+++ b/app/assets/images/ft-icons/bmp/bmp.ico
--- a/app/assets/images/ft-icons/css/css-128_32.png
+++ b/app/assets/images/ft-icons/css/css-128_32.png
--- a/app/assets/images/ft-icons/css/css-16_32.png
+++ b/app/assets/images/ft-icons/css/css-16_32.png
--- a/app/assets/images/ft-icons/css/css-24_32.png
+++ b/app/assets/images/ft-icons/css/css-24_32.png
--- a/app/assets/images/ft-icons/css/css-256_32.png
+++ b/app/assets/images/ft-icons/css/css-256_32.png
--- a/app/assets/images/ft-icons/css/css-32_32.png
+++ b/app/assets/images/ft-icons/css/css-32_32.png
--- a/app/assets/images/ft-icons/css/css-48_32.png
+++ b/app/assets/images/ft-icons/css/css-48_32.png
--- a/app/assets/images/ft-icons/css/css-64_32.png
+++ b/app/assets/images/ft-icons/css/css-64_32.png
--- a/app/assets/images/ft-icons/css/css-72_32.png
+++ b/app/assets/images/ft-icons/css/css-72_32.png
--- a/app/assets/images/ft-icons/css/css-80_32.png
+++ b/app/assets/images/ft-icons/css/css-80_32.png
--- a/app/assets/images/ft-icons/css/css-96_32.png
+++ b/app/assets/images/ft-icons/css/css-96_32.png
--- a/app/assets/images/ft-icons/css/css-sm-16_32.png
+++ b/app/assets/images/ft-icons/css/css-sm-16_32.png
--- a/app/assets/images/ft-icons/css/css-sm-24_32.png
+++ b/app/assets/images/ft-icons/css/css-sm-24_32.png
--- a/Show More
+++ b/Show More