backup

Fix mailing redirect
Conflicts: vendor/built_in_modules/ask/init.rb vendor/built_in_modules/ask_new/app/controllers/panel/ask/front_end/ask_questions_controller.rb vendor/built_in_modules/ask_new/app/views/panel/ask/front_end/ask_questions/thank_you.html.erb vendor/built_in_modules/ask_new/config/routes.rb
2013-08-27 10:26:11 +08:00 · 2013-08-19 13:03:49 +08:00 · 2013-08-15 12:12:38 +08:00 · 2013-08-15 11:50:28 +08:00 · 2013-08-15 11:50:21 +08:00 · 2013-07-31 14:22:40 +08:00
3107 changed files with 40436 additions and 141513 deletions
@@ -22,4 +22,3 @@ uploads/**/*
 .sass-cache/*
 *.supported
 mongoid.yml
-*.
@@ -11,11 +11,10 @@ gem "net-ldap", "~> 0.3.1"
 gem 'devise', '1.5.3'
 gem 'exception_notification' # Send error trace
 gem 'execjs'
-gem 'jquery-rails', '3.0.4'
-gem 'jquery-ui-rails', "4.0.5"
+gem 'jquery-rails', '2.1.4'
+gem 'jquery-ui-rails'
 gem "select2-rails", '3.3.1'
-gem 'kaminari'
-gem 'time_difference'
+gem 'kaminari', :git => 'git://github.com/amatsuda/kaminari.git'
 gem "acts_as_unvlogable"
 gem 'youtube_it'
 gem 'gotcha'
@@ -39,7 +38,7 @@ gem 'resque-scheduler' # job scheduling
 gem 'resque-restriction'
 #gem 'rb-readline'
 # gem 'ruby-debug19'
-gem 'rubyzip', '< 1.0.0'
+gem 'rubyzip'

 gem 'sunspot_mongo'
 gem 'sunspot_solr'
@@ -50,8 +49,7 @@ gem 'sinatra'
 gem 'sprockets'
 gem 'social-share-button'

-gem 'ckeditor'
-# gem 'tinymce-rails', "~> 3.5.8"
+gem 'tinymce-rails', '3.5.8.3'
 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'
@@ -98,8 +96,6 @@ group :test, :development do
  gem "watchr"
  gem "spork"
  gem "capybara"
-  #gem 'rack-mini-profiler'
-  gem "better_errors"
  # gem 'yard'
  # gem "bluecloth"
 end
Author	SHA1	Message	Date
Matt K. Fu	9162c4306c	backup	2013-08-27 10:26:11 +08:00
saurabhbhatia	33f256bd16	Fix mailing redirect Conflicts: vendor/built_in_modules/ask/init.rb vendor/built_in_modules/ask_new/app/controllers/panel/ask/front_end/ask_questions_controller.rb vendor/built_in_modules/ask_new/app/views/panel/ask/front_end/ask_questions/thank_you.html.erb vendor/built_in_modules/ask_new/config/routes.rb	2013-08-19 13:03:49 +08:00
saurabhbhatia	fde9fd7ffe	Deleted Unnecessary Old code in ask module and video	2013-08-15 12:12:38 +08:00
saurabhbhatia	d977b83d06	Updated captcha, mailing function working	2013-08-15 11:50:28 +08:00
saurabhbhatia	a1eae7543e	Updated ask module with a new captcha plugin	2013-08-15 11:50:21 +08:00
saurabhbhatia	8d9bf62909	final mongoid fix	2013-07-31 14:22:40 +08:00
saurabhbhatia	2f480c31bf	Fixed mongoid	2013-07-31 13:54:29 +08:00
saurabhbhatia	19d33f78bd	Updated Video with frontend widget and backend widget working	2013-07-31 13:52:24 +08:00
saurabhbhatia	37c91664d3	Updated with video widget	2013-07-31 13:52:22 +08:00
saurabhbhatia	eb853f773d	Updated video cleaned up the ui	2013-07-31 13:52:19 +08:00
saurabhbhatia	d701d9d6ad	Updated videos module with widget initiation	2013-07-31 13:52:10 +08:00
saurabhbhatia	75eeec737c	Video and Channel Fetching now working	2013-07-31 13:52:07 +08:00
saurabhbhatia	36c3635bbb	add youtube videos module	2013-07-31 13:52:05 +08:00
chris	fa1c731ad3	Remove registerable	2013-07-30 18:24:05 +08:00
harrybomrah	2c24e788b0	fixed frontend	2013-07-23 18:32:24 +08:00
chris	26a8be2f0f	Fix bulletins_controller.rb missing 'end'	2013-07-19 19:52:44 +08:00
chris	fa51d16879	Remove space causing error in rake	2013-07-19 19:23:25 +08:00
chris	ceff21fd1f	Fix migrate.rake	2013-07-19 19:15:45 +08:00
harrybomrah	1357124f6f	backend theater for ie fixed	2013-07-19 18:40:19 +08:00
harrybomrah	8c3fb43bf5	theater view fixed in IE	2013-07-19 18:40:09 +08:00
chris	71e8b3c042	Change get_item Add category and tags to default widget link to object	2013-07-19 18:39:13 +08:00
Spen	b37643147f	mail_cron add send_mail_now and mail cron log fix	2013-07-19 17:18:48 +08:00
Spen	ec57cbff1c	ntue mail cron & log filter fix	2013-07-19 17:18:34 +08:00
Spen	7d6df11873	email send cron & send logs for any apps	2013-07-19 17:01:54 +08:00
Matt K. Fu	8043573370	fix delay impressionist for tags and pages	2013-07-19 17:00:38 +08:00
chris	f025c98ffa	Fix sorted_tags_for_cloud: it's now using the cloud_view_count	2013-07-19 01:52:36 +08:00
chris	3a91c92bf7	Fix visitor count. Mapping the session and making sure they were unique using rails was way slower than doing it with a mongoid query	2013-07-19 01:20:51 +08:00
harrybomrah	b1d8a87256	frontend gallery fix	2013-07-18 21:22:23 +08:00
chris	c7ac4e2485	Set tinymce-rails version to 3.5.8.3	2013-07-18 20:53:05 +08:00
chris	3467868607	Fix missing tagged_ids in some taggable objects and add a rake task for it	2013-07-18 14:05:21 +08:00
Matt K. Fu	ceac2b842c	fix impression page counter	2013-07-18 12:04:37 +08:00
chris	c763817ebf	Fix web link front end index and widget index	2013-07-17 17:54:34 +08:00
chris	3c3bba514a	Fix get_item and more link in front end	2013-07-17 11:36:20 +08:00
Spen	837dc3ea7b	announcement init default_widget add a style & field	2013-07-17 11:31:38 +08:00
Matt K. Fu	ea5d89e0e1	make announcement widget amount start from 1	2013-07-16 18:19:20 +08:00
Matt K. Fu	aea15fa622	add class to default widget if row data is hot or top	2013-07-16 17:41:22 +08:00
Matthew K. Fu JuYuan	c1316f72a0	remove new design button	2013-07-15 17:10:30 +08:00
Matthew K. Fu JuYuan	d996b91b54	preview by default widget	2013-07-15 17:09:48 +08:00