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
Fixed Enable and Disable, Sitemap and Terms of Use for header and footer
2013-10-15 19:15:38 +08:00 · 2013-10-15 19:00:38 +08:00 · 2013-10-15 10:37:49 +08:00 · 2013-10-15 10:07:46 +08:00 · 2013-10-14 18:20:26 +08:00 · 2013-10-14 16:49:54 +08:00
3119 changed files with 134677 additions and 82727 deletions
@@ -4,8 +4,6 @@
 .rvmrc
 Gemfile.lock
 Procfile
 log/*
 db/*.sqlite3
 log/*.log
@@ -16,9 +14,7 @@ public/uploads/**/*
 solr/data
 tmp/**/*
 uploads/**/*
-config/*.god
+
 log/*.gz
 tmp/restart.txt
 *.swp
 *.pid
 *.lck
@@ -26,3 +22,4 @@ tmp/restart.txt
 .sass-cache/*
 *.supported
 mongoid.yml
 *.
@@ -11,14 +11,13 @@ 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-rails', '3.0.4'
-gem 'jquery-ui-rails'
+gem 'jquery-ui-rails', "4.0.5"
 gem "select2-rails", '3.3.1'
 gem 'kaminari'
 gem 'time_difference'
 gem "acts_as_unvlogable"
 gem 'youtube_it'
 gem 'gotcha'
 # gem "memcached", "~> 1.4.3"
 # gem "memcache-client"
@@ -29,9 +28,6 @@ gem 'mongoid-tree', :require => 'mongoid/tree'
 gem "mongo_session_store-rails3", '3.0.6'
 gem 'nokogiri'
 # import csv
 gem 'roo'
 gem 'fb_graph'
 gem 'rack-gridfs'
 gem 'radius'
@@ -42,7 +38,7 @@ gem 'resque-scheduler' # job scheduling
 gem 'resque-restriction'
 #gem 'rb-readline'
 # gem 'ruby-debug19'
-gem 'rubyzip','0.9.9'
+gem 'rubyzip', '< 1.0.0'
 gem 'sunspot_mongo'
 gem 'sunspot_solr'
@@ -53,7 +49,8 @@ gem 'sinatra'
 gem 'sprockets'
 gem 'social-share-button'
-gem 'tinymce-rails', '3.5.8.3'
+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'
@@ -100,6 +97,8 @@ group :test, :development do
  gem "watchr"
  gem "spork"
  gem "capybara"
  #gem 'rack-mini-profiler'
  gem "better_errors"
  # gem 'yard'
  # gem "bluecloth"
 end