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  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								05e61b63bb 
								
							 
						 
						
							
							
								
								Fix fb share, redirect with js when the page is not requested by fb but by user  
							
							 
							
							
							
						 
						
							2012-08-08 11:04:19 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								a03d1ad10b 
								
							 
						 
						
							
							
								
								Change for getting url from key  
							
							 
							
							
							
						 
						
							2012-08-08 11:04:19 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								6cfdf0f25a 
								
							 
						 
						
							
							
								
								Change the way the orig_url is passed to fb  
							
							 
							
							
							
						 
						
							2012-08-08 11:04:19 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								4bed925e0f 
								
							 
						 
						
							
							
								
								Try fb from override and generated page  
							
							 
							
							
							
						 
						
							2012-08-08 11:04:19 +08:00  
						
					 
				
					
						
							
							
								 
								Harry Bomrah
							
						 
						
							 
							
							
							
							
								
							
							
								4660c26b7a 
								
							 
						 
						
							
							
								
								fix for ie8,9 for tinymce  
							
							 
							
							
							
						 
						
							2012-08-07 20:55:18 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								8ea7bf75cd 
								
							 
						 
						
							
							
								
								Fix uploader, ie9 ok, not ie8  
							
							 
							
							
							
						 
						
							2012-08-07 17:32:15 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								6a94d4f550 
								
							 
						 
						
							
							
								
								Put back impressionist where it was commented out  
							
							 
							
							
							
						 
						
							2012-08-04 15:42:53 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								50b313976e 
								
							 
						 
						
							
							
								
								Fix page: take category and tag at the same time  
							
							 
							
							
							
						 
						
							2012-08-03 17:12:54 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								2d2e01115b 
								
							 
						 
						
							
							
								
								Fix page: take category and tag at the same time  
							
							 
							
							... 
							
							
							
							With news and announcement views 
							
						 
						
							2012-08-03 01:44:06 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								25a911b4f8 
								
							 
						 
						
							
							
								
								Change for page: take category and tag at the same time  
							
							 
							
							
							
						 
						
							2012-08-01 16:33:46 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								39b63a970c 
								
							 
						 
						
							
							
								
								Fix .class to .class.to_s  
							
							 
							
							
							
						 
						
							2012-07-30 18:34:54 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								7440727acd 
								
							 
						 
						
							
							
								
								Fix: "._type" to ".class"  
							
							 
							
							
							
						 
						
							2012-07-30 17:21:37 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								a657a7d615 
								
							 
						 
						
							
							
								
								remove cache  
							
							 
							
							
							
						 
						
							2012-07-27 19:14:24 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								a8cc581279 
								
							 
						 
						
							
							
								
								Sitemap done for backend and fronted  
							
							 
							
							
							
						 
						
							2012-07-27 19:13:40 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								934b515914 
								
							 
						 
						
							
							
								
								Sitemap with main  
							
							 
							
							
							
						 
						
							2012-07-27 19:13:39 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								38804bd118 
								
							 
						 
						
							
							
								
								Add disable for main title  
							
							 
							
							
							
						 
						
							2012-07-27 19:13:39 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								db9c4c0e10 
								
							 
						 
						
							
							
								
								Partial sitemap  
							
							 
							
							
							
						 
						
							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
							
						 
						
							 
							
							
							
							
								
							
							
								e2ebd48b22 
								
							 
						 
						
							
							
								
								Remove i18n_variable for announcement  
							
							 
							
							
							
						 
						
							2012-07-27 19:12:58 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								de831f1f96 
								
							 
						 
						
							
							
								
								disable homepage cache for english page  
							
							 
							
							
							
						 
						
							2012-07-27 05:08:24 +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
							
						 
						
							 
							
							
							
							
								
							
							
								2ae6b54a45 
								
							 
						 
						
							
							
								
								fix for not working cache  
							
							 
							
							
							
						 
						
							2012-07-13 18:32:17 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								4daf36908c 
								
							 
						 
						
							
							
								
								working cache  
							
							 
							
							
							
						 
						
							2012-07-13 15:36:10 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								0e65e379b0 
								
							 
						 
						
							
							
								
								cache first commit  
							
							 
							
							
							
						 
						
							2012-07-12 11:47:24 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								773371e885 
								
							 
						 
						
							
							
								
								fix from messy search  
							
							 
							
							
							
						 
						
							2012-07-09 16:48:23 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								09d46f2f75 
								
							 
						 
						
							
							
								
								NCCU 上傳版本  0709  
							
							 
							
							... 
							
							
							
							Merge branch 'nccu0621'
