a7b92ed3e8 
								
							 
						 
						
							
							
								
								fix  rejection for announcement and news.  
							
							
							
						 
						
							2012-07-17 10:22:42 +08:00  
				
					
						
							
							
								 
						
							
								85d6bbe1c9 
								
							 
						 
						
							
							
								
								add i18n variable. fix web_links for disable category  
							
							
							
						 
						
							2012-07-11 17:56:31 +08:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								c5fdff764e 
								
							 
						 
						
							
							
								
								orbit disable object for categories  
							
							
							
						 
						
							2012-07-05 16:00:45 +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  
				
					
						
							
							
								 
						
							
								cb17fe0825 
								
							 
						 
						
							
							
								
								Search sold edition,rake sunspot:solr:run. NewsBulletin.solr_search,NewsBulletin.solr_reindex. Not working  
							
							
							
						 
						
							2012-06-20 14:50:51 +08:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								6ce6577e83 
								
							 
						 
						
							
							
								
								fix news approve and preview  
							
							
							
						 
						
							2012-05-18 18:47:18 +08:00  
				
					
						
							
							
								 
						
							
								6a022c90da 
								
							 
						 
						
							
							
								
								Changes on nccu  
							
							
							
						 
						
							2012-05-18 15:20:45 +08:00  
				
					
						
							
							
								 
						
							
								7a6d30ad62 
								
							 
						 
						
							
							
								
								Remove unless files and change routes.  
							
							
							
						 
						
							2012-05-14 00:50:36 +08:00  
				
					
						
							
							
								 
						
							
								62e9a772f6 
								
							 
						 
						
							
							
								
								Fix titles for widgets  
							
							... 
							
							
							
							Add translations 
							
						 
						
							2012-05-13 23:09:48 +08:00  
				
					
						
							
							
								 
						
							
								13587306bc 
								
							 
						 
						
							
							
								
								Add list widgets for announcement, news and links with categories and tags  
							
							
							
						 
						
							2012-05-10 00:25:30 +08:00  
				
					
						
							
							
								 
						
							
								618e4f4047 
								
							 
						 
						
							
							
								
								Repeat code for news module  
							
							
							
						 
						
							2012-05-09 15:22:15 +08:00  
				
					
						
							
							
								 
						
							
								e9b337a385 
								
							 
						 
						
							
							
								
								Copy changes into news after merge  
							
							
							
						 
						
							2012-05-04 18:49:07 +08:00  
				
					
						
							
							
								 
						
							
								b8f52fa1ec 
								
							 
						 
						
							
							
								
								Separate announcement and news  
							
							
							
						 
						
							2012-04-30 06:31:46 +08:00