Commit Graph

3564 Commits

Author SHA1 Message Date
Bernie Chiu 577f29e26e Fix conflict YML naming 2013-12-27 11:10:11 +08:00
thomaschen 14395e6b4e add sitmap submenu chinese translation as well 2013-12-24 17:57:27 +08:00
thomaschen 2d492f29ed add translation for terms of use frontpage ui 2013-12-24 17:57:21 +08:00
Bernie Chiu 1124d6d239 Tanslations for preference setting 2013-12-24 17:56:41 +08:00
thomaschen 532cac20d9 fix missing header in survey 2013-12-24 17:34:02 +08:00
thomaschen 8065d2fedd more translation for chinese... 2013-12-24 17:33:03 +08:00
thomaschen 229a15f03f fix some missing chinese translation 2013-12-24 17:32:56 +08:00
thomaschen 68674a3d19 fix some chinese translation 2013-12-24 17:32:49 +08:00
Bernie Chiu 6c01527ffd Makes Default Widget available for Survey Frontend 2013-12-24 17:08:38 +08:00
Bernie Chiu 99bf4137e2 Fix missing YML title 2013-12-24 17:03:32 +08:00
Bernie Chiu 225d0174d7 Translations for search engine 2013-12-24 17:03:23 +08:00
thomaschen c54c12c1ff add Chinese version sidebar Menu in Site Setting
Conflicts:
	config/locales/en.yml
2013-12-24 17:00:13 +08:00
thomaschen 11abe9a4a7 fix the terms of use into html style (both chinese and english)
Conflicts:
	lib/tasks/site.rake
2013-12-24 17:00:08 +08:00
thomaschen 979e2ae2ac add default value for terms of use in site.rake(need to find a way to break line in the terms)
Conflicts:
	lib/tasks/site.rake
2013-12-24 16:59:24 +08:00
Bernie Chiu d565c29bf8 Fix default tab sync with current language setting 2013-12-24 16:58:34 +08:00
Bernie Chiu 638add3e49 Fix question tab translation
Conflicts:
	vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/_questions.html.erb
2013-12-24 16:58:26 +08:00
saurabhbhatia a5705a57d9 Revert "add Chinese version sidebar Menu in Site Setting"
This reverts commit 4201617a76.
2013-12-24 16:56:29 +08:00
thomaschen 4201617a76 add Chinese version sidebar Menu in Site Setting
Conflicts:
	config/locales/en.yml
2013-12-24 16:51:50 +08:00
thomaschen 74eb8f1db9 fix the terms of use into html style (both chinese and english) 2013-12-24 16:42:43 +08:00
thomaschen fd45a70291 add default value for terms of use in site.rake(need to find a way to break line in the terms) 2013-12-24 16:42:40 +08:00
thomaschen ebeb243249 add details for button in site info 2013-12-24 16:42:37 +08:00
Bernie Chiu f27784d020 Fix default tab sync with current language setting 2013-12-24 16:36:28 +08:00
Bernie Chiu fad2ea22e2 Fix question tab translation 2013-12-24 16:36:22 +08:00
Bernie Chiu 6eed4ac431 Update missing translation in Survey Module 2013-12-24 16:36:02 +08:00
saurabhbhatia 3c4247f538 Removed the modules for basic site 2013-12-16 16:21:42 +08:00
saurabhbhatia fd24fbe082 Commit for Basic Site 2013-12-16 16:08:12 +08:00
saurabhbhatia dccb9c75d8 Page Parts now working 2013-12-13 18:40:15 +08:00
Bernie Chiu eb638995f0 Fix missing params category value 2013-12-13 16:19:19 +08:00
thomaschen 0ab7041341 delete useless variable in link widget controller 2013-12-13 16:19:07 +08:00
saurabhbhatia 03b29a7b4a Removed member and survey widget, fixed desktop personal experiences 2013-12-13 16:04:44 +08:00
thomaschen bd154c9cab fix link widget title 2013-12-13 15:30:04 +08:00
Bernie Chiu 445a13c645 Fix Gallery widget title 2013-12-13 15:29:55 +08:00
thomaschen b33fe549da fix archive widget title 2013-12-13 15:29:46 +08:00
saurabhbhatia b52e6b979b Removed announcement index as it not required anymore 2013-12-13 11:52:37 +08:00
Manson Wang e9a40774ac Add phone numbers to mobile front_end 2013-12-12 17:59:56 +08:00
Manson Wang afb5afeceb Added multi-phone numbers in mobile setting page and fixed language setting 2013-12-12 16:07:27 +08:00
rulingcom 4c85d62866 ray fix for css and filemanager 2013-12-12 15:39:20 +08:00
saurabhbhatia 6c01d517d2 Fixed page data count 2013-12-12 12:49:20 +08:00
saurabhbhatia 85778224a1 Fixed langauge system tab 2013-12-12 10:24:20 +08:00
Harry Bomrah 053144dfa4 widget count fixed for new widgets in page widget settings 2013-12-11 19:37:39 +08:00
Harry Bomrah 0671d0b126 filemanger authentication changes and also announcement preview fixed and also text search for files
Conflicts:
	app/views/admin/assets/index.html.erb
2013-12-11 18:49:54 +08:00
Bernie Chiu 5faa7e73c0 Fix links and remove unneeded codes 2013-12-11 18:13:46 +08:00
Bernie Chiu f13c21c1b4 Fix widget index 2013-12-11 18:13:29 +08:00
rulingcom a82022c958 ray fix design for filemanager 2013-12-11 17:59:14 +08:00
saurabhbhatia 3643555a6c Commented out Reason for Rejection 2013-12-11 15:04:32 +08:00
saurabhbhatia f31f18e193 Fixed issue with announcement frontend 2013-12-11 15:01:19 +08:00
Harry Bomrah a02cd97880 file manger preview and pagination is done. 2013-12-11 14:41:08 +08:00
Harry Bomrah 800f108be3 added enabling and disabling feature of widget count in module init 2013-12-10 17:43:31 +08:00
saurabhbhatia 2a41e90bc1 Ray's fixes for the file manager 2013-12-10 17:40:13 +08:00
thomaschen 26c4d69e07 fixed announcement widget index mode title i18n missing 2013-12-10 16:04:21 +08:00