Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								d027cf8e6a 
								
							 
						 
						
							
							
								
								add new data from NCCU  
							
							 
							
							
							
						 
						
							2012-10-09 14:40:28 +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  
						
					 
				
					
						
							
							
								 
								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  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								77deffb512 
								
							 
						 
						
							
							
								
								Nccu calendar and daily job.  
							
							 
							
							
							
						 
						
							2012-05-15 14:03:54 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								551e1ef740 
								
							 
						 
						
							
							
								
								Reflect login method. LDAP,MidSite connection. The Mysql connection now is build on fly.  
							
							 
							
							
							
						 
						
							2012-05-15 11:28:24 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								1ecdb91778 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' into ldap  
							
							 
							
							
							
						 
						
							2012-05-14 09:31:44 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								f0dd1eb871 
								
							 
						 
						
							
							
								
								Fix designs.rake  
							
							 
							
							
							
						 
						
							2012-05-14 09:30:49 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								9837f8eae7 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' into ldap  
							
							 
							
							
							
						 
						
							2012-05-14 09:07:36 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								33e3821e61 
								
							 
						 
						
							
							
								
								Rake task to change design_ids  
							
							 
							
							
							
						 
						
							2012-05-14 08:59:53 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								ebc8dd33ec 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' into ldap  
							
							 
							
							... 
							
							
							
							Conflicts:
	Gemfile.lock
	app/controllers/admin/module_apps_controller.rb
	app/controllers/application_controller.rb
	vendor/built_in_modules/web_resource/web_resource.json 
							
						 
						
							2012-05-14 00:57:17 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								17b486f9e9 
								
							 
						 
						
							
							
								
								Fix bugs for shift_to and change items.rake for the missing position in db  
							
							 
							
							
							
						 
						
							2012-05-11 17:56:26 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								6a443f0976 
								
							 
						 
						
							
							
								
								Add mongoid-tree to Item  
							
							 
							
							
							
						 
						
							2012-05-11 16:16:09 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								c28d7d59b6 
								
							 
						 
						
							
							
								
								starting Resque  
							
							 
							
							
							
						 
						
							2012-05-08 20:21:28 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								083963af65 
								
							 
						 
						
							
							
								
								Test version for DB sync schedule job  
							
							 
							
							
							
						 
						
							2012-05-08 19:20:53 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								65a0998080 
								
							 
						 
						
							
							
								
								Merge branch 'jobs_and_mail' into ldap  
							
							 
							
							... 
							
							
							
							Conflicts:
	config/environments/development.rb
	config/routes.rb 
							
						 
						
							2012-05-08 11:45:34 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								7339d1ee4a 
								
							 
						 
						
							
							
								
								starting Resque  
							
							 
							
							
							
						 
						
							2012-05-08 11:41:58 +08:00  
						
					 
				
					
						
							
							
								 
								nccu
							
						 
						
							 
							
							
							
							
								
							
							
								fe9032787c 
								
							 
						 
						
							
							
								
								NCCU ldap debug  
							
							 
							
							
							
						 
						
							2012-04-23 10:13:44 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								f55b3a4374 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/Rulingcom/orbit  into ldap  
							
							 
							
							... 
							
							
							
							Conflicts:
	Gemfile
	Gemfile.lock
	app/views/admin/attributes/_app_selector.html.erb
	app/views/admin/module_apps/_app_selector.html.erb
	app/views/admin/pages/_app_selector.html.erb
	config/application.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
	vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/widget/posts_controller.rb
	vendor/built_in_modules/page_content/app/controllers/panel/page_content/front_end/page_contexts_controller.rb
	vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/front_end/web_links_controller.rb
	vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb 
							
						 
						
							2012-04-19 14:06:00 +08:00