Commit Graph

1144 Commits

Author SHA1 Message Date
Bernie Chiu 02bb6ad5ee Remove unnecessary files 2013-09-13 15:51:35 +08:00
thomaschen be47fd78a3 delete unuse data 2013-09-13 15:51:35 +08:00
Matthew K. Fu JuYuan bc38e24259 company review 2013-09-13 15:51:34 +08:00
Bernie Chiu ab29dd4335 Order the vocabs 2013-09-13 15:51:34 +08:00
Bernie Chiu 749bb8d184 Allow frontend item limitation 2013-09-13 15:51:34 +08:00
thomaschen 52e393a2df add solr search(still have some problem) 2013-09-13 15:51:34 +08:00
Bernie Chiu 481f04c07b Soler basic search 2013-09-13 15:51:34 +08:00
thomaschen 6ed89ea9af fix some layout 2013-09-13 15:51:34 +08:00
Bernie Chiu 9625aa0f8b Improve some models 2013-09-13 15:51:34 +08:00
thomaschen f94e675ca0 build dic front_end index and show 2013-09-13 15:51:34 +08:00
Bernie Chiu 000fcdd48f Add search block 2013-09-13 15:51:34 +08:00
Bernie Chiu ca6b70660d Modify init.rb for widget 2013-09-13 15:51:34 +08:00
Bernie Chiu 31ee2d2be2 Category authorization 2013-09-13 15:51:33 +08:00
thomaschen 1086037b2b frontend app page 2013-09-13 15:51:33 +08:00
thomaschen 6dcebe0d31 fix error and some i18n 2013-09-13 15:51:33 +08:00
thomaschen 667b7f2bd5 add back_end show vocab 2013-09-13 15:51:33 +08:00
Bernie Chiu 8a94eeeee8 Fix edit error 2013-09-13 15:51:33 +08:00
Bernie Chiu 0eb4bf5b37 Edit category 2013-09-13 15:51:33 +08:00
thomaschen 6e2725d279 add collection select to dic categories 2013-09-13 15:51:33 +08:00
Bernie Chiu 3f87914e46 Allow addding to Category 2013-09-13 15:51:33 +08:00
thomaschen b51e10eb9d build dictionary_vocabs back_end 2013-09-13 15:51:33 +08:00
thomaschen a7e1819e69 add back_end index 2013-09-13 15:51:33 +08:00
Bernie Chiu 14b19d814f Add category controller 2013-09-13 15:51:32 +08:00
thomaschen f1ec3406f8 view folder 2013-09-13 15:51:32 +08:00
Bernie Chiu dcca1db6bd Fix routing and naming 2013-09-13 15:51:32 +08:00
thomaschen 5a51063bed fix route 2013-09-13 15:51:32 +08:00
Bernie Chiu cab4614a8f Controller init 2013-09-13 15:51:32 +08:00
thomaschen 2fdfdeafa2 add dic models 2013-09-13 15:51:32 +08:00
Bernie Chiu 5d8b65d625 Initial commit 2013-09-13 15:51:32 +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
Harry Bomrah c4e8ed96a9 location category 2013-09-13 12:40:18 +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
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
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 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