Fu Matthew
							
						 
						
							 
							
							
							
							
								
							
							
								2d6b70b97f 
								
							 
						 
						
							
							
								
								regenerate pageparts  
							
							 
							
							
							
						 
						
							2012-12-27 15:50:05 +08:00  
						
					 
				
					
						
							
							
								 
								chris
							
						 
						
							 
							
							
							
							
								
							
							
								fcbba6660b 
								
							 
						 
						
							
							
								
								Only one parser for front end  
							
							 
							
							... 
							
							
							
							Separate site map for i18n 
							
						 
						
							2012-12-19 17:15:31 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								77386f0284 
								
							 
						 
						
							
							
								
								disable data transform when switching attribute field type. new member stable  
							
							 
							
							
							
						 
						
							2012-11-22 21:10:35 +08:00  
						
					 
				
					
						
							
							
								 
								chris
							
						 
						
							 
							
							
							
							
								
							
							
								475642d375 
								
							 
						 
						
							
							
								
								Remove news and fix default_url in ImageUploader  
							
							 
							
							
							
						 
						
							2012-11-22 09:30:25 +08:00  
						
					 
				
					
						
							
							
								 
								chris
							
						 
						
							 
							
							
							
							
								
							
							
								192e52b5de 
								
							 
						 
						
							
							
								
								Remove middle site  
							
							 
							
							
							
						 
						
							2012-11-20 10:06:07 +08:00  
						
					 
				
					
						
							
							
								 
								Harry Bomrah
							
						 
						
							 
							
							
							
							
								
							
							
								eaf465525a 
								
							 
						 
						
							
							
								
								rake update  
							
							 
							
							
							
						 
						
							2012-11-06 12:35:15 +08:00  
						
					 
				
					
						
							
							
								 
								chris
							
						 
						
							 
							
							
							
							
								
							
							
								65ac6980c4 
								
							 
						 
						
							
							
								
								Merge branch 'various_bugs' into nccu_master  
							
							 
							
							... 
							
							
							
							Conflicts:
	Gemfile.lock
	app/assets/javascripts/ajax_form.js.erb
	app/assets/stylesheets/style.css.erb
	app/controllers/application_controller.rb
	app/controllers/sessions_controller.rb
	app/helpers/admin/web_link_helper.rb
	app/views/admin/attributes/_attribute_field.html.erb
	app/views/admin/designs/_form.html.erb
	app/views/admin/pages/_form.html.erb
	app/views/admin/sites/_side_bar.html.erb
	app/views/layouts/_orbit_bar.html.erb
	app/views/layouts/_side_bar.html.erb
	config/locales/en.yml
	config/locales/zh_tw.yml
	config/mongoid.yml
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter_status.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/index.html.erb
	vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb 
							
						 
						
							2012-10-29 16:10:07 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								bd0d975014 
								
							 
						 
						
							
							
								
								for user new interface, member  role is working.  
							
							 
							
							
							
						 
						
							2012-10-26 11:27:37 +08:00  
						
					 
				
					
						
							
							
								 
								chris
							
						 
						
							 
							
							
							
							
								
							
							
								d7fd61ce55 
								
							 
						 
						
							
							
								
								Edit uploaded package  
							
							 
							
							
							
						 
						
							2012-10-26 11:19:57 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								38e6d6c2c8 
								
							 
						 
						
							
							
								
								add rake task  
							
							 
							
							
							
						 
						
							2012-10-16 15:43:31 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								6dfe10040b 
								
							 
						 
						
							
							
								
								fix object auth without app_auth  
							
							 
							
							
							
						 
						
							2012-10-16 14:23:44 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								d027cf8e6a 
								
							 
						 
						
							
							
								
								add new data from NCCU  
							
							 
							
							
							
						 
						
							2012-10-09 14:40:28 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								9f825de288 
								
							 
						 
						
							
							
								
								user new interface 70%  
							
							 
							
							
							
						 
						
							2012-10-09 06:40:18 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								89b1aace8a 
								
							 
						 
						
							
							
								
								fix for rescue job failed on 171  
							
							 
							
							
							
						 
						
							2012-10-08 16:42:49 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								4a5fc47c0a 
								
							 
						 
						
							
							
								
								NCCU maintenance rake task  
							
							 
							
							
							
						 
						
							2012-10-08 10:35:11 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								54b874b2c9 
								
							 
						 
						
							
							
								
								fix nccu login  
							
							 
							
							
							
						 
						
							2012-09-25 15:07:07 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								87e2510d02 
								
							 
						 
						
							
							
								
								add rake task for rebuild index  
							
							 
							
							
							
						 
						
							2012-09-24 18:46:38 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								19db9d0037 
								
							 
						 
						
							
							
								
								basic function  
							
							 
							
							
							
						 
						
							2012-09-17 13:32:52 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								df6c7afd68 
								
							 
						 
						
							
							
								
								add data_migration for rename field for attribute_field. not yet tested  
							
							 
							
							
							
						 
						
							2012-09-14 00:02:22 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								5fb94f644d 
								
							 
						 
						
							
							
								
								break down Ray's HTML  
							
							 
							
							
							
						 
						
							2012-09-14 00:02:22 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								0a3a140b18 
								
							 
						 
						
							
							
								
								Fix migration bug  
							
							 
							
							
							
						 
						
							2012-09-11 16:32:20 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								73e48aebc6 
								
							 
						 
						
							
							
								
								Change news subtitle to textarea, no tinymce  
							
							 
							
							
							
						 
						
							2012-09-11 15:40:27 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								e8317e0a4b 
								
							 
						 
						
							
							
								
								1.Remove category column when category is specified  
							
							 
							
							... 
							
							
							
							2.Showing category if not in category browsing
