saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								cf89ed108a
								
							
						 | 
						
							
							
								
								Fixed Site Preferences Language
							
							
							
							
							
						 | 
						
							2013-10-21 17:46:29 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								e42cf8720e
								
							
						 | 
						
							
							
								
								Updated Site Preferences with language fix
							
							
							
							
							
						 | 
						
							2013-10-21 16:53:11 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								14fea3638f
								
							
						 | 
						
							
							
								
								Updated with some locale fixes in site preferences
							
							
							
							
							
						 | 
						
							2013-10-18 15:26:41 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								155039ac16
								
							
						 | 
						
							
							
								
								Updated fixes for site info - desktop openess, title always displayed
							
							
							
							
							
						 | 
						
							2013-10-16 18:33:57 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								96c3be68f7
								
							
						 | 
						
							
							
								
								Fixed Enable and Disable, Sitemap and Terms of Use for header and footer
							
							
							
							
							
						 | 
						
							2013-10-15 10:37:49 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								4120be6f8e
								
							
						 | 
						
							
							
								
								fixes in sitemap, site preference
							
							
							
							
							
						 | 
						
							2013-10-14 16:48:50 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								55fa1cef4f
								
							
						 | 
						
							
							
								
								Added Enable and disable terms of use, sitemap
							
							
							
							
							
						 | 
						
							2013-10-11 13:14:37 +00:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								fa857cfeea
								
							
						 | 
						
							
							
								
								Default Locale
							
							
							
							
							
						 | 
						
							2013-09-06 18:00:36 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								6e032a8757
								
							
						 | 
						
							
							
								
								Add Preference and search engine
							
							
							
							
							
						 | 
						
							2013-09-06 18:00:23 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								fef7cc4ed2
								
							
						 | 
						
							
							
								
								Updated Site info
							
							
							
							
							
						 | 
						
							2013-09-06 18:00:10 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								345c471fc9
								
							
						 | 
						
							
							
								
								from now on the rescue namespace will be decided by site object field: resque_namespace
							
							
							
							
							
						 | 
						
							2013-06-20 17:50:17 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								b198b1a17b
								
							
						 | 
						
							
							
								
								system preference
							
							
							
							
							
						 | 
						
							2013-04-24 19:21:11 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								5ff7dfbac6
								
							
						 | 
						
							
							
								
								fronted open switch and backend openness
							
							
							
							
							
						 | 
						
							2013-04-23 18:48:18 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								6c6bda988d
								
							
						 | 
						
							
							
								
								Add mobile version in site settings
							
							
							
							
							
						 | 
						
							2013-01-07 03:57:36 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								ff435a4af4
								
							
						 | 
						
							
							
								
								Change the design for the whole site form designs index
							
							
							
							
							
						 | 
						
							2012-12-07 12:14:31 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								45ef7fd302
								
							
						 | 
						
							
							
								
								guest user
							
							
							
							
							
						 | 
						
							2012-09-12 16:20:15 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								7d5531bf01
								
							
						 | 
						
							
							
								
								Merge branch 'nccu_master' into demo_site
							
							
							
							
							
							
							
							Conflicts:
	Gemfile
	app/assets/javascripts/tinymce_orbit.js.erb
	app/assets/stylesheets/style.css.erb
	app/controllers/admin/assets_controller.rb
	app/controllers/admin/module_apps_new_interface_controller.rb
	app/controllers/admin/page_parts_controller.rb
	app/jobs/sync_db.rb
	app/models/page.rb
	app/models/page_part.rb
	app/models/user/user.rb
	app/uploaders/image_uploader.rb
	app/views/admin/assets/create.js.erb
	app/views/admin/module_apps/reload_frontend_pages.js.erb
	app/views/layouts/_orbit_bar.html.erb
	app/views/layouts/_side_bar.html.erb
	app/views/layouts/_users_checkbox_ary.html.erb
	app/views/shared/_privilege_user.html.erb
	config/mongoid.yml
	lib/parsers/parser_common.rb
	vendor/built_in_modules/announcement/announcement.json
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_link.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb 
							
						 | 
						
							2012-08-22 18:07:49 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								12f9f666eb
								
							
						 | 
						
							
							
								
								Fix bugs after i18n_variable removal
							
							
							
							
							
						 | 
						
							2012-07-27 19:13:39 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								49dd3a1770
								
							
						 | 
						
							
							
								
								Remove i18n_variable for controllers, helpers and models
							
							
							
							
							
						 | 
						
							2012-07-27 19:13:39 +08:00 | 
						
					
				
					
						
							
							
								 
								unknown
							
						 | 
						
							
							
							
							
							
								
							
							
								c0cac812c5
								
							
						 | 
						
							
							
								
								demo site widget
							
							
							
							
							
						 | 
						
							2012-07-26 16:39:29 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								97b4eee798
								
							
						 | 
						
							
							
								
								full site search with google
							
							
							
							
							
						 | 
						
							2012-07-25 17:20:25 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								41c0c26330
								
							
						 | 
						
							
							
								
								Add mail_settings
							
							
							
							
							
						 | 
						
							2012-05-09 11:38:29 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								5c7cf1aef2
								
							
						 | 
						
							
							
								
								Add sub_menu to site_info
							
							
							
							
							
						 | 
						
							2012-05-08 17:27:02 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								8b61314cc4
								
							
						 | 
						
							
							
								
								Add i18n for site_info.
							
							
							
							
							
							
							
							Add always display site title.