Conflicts:
	Gemfile
	config/resque.god
	vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_page_context.html.erb 
							
						 
						
							2012-07-09 16:02:59 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								49862e70f9 
								
							 
						 
						
							
							
								
								hide category at front end  
							
							 
							
							
							
						 
						
							2012-07-09 12:05:21 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								56caf4b34e 
								
							 
						 
						
							
							
								
								category disable for backend  
							
							 
							
							
							
						 
						
							2012-07-06 18:11:55 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								c5fdff764e 
								
							 
						 
						
							
							
								
								orbit disable object for categories  
							
							 
							
							
							
						 
						
							2012-07-05 16:00:45 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								f7107936d0 
								
							 
						 
						
							
							
								
								fix for checking @rulingcom.com  
							
							 
							
							
							
						 
						
							2012-07-03 18:21:48 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								9607b5bbfd 
								
							 
						 
						
							
							
								
								rulingcom帳號不透過LDAP認證  
							
							 
							
							
							
						 
						
							2012-07-03 18:12:44 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								818c58c1ee 
								
							 
						 
						
							
							
								
								fix for 新聞與公告QA  
							
							 
							
							... 
							
							
							
							1.8.新聞或公告的「檔案室」上傳圖片後再行編輯時,圖片無法正常顯示(但是可以正常被編輯調整並於前台顯示)
	2.add  上傳檔案大小限制: 3MB
	3.公告的發佈單位為何是顯示單位代碼:M00?應顯示發布單位 
							
						 
						
							2012-06-26 17:46:02 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								cb17fe0825 
								
							 
						 
						
							
							
								
								Search sold edition,rake sunspot:solr:run. NewsBulletin.solr_search,NewsBulletin.solr_reindex. Not working  
							
							 
							
							
							
						 
						
							2012-06-20 14:50:51 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								4f484599b7 
								
							 
						 
						
							
							
								
								Clean up code , cache other auths.  Fix sidebar  
							
							 
							
							
							
						 
						
							2012-05-29 15:23:50 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								6f0cf0e92e 
								
							 
						 
						
							
							
								
								cache privilege user list.  
							
							 
							
							
							
						 
						
							2012-05-29 15:23:50 +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  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								c062b43069 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' into ldap  
							
							 
							
							
							
						 
						
							2012-05-23 12:11:38 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								7c44e94285 
								
							 
						 
						
							
							
								
								Order list by created_at desc  
							
							 
							
							... 
							
							
							
							Add best image size in news new 
							
						 
						
							2012-05-23 11:46:19 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								f1c8bed29d 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' into ldap  
							
							 
							
							... 
							
							
							
							Conflicts:
	vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_approvals_controller.rb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb 
							
						 
						
							2012-05-22 20:33:07 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								d6b92fc604 
								
							 
						 
						
							
							
								
								Fixed bugs for nccu  
							
							 
							
							
							
						 
						
							2012-05-22 20:00:07 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								11a371cbb9 
								
							 
						 
						
							
							
								
								Fix destroy in structure  
							
							 
							
							... 
							
							
							
							Fix sorting 
							
						 
						
							2012-05-22 17:55:45 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								5e9836f371 
								
							 
						 
						
							
							
								
								Changes for structure  
							
							 
							
							
							
						 
						
							2012-05-22 14:45:49 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								c4d7079059 
								
							 
						 
						
							
							
								
								Fix's Matt code for not showing bulletins in index  
							
							 
							
							
							
						 
						
							2012-05-21 18:10:03 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								815e6a8361 
								
							 
						 
						
							
							
								
								Fix matt's code and add it to filters  
							
							 
							
							
							
						 
						
							2012-05-19 03:19:55 +08:00  
						
					 
				
					
						
							
							
								 
								Matt
							
						 
						
							 
							
							
							
							
								
							
							
								6a022c90da 
								
							 
						 
						
							
							
								
								Changes on nccu  
							
							 
							
							
							
						 
						
							2012-05-18 15:20:45 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								5f6696a358 
								
							 
						 
						
							
							
								
								fix view for different_user for ad_banner. add field 'best size' for ad_banner within form  
							
							 
							
							
							
						 
						
							2012-05-18 14:19:13 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								7c6b807170 
								
							 
						 
						
							
							
								
								Change impression count to exclude when :referrer is nil  
							
							 
							
							
							
						 
						
							2012-05-18 14:13:11 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								a4afd5c1d3 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' into ldap  
							
							 
							
							
							
						 
						
							2012-05-18 10:36:32 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								8ad7f70822 
								
							 
						 
						
							
							
								
								Proof i18n_variable for categories  
							
							 
							
							
							
						 
						
							2012-05-18 10:28:28 +08:00