3.Redirect to home and show error if app page is not available for user language
4.Showing no context to display if object has no language for it.
5.Browse new and announcement by unit is now applicable. 
							
						 
						
							2012-08-08 14:46:08 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								06919e76ed 
								
							 
						 
						
							
							
								
								fix approval at news and announcement for abnormal flags that causing search result fault.  
							
							 
							
							
							
						 
						
							2012-08-08 11:01:50 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								1cdc0e24bd 
								
							 
						 
						
							
							
								
								First version of Solr search.  
							
							 
							
							
							
						 
						
							2012-08-08 10:59:55 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								acebec8904 
								
							 
						 
						
							
							
								
								don't dislay web links if no eng. lists in widget is now sorted.  
							
							 
							
							
							
						 
						
							2012-08-01 15:24:55 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								f092aff9e9 
								
							 
						 
						
							
							
								
								Fix for data_migration but there's still a bug with red is, the red is code has to be commented out to run the rake task  
							
							 
							
							
							
						 
						
							2012-08-01 02:43:06 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								c951cc6b6f 
								
							 
						 
						
							
							
								
								Fix for data_migration  
							
							 
							
							
							
						 
						
							2012-08-01 00:58:59 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								b989f458d3 
								
							 
						 
						
							
							
								
								Do not show news/anc if no context.  
							
							 
							
							
							
						 
						
							2012-07-31 18:22:40 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								7e3b59c09a 
								
							 
						 
						
							
							
								
								finished tag clouds  
							
							 
							
							
							
						 
						
							2012-07-31 11:57:32 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								f76b1c02b5 
								
							 
						 
						
							
							
								
								first version of mid_site_sync for new i18n var  
							
							 
							
							
							
						 
						
							2012-07-27 19:13:40 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								ad3ec43a00 
								
							 
						 
						
							
							
								
								Remove comments in migrate task  
							
							 
							
							
							
						 
						
							2012-07-27 19:13:39 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								804695749d 
								
							 
						 
						
							
							
								
								Fix bugs after removal of i18n_variable  
							
							 
							
							
							
						 
						
							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  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								327996a7b0 
								
							 
						 
						
							
							
								
								Task part for i18n_variable removal for web_resource  
							
							 
							
							
							
						 
						
							2012-07-27 19:12:59 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								207b0c5886 
								
							 
						 
						
							
							
								
								Remove i18n_variable for web_resource  
							
							 
							
							
							
						 
						
							2012-07-27 19:12:59 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								50813eb57d 
								
							 
						 
						
							
							
								
								Remove i18n_variable for page_content  
							
							 
							
							
							
						 
						
							2012-07-27 19:12:59 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								61c1af7316 
								
							 
						 
						
							
							
								
								Remove i18n_variable for news  
							
							 
							
							
							
						 
						
							2012-07-27 19:12:58 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								e2ebd48b22 
								
							 
						 
						
							
							
								
								Remove i18n_variable for announcement  
							
							 
							
							
							
						 
						
							2012-07-27 19:12:58 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								7c3cc30784 
								
							 
						 
						
							
							
								
								fix for rake encoding  
							
							 
							
							
							
						 
						
							2012-07-26 16:58:17 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								30cc3431b9 
								
							 
						 
						
							
							
								
								rename sub roles  
							
							 
							
							
							
						 
						
							2012-07-26 14:12:52 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								397b444390 
								
							 
						 
						
							
							
								
								fix for bugs  
							
							 
							
							
							
						 
						
							2012-07-24 20:58:34 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								834fcddc52 
								
							 
						 
						
							
							
								
								Add data migration for search widget for news and announcement.  
							
							 
							
							
							
						 
						
							2012-07-20 16:30:43 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								f9bdb4a327 
								
							 
						 
						
							
							
								
								New and Announcement search. Disabled impression.  
							
							 
							
							
							
						 
						
							2012-07-20 15:47:40 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								4daf36908c 
								
							 
						 
						
							
							
								
								working cache  
							
							 
							
							
							
						 
						
							2012-07-13 15:36:10 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								edef51d58c 
								
							 
						 
						
							
							
								
								DM for archive  bulletin categroy  
							
							 
							
							
							
						 
						
							2012-07-04 17:56:51 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								4fe92b844e 
								
							 
						 
						
							
							
								
								Add sorting order for NCCU request  
							
							 
							
							
							
						 
						
							2012-07-03 15:47:28 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								4014f8ee47 
								
							 
						 
						
							
							
								
								fix over queue at resque  
							
							 
							
							
							
						 
						
							2012-07-03 10:51:26 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								3480fa2545 
								
							 
						 
						
							
							
								
								Fix login and label.  Check sync jobs and update info function.  
							
							 
							
							
							
						 
						
							2012-05-24 17:01:00 +08:00  
						
					 
				
					
						
							
							
								 
								Matt
							
						 
						
							 
							
							
							
							
								
							
							
								6a022c90da 
								
							 
						 
						
							
							
								
								Changes on nccu  
							
							 
							
							
							
						 
						
							2012-05-18 15:20:45 +08:00