Changes for menu in front-end 
							
						 | 
						
							2012-05-07 15:11:43 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								0246341aef
								
							
						 | 
						
							
							
								
								Add footer to site_info
							
							
							
							
							
						 | 
						
							2012-05-07 11:25:33 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								1fb6c20b86
								
							
						 | 
						
							
							
								
								Add site_info
							
							
							
							
							
						 | 
						
							2012-05-07 00:54:18 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								a126935d2c
								
							
						 | 
						
							
							
								
								Clean the parsers and introduce the metas
							
							
							
							
							
						 | 
						
							2012-03-21 18:30:12 +08:00 | 
						
					
				
					
						
							
							
								 
								chris2tof
							
						 | 
						
							
							
							
							
							
								
							
							
								2afe961416
								
							
						 | 
						
							
							
								
								Modify check if site is up-to-date
							
							
							
							
							
						 | 
						
							2011-08-25 08:30:18 +08:00 | 
						
					
				
					
						
							
							
								 
								chris2tof
							
						 | 
						
							
							
							
							
							
								
							
							
								118455aa81
								
							
						 | 
						
							
							
								
								Check if site is up-to-date
							
							
							
							
							
						 | 
						
							2011-08-23 19:40:49 +08:00 | 
						
					
				
					
						
							
							
								 
								chris2tof
							
						 | 
						
							
							
							
							
							
								
							
							
								2842001a3b
								
							
						 | 
						
							
							
								
								Update source: pull from git
							
							
							
							
							
						 | 
						
							2011-08-23 15:01:22 +08:00 | 
						
					
				
					
						
							
							
								 
								chris2tof
							
						 | 
						
							
							
							
							
							
								
							
							
								86443661e9
								
							
						 | 
						
							
							
								
								Merge server and rails_3_1
							
							
							
							
							
						 | 
						
							2011-08-18 13:43:33 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								0067ac48a5
								
							
						 | 
						
							
							
								
								include Mongoid::Timestamps
							
							
							
							
							
						 | 
						
							2011-04-13 18:22:52 +08:00 | 
						
					
				
					
						
							
							
								 
								ihower
							
						 | 
						
							
							
							
							
							
								
							
							
								19a7d51e60
								
							
						 | 
						
							
							
								
								Chris's first commit at Fri Jan 28 2011 10:14:32 GMT+0800 (CST)
							
							
							
							
							
						 | 
						
							2011-04-13 18:19:51 +08:00 |