new ui ask module lose 2 file

new feature added for not loading submenus inside api for desktop
jquery update and also fixed app manager bug .. jquery updated to 1.10.2 and jquery ui updated to 1.10.0 .. gem jquery-rails vs 2.1.4 changed to 3.0.4 and jquery-ui-rails changed to 4.0.5
2013-10-16 10:26:40 +08:00 · 2013-10-16 09:37:39 +08:00 · 2013-10-16 09:37:33 +08:00 · 2013-10-15 23:38:44 +08:00 · 2013-10-15 19:50:01 +08:00 · 2013-10-15 19:37:12 +08:00
3256 changed files with 142773 additions and 37359 deletions
@@ -11,7 +11,7 @@ public/assets
 public/index.html
 public/panel/**/*
 public/uploads/**/*
-solr
+solr/data
 tmp/**/*
 uploads/**/*

@@ -20,4 +20,6 @@ uploads/**/*
 *.lck

 .sass-cache/*
-*.supported
+*.supported
+mongoid.yml
+*.
@@ -11,10 +11,14 @@ gem "net-ldap", "~> 0.3.1"
 gem 'devise', '1.5.3'
 gem 'exception_notification' # Send error trace
 gem 'execjs'
-gem 'jquery-rails', '2.1.4'
-gem 'jquery-ui-rails'
+gem 'jquery-rails', '3.0.4'
+gem 'jquery-ui-rails', "4.0.5"
 gem "select2-rails", '3.3.1'
-gem 'kaminari', :git => 'git://github.com/amatsuda/kaminari.git'
+gem 'kaminari'
+gem 'time_difference'
+gem "acts_as_unvlogable"
+gem 'youtube_it'
+gem 'gotcha'

 # gem "memcached", "~> 1.4.3"
 # gem "memcache-client"
@@ -35,7 +39,7 @@ gem 'resque-scheduler' # job scheduling
 gem 'resque-restriction'
 #gem 'rb-readline'
 # gem 'ruby-debug19'
-gem 'rubyzip'
+gem 'rubyzip', '< 1.0.0'

 gem 'sunspot_mongo'
 gem 'sunspot_solr'
@@ -46,14 +50,15 @@ gem 'sinatra'
 gem 'sprockets'
 gem 'social-share-button'

-gem 'tinymce-rails'
+gem 'ckeditor'
+# gem 'tinymce-rails', "~> 3.5.8"
 gem 'therubyracer' if RUBY_PLATFORM.downcase.include?("linux")
 gem 'libv8', '~> 3.11.8' if RUBY_PLATFORM.downcase.include?("linux")
 gem 'mongoid-encryptor', :require => 'mongoid/encryptor'
-gem 'rb-readline' if RUBY_PLATFORM.downcase.include?("linux")
+gem 'rb-readline','~> 0.4.2' if RUBY_PLATFORM.downcase.include?("linux")


-gem "impressionist", :git => 'git://github.com/charlotte-ruby/impressionist.git'
+gem "impressionist",'1.2.0'
 #gem 'contacts'
 #gem 'event-calendar', :require => 'event_calendar'#, :git => 'git://github.com/elevation/event_calendar.git'

@@ -63,6 +68,8 @@ gem 'chinese_pinyin', '0.4.1'
 gem 'rmmseg-cpp-huacnlee', '0.2.9'
 gem 'redis-namespace'
 gem 'redis-search'
+gem 'syslog-logger'
+gem "recaptcha", :require => "recaptcha/rails"

 # Gems used only for assets and not required
 # in production environments by default.
@@ -91,6 +98,8 @@ group :test, :development do
  gem "watchr"
  gem "spork"
  gem "capybara"
+  #gem 'rack-mini-profiler'
+  gem "better_errors"
  # gem 'yard'
  # gem "bluecloth"
 end
@@ -1,407 +0,0 @@
-GIT
-  remote: git://github.com/amatsuda/kaminari.git
-  revision: 2e09b5374fec33b57c6387ca7bac89ecaa60c9eb
-  specs:
-    kaminari (0.14.1)
-      actionpack (>= 3.0.0)
-      activesupport (>= 3.0.0)
-
-GIT
-  remote: git://github.com/charlotte-ruby/impressionist.git
-  revision: 0894f6a550a33f83f4937d655e9f0774521781e4
-  specs:
-    impressionist (1.2.0)
-      httpclient (~> 2.2)
-      nokogiri (~> 1.5)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    actionmailer (3.2.12)
-      actionpack (= 3.2.12)
-      mail (~> 2.4.4)
-    actionpack (3.2.12)
-      activemodel (= 3.2.12)
-      activesupport (= 3.2.12)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.5)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.12)
-      activesupport (= 3.2.12)
-      builder (~> 3.0.0)
-    activerecord (3.2.12)
-      activemodel (= 3.2.12)
-      activesupport (= 3.2.12)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.12)
-      activemodel (= 3.2.12)
-      activesupport (= 3.2.12)
-    activesupport (3.2.12)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    arel (3.0.2)
-    attr_required (0.0.5)
-    bcrypt-ruby (3.0.0)
-    binding_of_caller (0.7.1)
-      debug_inspector (>= 0.0.1)
-    bourne (1.1.2)
-      mocha (= 0.10.5)
-    brakeman (1.9.2)
-      erubis (~> 2.6)
-      fastercsv (~> 1.5)
-      haml (~> 3.0)
-      highline (~> 1.6)
-      multi_json (~> 1.2)
-      ruby2ruby (~> 2.0)
-      ruby_parser (~> 3.1.1)
-      sass (~> 3.0)
-      terminal-table (~> 1.4)
-    bson (1.8.2)
-    bson_ext (1.8.2)
-      bson (~> 1.8.2)
-    builder (3.0.4)
-    capybara (2.0.2)
-      mime-types (>= 1.16)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      selenium-webdriver (~> 2.0)
-      xpath (~> 1.0.0)
-    carrierwave (0.6.2)
-      activemodel (>= 3.2.0)
-      activesupport (>= 3.2.0)
-    carrierwave-mongoid (0.2.2)
-      carrierwave (~> 0.6.1)
-      mongoid (~> 2.1)
-    childprocess (0.3.8)
-      ffi (~> 1.0, >= 1.0.11)
-    chinese_pinyin (0.4.1)
-    chronic (0.9.0)
-    coderay (1.0.9)
-    coffee-rails (3.2.2)
-      coffee-script (>= 2.2.0)
-      railties (~> 3.2.0)
-    coffee-script (2.2.0)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.4.0)
-    columnize (0.3.6)
-    database_cleaner (0.9.1)
-    debug_inspector (0.0.2)
-    debugger (1.2.4)
-      columnize (>= 0.3.1)
-      debugger-linecache (~> 1.1.1)
-      debugger-ruby_core_source (~> 1.1.7)
-    debugger-linecache (1.1.2)
-      debugger-ruby_core_source (>= 1.1.1)
-    debugger-ruby_core_source (1.1.8)
-    delorean (2.1.0)
-      chronic
-    devise (1.5.3)
-      bcrypt-ruby (~> 3.0)
-      orm_adapter (~> 0.0.3)
-      warden (~> 1.1)
-    diff-lcs (1.1.3)
-    encrypted_strings (0.3.3)
-    erubis (2.7.0)
-    exception_notification (3.0.1)
-      actionmailer (>= 3.0.4)
-    execjs (1.4.0)
-      multi_json (~> 1.0)
-    factory_girl (4.2.0)
-      activesupport (>= 3.0.0)
-    factory_girl_rails (4.2.1)
-      factory_girl (~> 4.2.0)
-      railties (>= 3.0.0)
-    faker (1.1.2)
-      i18n (~> 0.5)
-    fastercsv (1.5.5)
-    fattr (2.2.1)
-    fb_graph (2.6.4)
-      httpclient (>= 2.2.0.2)
-      multi_json (>= 1.3)
-      rack-oauth2 (>= 0.14.4)
-      tzinfo
-    ffi (1.4.0)
-    haml (3.1.8)
-    highline (1.6.15)
-    hike (1.2.1)
-    httpclient (2.3.2)
-    i18n (0.6.1)
-    journey (1.0.4)
-    jquery-rails (2.1.4)
-      railties (>= 3.0, < 5.0)
-      thor (>= 0.14, < 2.0)
-    jquery-ui-rails (4.0.1)
-      jquery-rails
-      railties (>= 3.1.0)
-    json (1.7.7)
-    mail (2.4.4)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    metaclass (0.0.1)
-    method_source (0.8.1)
-    mime-types (1.21)
-    mini_magick (3.5.0)
-      subexec (~> 0.2.1)
-    mocha (0.10.5)
-      metaclass (~> 0.0.1)
-    mongo (1.8.2)
-      bson (~> 1.8.2)
-    mongo_session_store-rails3 (3.0.6)
-      actionpack (>= 3.0)
-      mongo
-    mongoid (2.6.0)
-      activemodel (~> 3.1)
-      mongo (~> 1.7)
-      tzinfo (~> 0.3.22)
-    mongoid-encryptor (0.0.5)
-      activesupport (~> 3.0)
-      encrypted_strings (~> 0.3.3)
-      mongoid (~> 2)
-    mongoid-tree (0.7.0)
-      mongoid (~> 2.0)
-    multi_json (1.6.1)
-    net-ldap (0.3.1)
-    nokogiri (1.5.6)
-    options (2.3.0)
-      fattr
-    orm_adapter (0.0.7)
-    polyglot (0.3.3)
-    pr_geohash (1.0.0)
-    progress_bar (0.4.0)
-      highline (~> 1.6.1)
-      options (~> 2.3.0)
-    pry (0.9.12)
-      coderay (~> 1.0.5)
-      method_source (~> 0.8)
-      slop (~> 3.4)
-    pry-debugger (0.2.1)
-      debugger (~> 1.2.0)
-      pry (~> 0.9.10)
-    pry-remote (0.1.6)
-      pry (~> 0.9)
-      slop (~> 3.0)
-    pry-stack_explorer (0.4.9)
-      binding_of_caller (>= 0.7)
-      pry (~> 0.9.11)
-    rack (1.4.5)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-gridfs (0.4.1)
-      mime-types
-      mongo (~> 1.2)
-      rack
-    rack-oauth2 (1.0.0)
-      activesupport (>= 2.3)
-      attr_required (>= 0.0.5)
-      httpclient (>= 2.2.0.2)
-      i18n
-      multi_json (>= 1.3.6)
-      rack (>= 1.1)
-    rack-protection (1.3.2)
-      rack
-    rack-ssl (1.3.3)
-      rack
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    radius (0.7.3)
-    rails (3.2.12)
-      actionmailer (= 3.2.12)
-      actionpack (= 3.2.12)
-      activerecord (= 3.2.12)
-      activeresource (= 3.2.12)
-      activesupport (= 3.2.12)
-      bundler (~> 1.0)
-      railties (= 3.2.12)
-    railties (3.2.12)
-      actionpack (= 3.2.12)
-      activesupport (= 3.2.12)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rake (10.0.3)
-    rdoc (3.12.1)
-      json (~> 1.4)
-    redis (3.0.2)
-    redis-namespace (1.2.1)
-      redis (~> 3.0.0)
-    redis-search (0.9.0)
-      chinese_pinyin (>= 0.3.0)
-      redis (>= 2.1.1)
-      redis-namespace (>= 1.0.2)
-    resque (1.23.0)
-      multi_json (~> 1.0)
-      redis-namespace (~> 1.0)
-      sinatra (>= 0.9.2)
-      vegas (~> 0.1.2)
-    resque-restriction (0.3.0)
-      resque (>= 1.7.0)
-    resque-scheduler (2.0.0)
-      redis (>= 2.0.1)
-      resque (>= 1.20.0)
-      rufus-scheduler
-    rmmseg-cpp-huacnlee (0.2.9)
-    rsolr (1.0.8)
-      builder (>= 2.1.2)
-    rspec (2.12.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.2)
-    rspec-expectations (2.12.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.2)
-    rspec-rails (2.12.2)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    ruby2ruby (2.0.3)
-      ruby_parser (~> 3.1)
-      sexp_processor (~> 4.0)
-    ruby_parser (3.1.1)
-      sexp_processor (~> 4.1)
-    rubyzip (0.9.9)
-    rufus-scheduler (2.0.17)
-      tzinfo (>= 0.3.23)
-    sass (3.2.5)
-    sass-rails (3.2.6)
-      railties (~> 3.2.0)
-      sass (>= 3.1.10)
-      tilt (~> 1.3)
-    select2-rails (3.3.1)
-      sass-rails (>= 3.2)
-      thor (~> 0.14)
-    selenium-webdriver (2.30.0)
-      childprocess (>= 0.2.5)
-      multi_json (~> 1.0)
-      rubyzip
-      websocket (~> 1.0.4)
-    sexp_processor (4.1.5)
-    shoulda-matchers (1.4.2)
-      activesupport (>= 3.0.0)
-      bourne (~> 1.1.2)
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
-    sinatra (1.3.4)
-      rack (~> 1.4)
-      rack-protection (~> 1.3)
-      tilt (~> 1.3, >= 1.3.3)
-    slop (3.4.3)
-    social-share-button (0.1.1)
-    spork (0.9.2)
-    sprockets (2.2.2)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    subexec (0.2.2)
-    sunspot (1.3.3)
-      pr_geohash (~> 1.0)
-      rsolr (~> 1.0.7)
-    sunspot-rails-tester (0.0.4)
-      sunspot_rails (~> 1.2)
-    sunspot_mongo (1.0.1)
-      sunspot_rails
-    sunspot_rails (1.3.3)
-      nokogiri
-      sunspot (= 1.3.3)
-    sunspot_solr (1.3.3)
-    terminal-table (1.4.5)
-    thor (0.17.0)
-    tilt (1.3.3)
-    tinymce-rails (3.5.8)
-      railties (>= 3.1.1)
-    treetop (1.4.12)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.35)
-    uglifier (1.3.0)
-      execjs (>= 0.3.0)
-      multi_json (~> 1.0, >= 1.0.2)
-    vegas (0.1.11)
-      rack (>= 1.0.0)
-    warden (1.2.1)
-      rack (>= 1.0)
-    watchr (0.7)
-    websocket (1.0.7)
-    xpath (1.0.0)
-      nokogiri (~> 1.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  brakeman
-  bson_ext
-  capybara
-  carrierwave
-  carrierwave-mongoid
-  chinese_pinyin (= 0.4.1)
-  coffee-rails
-  database_cleaner
-  debugger
-  delorean
-  devise (= 1.5.3)
-  exception_notification
-  execjs
-  factory_girl_rails
-  faker
-  fb_graph
-  impressionist!
-  jquery-rails (= 2.1.4)
-  jquery-ui-rails
-  kaminari!
-  mime-types
-  mini_magick
-  mongo_session_store-rails3 (= 3.0.6)
-  mongoid (> 2.1, < 3.0.0)
-  mongoid-encryptor
-  mongoid-tree
-  net-ldap (~> 0.3.1)
-  nokogiri
-  progress_bar
-  pry
-  pry-debugger
-  pry-remote
-  pry-stack_explorer
-  rack-gridfs
-  radius
-  rails (~> 3.2.9)
-  rake
-  redis (>= 2.1.1)
-  redis-namespace
-  redis-search
-  resque
-  resque-restriction
-  resque-scheduler
-  rmmseg-cpp-huacnlee (= 0.2.9)
-  rspec (~> 2.0)
-  rspec-rails (~> 2.0)
-  rubyzip
-  sass-rails
-  select2-rails (= 3.3.1)
-  shoulda-matchers
-  simplecov
-  sinatra
-  social-share-button
-  spork
-  sprockets
-  sunspot-rails-tester
-  sunspot_mongo
-  sunspot_solr
-  tinymce-rails
-  uglifier
-  watchr