Fix front-end tag cloud search under category filters

Fix tag cloud search under category filters
Fix category search to archives frontend search
2013-11-01 16:17:57 +08:00 · 2013-11-01 14:37:06 +08:00 · 2013-10-30 16:44:55 +08:00 · 2013-10-25 17:11:47 +08:00 · 2013-10-25 17:03:53 +08:00 · 2013-10-25 16:54:29 +08:00
3203 changed files with 85207 additions and 135085 deletions
@@ -4,6 +4,8 @@
 .rvmrc

 Gemfile.lock
+Procfile
+log/*

 db/*.sqlite3
 log/*.log
@@ -14,7 +16,9 @@ public/uploads/**/*
 solr/data
 tmp/**/*
 uploads/**/*
-
+config/*.god
+log/*.gz
+tmp/restart.txt
 *.swp
 *.pid
 *.lck
@@ -22,4 +26,3 @@ uploads/**/*
 .sass-cache/*
 *.supported
 mongoid.yml
-*.
@@ -15,9 +15,10 @@ gem 'jquery-rails', '2.1.4'
 gem 'jquery-ui-rails'
 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"
@@ -28,6 +29,9 @@ 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'
@@ -38,7 +42,7 @@ gem 'resque-scheduler' # job scheduling
 gem 'resque-restriction'
 #gem 'rb-readline'
 # gem 'ruby-debug19'
-gem 'rubyzip', '< 1.0.0'
+gem 'rubyzip','0.9.9'

 gem 'sunspot_mongo'
 gem 'sunspot_solr'
@@ -49,8 +53,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'
Author	SHA1	Message	Date
thomaschen	054e712145	Fix front-end tag cloud search under category filters	2013-11-01 16:17:57 +08:00
Bernie Chiu	05b70c932b	Fix tag cloud search under category filters	2013-11-01 14:37:06 +08:00
Bernie Chiu	a7a8a504a7	Fix category search to archives frontend search	2013-10-30 16:44:55 +08:00
thomaschen	ab9214a4db	fix error	2013-10-25 17:11:47 +08:00
Bernie Chiu	232328a7f8	Add oneline and multiline import	2013-10-25 17:03:53 +08:00
thomaschen	ebcc13a87a	error fix	2013-10-25 16:54:29 +08:00
Bernie Chiu	b327a50ee3	Merge	2013-10-25 16:29:17 +08:00
Bernie Chiu	a78f9e6ae6	Allow update answers on radio groups	2013-10-25 16:26:06 +08:00
thomaschen	a25a82dc89	fix error	2013-10-25 15:35:48 +08:00
thomaschen	3a721c653b	merge	2013-10-25 10:28:29 +08:00
Bernie Chiu	9584c01e0d	Add import on radiogroups on file change	2013-10-23 17:06:52 +08:00
Bernie Chiu	477eaeaf5c	Fix encoding issue and add import on title change	2013-10-23 14:10:04 +08:00
thomaschen	a838803b28	remove unuse variable and comment	2013-10-21 17:40:06 +08:00
thomaschen	a7113e38a7	import 'check' and 'select' question success	2013-10-21 17:37:34 +08:00
thomaschen	8cdd6f9b52	fix import-csv column error	2013-10-21 17:01:44 +08:00
thomaschen	dec6087850	import radio question success	2013-10-21 16:15:06 +08:00
thomaschen	ea3edbf7ac	can read the spreadsheet each row.(need to think of a method to parse each row to figure)	2013-10-21 14:44:31 +08:00
Bernie Chiu	01ce52060b	Fix locale error	2013-10-16 17:25:39 +08:00
Bernie Chiu	1e5fbfed5f	Add routing and links for import	2013-10-16 17:03:18 +08:00
Spen	7e0657d983	fix survey_b result and export value ( float )	2013-10-15 11:43:08 +08:00
Spen	c9a235c802	announcement init sorting fix Conflicts: vendor/built_in_modules/announcement/init.rb	2013-10-11 17:40:20 +08:00
Bernie Chiu	9ba943776e	Fix survey title link redirection after deadline	2013-10-11 17:04:03 +08:00
thomaschen	9845854f3d	fix js hide localsite error	2013-10-11 14:39:56 +08:00
thomaschen	8cab186b00	fix uri parse problem	2013-10-11 13:24:24 +08:00
rulingcom	852166dabb	Addded export feature in Survey_b, By Spen	2013-10-11 11:45:52 +08:00
Bernie Chiu	6230bc3d36	Merge branch '0913_ntu_ga_primary' of https://github.com/Rulingcom/orbit into 0913_ntu_ga_primary	2013-10-11 11:32:01 +08:00
Bernie Chiu	9ed824d615	Merge branch '0913_ntu_ga_co' into 0913_ntu_ga_primary	2013-10-11 11:30:01 +08:00
Bernie Chiu	627425b72e	Add port to test	2013-10-08 17:51:40 +08:00
Bernie Chiu	9cb2a5b211	Update values to test servers	2013-10-08 17:41:22 +08:00
Bernie Chiu	75f5404b7a	Modify value to test servers	2013-10-08 17:36:03 +08:00
Bernie Chiu	bd3a922073	Add local test server	2013-10-08 16:06:36 +08:00
Bernie Chiu	9fbb2917b1	Widget title without link	2013-10-08 12:24:34 +08:00
Bernie Chiu	bd6d94a143	Comment out JavaScript redirect workaround	2013-10-04 17:48:58 +08:00
Bernie Chiu	8684388ab9	Reverse	2013-10-04 17:47:26 +08:00
thomaschen	5e05f5d02b	Merge branch '0913_ntu_ga_co' of https://github.com/Rulingcom/orbit into 0913_ntu_ga_co	2013-10-04 17:22:33 +08:00
thomaschen	6607f6b66e	roll back	2013-10-04 17:22:02 +08:00
Bernie Chiu	63fab74a25	Post form without ajax	2013-10-04 15:57:14 +08:00
Bernie Chiu	48969b70b5	Modify thank_you route	2013-10-04 14:08:18 +08:00
Bernie Chiu	88c8ca68d0	Add ask fail message and success redirect fix	2013-10-01 16:09:43 +08:00
Bernie Chiu	3eeda5410c	Fix bugs	2013-09-27 17:15:49 +08:00
thomaschen	660960f316	fix first reply error	2013-09-27 17:03:09 +08:00
Bernie Chiu	696134aa18	Fix ip direct	2013-09-27 16:40:34 +08:00
Bernie Chiu	2777b92589	Test ip direct	2013-09-27 16:30:36 +08:00
thomaschen	5432238816	merge	2013-09-27 15:07:19 +08:00
thomaschen	4e12c0bb5b	(test)remote ip	2013-09-27 15:04:35 +08:00
Bernie Chiu	d68f324ca3	Merge	2013-09-27 14:46:18 +08:00
thomaschen	50f5d12da3	fix status error	2013-09-27 14:35:25 +08:00
thomaschen	d635c892cf	fix dns error	2013-09-27 11:22:37 +08:00
Manson Wang	6b85824a90	Fix module survey_b back_end button link	2013-09-25 19:47:23 +08:00
Bernie Chiu	26bc837c76	Modify fail definition	2013-09-25 17:53:35 +08:00
Bernie Chiu	8247f077df	Change status based on your requests sent	2013-09-25 17:46:32 +08:00
Bernie Chiu	70de1cea9d	Modify syntax	2013-09-25 14:55:02 +08:00
Bernie Chiu	0f18cdfe8e	Skip invalid options	2013-09-25 14:46:55 +08:00
Manson Wang	bad90e0abe	Fix a word in module survey_b	2013-09-24 20:48:25 +08:00
thomaschen	0d1426cab8	add post request error checking and resend one more time	2013-09-23 12:46:59 +08:00
thomaschen	b57b899dba	fix naming error	2013-09-23 11:28:30 +08:00
Bernie Chiu	1305b9f1ef	Rescue URI Error	2013-09-17 16:37:38 +08:00
Bernie Chiu	21009961ef	Fix status bugs	2013-09-17 16:16:37 +08:00
Bernie Chiu	1edc134691	Add back mongoid yml	2013-09-17 12:07:41 +08:00
Bernie Chiu	e89615a6f3	Fix naming error	2013-09-17 12:02:35 +08:00
thomaschen	0c29701f9b	test	2013-09-16 15:07:50 +08:00
thomaschen	580be0b34b	fix frontend ask_category error	2013-09-16 15:05:08 +08:00
Manson Wang	cb0f126aad	Fixed bugs and some modification in module "survey_b"	2013-09-13 15:43:34 +08:00
chris	ae79694b44	Survey b	2013-09-13 15:43:34 +08:00
Bernie Chiu	c361a7a201	Fix check box selections appearance Conflicts: vendor/built_in_modules/ask_new/app/controllers/panel/ask/back_end/ask_replies_controller.rb	2013-09-13 15:43:14 +08:00
thomaschen	b7bf180df2	fix frontend ask_category error	2013-09-13 15:43:14 +08:00
Bernie Chiu	71dad22b04	Add dynamic checkboxes Conflicts: vendor/built_in_modules/ask_new/app/views/panel/ask/back_end/ask_questions/edit.html.erb	2013-09-13 15:43:14 +08:00
thomaschen	883496ede1	add multi deliver request	2013-09-13 15:43:14 +08:00
Bernie Chiu	0a1ebf18e3	Add check box array	2013-09-13 15:43:13 +08:00
thomaschen	3f9cdec426	add option for dep_dns	2013-09-13 15:43:13 +08:00
thomaschen	24b9f4015b	add checkboxes for 11 dep in edit view	2013-09-13 15:43:13 +08:00
thomaschen	1237a111ca	add transfered_category if not exist. change transfered reply's status to 待處理(轉). showing request code if error.	2013-09-13 15:43:13 +08:00
Bernie Chiu	64e14d42e2	Allow ask_question transter	2013-09-13 15:43:13 +08:00
thomaschen	cc7a4ffb6d	add response(temp)	2013-09-13 15:43:13 +08:00
Bernie Chiu	da40c2b669	Allow sending request and getting response	2013-09-13 15:43:13 +08:00
thomaschen	bf5416095e	add auth_request route and controller	2013-09-13 15:43:13 +08:00
Bernie Chiu	8cd27e26e2	Fixed untracked files Conflicts: config/mongoid.yml	2013-09-13 15:43:13 +08:00
thomaschen	d98d008806	add sending post request function	2013-09-13 15:43:13 +08:00
chris	cd26b880fb	Change the logo and favicon	2013-09-13 15:42:52 +08:00
chris	7c398ce4fe	Changes for NTU General Affairs	2013-09-13 15:10:27 +08:00
chris	d766eea9f4	Changes for NTU common Conflicts: lib/tasks/migrate.rake Conflicts: lib/tasks/migrate.rake Conflicts: config/resque_schedule.yml lib/tasks/migrate.rake	2013-09-13 15:10:10 +08:00
chris	d5dc3ef793	Fix for user and role relationship (from role and sub-role side)	2013-09-13 15:02:31 +08:00
Spen	b3366b48a1	announcement add new widget bulletins_and_links	2013-09-13 13:39:39 +08:00
saurabhbhatia	36e7e3d3e8	Fixed Locale settings for location navigation	2013-09-13 12:44:13 +08:00
saurabhbhatia	06c2240d34	Categories working tested and added link to sidebar Conflicts: Gemfile config/mongoid.yml	2013-09-13 12:43:42 +08:00
harrybomrah	c4e8ed96a9	location category	2013-09-13 12:40:18 +08:00
chris	8ad015af7f	Remove before filter in user.rb in addition to the previous fix (Fix for user and role relationship)	2013-09-13 11:56:57 +08:00
chris	1857ad428c	Fix for user and role relationship Conflicts: lib/tasks/migrate.rake	2013-09-12 15:35:53 +08:00
Matt K. Fu	134b639465	fix announcement language	2013-09-09 17:35:22 +08:00
Matt K. Fu	45136f915d	fix news default widget shows un-checked bulletins.	2013-09-09 11:14:31 +08:00
Matt K. Fu	2c3924d92c	fix kaminari	2013-09-04 16:38:52 +08:00
Matt K. Fu	41b562d3f7	fix zip by limit version number	2013-09-04 15:20:55 +08:00
Matt K. Fu	4074ac677d	fix rake zip	2013-09-04 10:36:16 +08:00
Matthew K. Fu JuYuan	e1c57c6843	fixed default widget for tags	2013-09-03 16:17:45 +08:00
Matthew K. Fu JuYuan	915ea066d6	fixing bulletin default widget	2013-09-02 17:24:28 +08:00
Matt K. Fu	e7aa7ea1fa	added sorting DSL	2013-09-02 16:33:50 +08:00
Matt K. Fu	1ccfd6e48c	fix sorting for default widget	2013-08-30 16:52:46 +08:00
Matt K. Fu	23516277f3	fix default widget query	2013-08-30 10:15:18 +08:00
Matt K. Fu	87bc2852b3	fix variable	2013-08-29 18:08:33 +08:00
Matt K. Fu	27b86b078a	fix counter for recording request.	2013-08-28 17:56:03 +08:00
Matt K. Fu	8f393e1079	fix template for solar error. gitingore	2013-08-28 10:37:19 +08:00
Matt K. Fu	353039dcd0	fix script	2013-08-27 18:37:09 +08:00
Matt K. Fu	d8dd68b4df	fixing setting template and site init scripts	2013-08-27 17:28:33 +08:00
Matt K. Fu	aa8523c8cf	fix counter eval	2013-08-27 16:07:58 +08:00
Matt K. Fu	69ef8fa747	fix dash broad counter	2013-08-27 15:59:17 +08:00
Matt K. Fu	473baa9b95	add backup job	2013-08-27 15:59:17 +08:00
Matt K. Fu	1592aaff89	add option to logrotate for conversional policy.	2013-08-27 15:59:17 +08:00
Matt K. Fu	030d994180	make rake task more easier for service team	2013-08-27 15:59:17 +08:00
Matt K. Fu	a88ad35641	add log rotate into site build procedure.	2013-08-27 15:59:17 +08:00
Matthew K. Fu JuYuan	a63193dc65	logrotate template	2013-08-27 15:59:16 +08:00
Matt K. Fu	452bddb587	let site builder can enter rescue's worker	2013-08-27 15:59:16 +08:00
Matt K. Fu	371485e420	add handily task for service team	2013-08-27 15:59:16 +08:00
Matt K. Fu	69b3625861	add production pid log folder in case sold error	2013-08-27 15:59:16 +08:00
Matt K. Fu	72d1427854	fix erb for pass argument and paths	2013-08-27 15:59:16 +08:00
Matthew K. Fu JuYuan	079b9145c3	move all .god to .erb so the God init won't go wrong	2013-08-27 15:59:16 +08:00
Matt K. Fu	3102a46219	remove useless setting for solar	2013-08-27 15:59:16 +08:00
Matt K. Fu	653a098ab6	fix solr setting	2013-08-27 15:59:16 +08:00
Matt K. Fu	426edea485	add god to watch solr service	2013-08-27 15:59:16 +08:00
Matt K. Fu	2e5b2555c6	from now on the rescue namespace will be decided by site object field: resque_namespace	2013-08-27 15:59:16 +08:00
Matt K. Fu	2593707d8c	fix rescue scheduler space error	2013-08-27 15:59:15 +08:00
saurabhbhatia	b20955579e	Cleaned Up ask module for master	2013-08-27 14:29:59 +08:00
saurabhbhatia	1ebda22f0e	Updated with loader Conflicts: vendor/built_in_modules/ask/app/views/panel/ask/back_end/ask_acknowledgements/index.html.erb vendor/built_in_modules/ask/app/views/panel/ask/front_end/ask_questions/index.html.erb	2013-08-27 14:29:53 +08:00
saurabhbhatia	c511aeb8de	Removed logging statements	2013-08-27 14:29:47 +08:00
saurabhbhatia	26d3a89d30	Updated ask module with custom acknowledgement working	2013-08-27 14:29:39 +08:00
saurabhbhatia	91f80a0952	Deleted ask	2013-08-27 14:29:28 +08:00
saurabhbhatia	f333fe9e21	Added custom acknowledgement to ask	2013-08-27 14:29:22 +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