96fe482d50 
								
							 
						 
						
							
							
								
								for openness  
							
							
							
						 
						
							2012-11-20 20:20:59 +08:00  
				
					
						
							
							
								 
						
							
								b40d4702d5 
								
							 
						 
						
							
							
								
								Merge branch 'master' into various_bugs  
							
							... 
							
							
							
							Conflicts:
	config/locales/en.yml
	config/locales/zh_tw.yml
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_form.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_form.html.erb 
							
						 
						
							2012-11-06 11:44:00 +08:00  
				
					
						
							
							
								 
						
							
								9433d59c04 
								
							 
						 
						
							
							
								
								relpace tab with sapce  
							
							
							
						 
						
							2012-11-05 11:42:49 +08:00  
				
					
						
							
							
								 
						
							
								bdd5a1a047 
								
							 
						 
						
							
							
								
								Changes for i18n yml  
							
							
							
						 
						
							2012-09-24 09:02:45 +08:00  
				
					
						
							
							
								 
						
							
								6cc470ede9 
								
							 
						 
						
							
							
								
								nccu fix  
							
							
							
						 
						
							2012-08-13 18:35:47 +08:00  
				
					
						
							
							
								 
						
							
								f1b4d9e204 
								
							 
						 
						
							
							
								
								Add authorization for rescue interface  
							
							... 
							
							
							
							Change logic for NCCU site for status panel. 
							
						 
						
							2012-08-12 23:29:13 +08:00  
				
					
						
							
							
								 
						
							
								b989f458d3 
								
							 
						 
						
							
							
								
								Do not show news/anc if no context.  
							
							
							
						 
						
							2012-07-31 18:22:40 +08:00  
				
					
						
							
							
								 
						
							
								e2ebd48b22 
								
							 
						 
						
							
							
								
								Remove i18n_variable for announcement  
							
							
							
						 
						
							2012-07-27 19:12:58 +08:00  
				
					
						
							
							
								 
						
							
								a7b92ed3e8 
								
							 
						 
						
							
							
								
								fix  rejection for announcement and news.  
							
							
							
						 
						
							2012-07-17 10:22:42 +08:00  
				
					
						
							
							
								 
						
							
								c5fdff764e 
								
							 
						 
						
							
							
								
								orbit disable object for categories  
							
							
							
						 
						
							2012-07-05 16:00:45 +08:00  
				
					
						
							
							
								 
						
							
								ae2cbb728e 
								
							 
						 
						
							
							
								
								archive for announcement  
							
							
							
						 
						
							2012-07-04 17:36:51 +08:00  
				
					
						
							
							
								 
						
							
								83a72bdf6e 
								
							 
						 
						
							
							
								
								fix for announcement  
							
							
							
						 
						
							2012-06-26 18:23:44 +08:00  
				
					
						
							
							
								 
						
							
								818c58c1ee 
								
							 
						 
						
							
							
								
								fix for 新聞與公告QA  
							
							... 
							
							
							
							1.8.新聞或公告的「檔案室」上傳圖片後再行編輯時,圖片無法正常顯示(但是可以正常被編輯調整並於前台顯示)
	2.add  上傳檔案大小限制: 3MB
	3.公告的發佈單位為何是顯示單位代碼:M00?應顯示發布單位 
							
						 
						
							2012-06-26 17:46:02 +08:00  
				
					
						
							
							
								 
						
							
								2b54067ecb 
								
							 
						 
						
							
							
								
								change order of display menu of categories of news_bulletin and bulletin.  
							
							
							
						 
						
							2012-06-26 14:28:21 +08:00  
				
					
						
							
							
								 
						
							
								ffd95ee1fd 
								
							 
						 
						
							
							
								
								fix  
							
							... 
							
							
							
							新聞與公告QA-權限設定--優先處理3.一般發佈新聞&公告人,應該只能看到自己發佈的新聞&公告,但是目前可以看到全部,而且可以刪除其他人的公告.至少要不能刪除別人的公告
新聞與公告QA-編輯問題-發佈新聞時,發佈單位預設為請選擇
新聞與公告QA-編輯問題-公告模組請移除 Subtitle 欄位
put rb-readline only in Linux
make app_manager destroy after user deletion.   may need to run:
 AppManager.all.collect{|am|  am if am.user.nil? }.delete_if {|x| x == nil}.each{|am| am.destroy}
for clean up DB. 
							
						 
						
							2012-06-25 16:23:16 +08:00  
				
					
						
							
							
								 
						
							
								d9c12ea5a4 
								
							 
						 
						
							
							
								
								Proof authed_users for case when no category  
							
							
							
						 
						
							2012-05-18 10:50:51 +08:00  
				
					
						
							
							
								 
						
							
								f663985a40 
								
							 
						 
						
							
							
								
								starting ad_banner auth  
							
							
							
						 
						
							2012-05-17 06:42:33 +08:00  
				
					
						
							
							
								 
						
							
								0119ab1a74 
								
							 
						 
						
							
							
								
								New Interface for App Auth and Object Auth  
							
							
							
						 
						
							2012-05-14 00:50:12 +08:00  
				
					
						
							
							
								 
						
							
								93946c37f4 
								
							 
						 
						
							
							
								
								fix wrong link  
							
							
							
						 
						
							2012-05-09 15:54:00 +08:00  
				
					
						
							
							
								 
						
							
								71a5731fe8 
								
							 
						 
						
							
							
								
								Permission setting for announcement for bulletin cate  
							
							
							
						 
						
							2012-05-09 14:54:20 +08:00  
				
					
						
							
							
								 
						
							
								ca88d0e01b 
								
							 
						 
						
							
							
								
								Fix bug that was never displaying preview  
							
							
							
						 
						
							2012-05-07 17:29:56 +08:00  
				
					
						
							
							
								 
						
							
								a46a8898d7 
								
							 
						 
						
							
							
								
								Integrate App & Object Auth to announcement with i18n variables. Also changed Role and SubRole i18n var. Checked with Allen  
							
							
							
						 
						
							2012-04-30 00:24:11 +08:00  
				
					
						
							
							
								 
						
							
								382932036d 
								
							 
						 
						
							
							
								
								Hide Approval button when bulletin is checked.  
							
							
							
						 
						
							2012-04-30 00:24:11 +08:00  
				
					
						
							
							
								 
						
							
								ec235bcaa3 
								
							 
						 
						
							
							
								
								merge with master  
							
							
							
						 
						
							2012-01-11 20:31:52 +08:00