73b2cd1035 
								
							 
						 
						
							
							
								
								Fix typo and title in news and announcement frontend  
							
							
							
						 
						
							2012-08-05 15:04:52 +08:00  
				
					
						
							
							
								 
						
							
								5f88408dcb 
								
							 
						 
						
							
							
								
								Check for 'http' or 'https' before saving a link  
							
							
							
						 
						
							2012-08-04 16:29:31 +08:00  
				
					
						
							
							
								 
						
							
								6a94d4f550 
								
							 
						 
						
							
							
								
								Put back impressionist where it was commented out  
							
							
							
						 
						
							2012-08-04 15:42:53 +08:00  
				
					
						
							
							
								 
						
							
								2d2e01115b 
								
							 
						 
						
							
							
								
								Fix page: take category and tag at the same time  
							
							... 
							
							
							
							With news and announcement views 
							
						 
						
							2012-08-03 01:44:06 +08:00  
				
					
						
							
							
								 
						
							
								4127d7f2eb 
								
							 
						 
						
							
							
								
								Fix tags  
							
							
							
						 
						
							2012-08-03 01:35:41 +08:00  
				
					
						
							
							
								 
						
							
								d2564af001 
								
							 
						 
						
							
							
								
								Merge branch 'master' of github.com:Rulingcom/NCCU  
							
							
							
						 
						
							2012-08-01 16:38:35 +08:00  
				
					
						
							
							
								 
						
							
								25a911b4f8 
								
							 
						 
						
							
							
								
								Change for page: take category and tag at the same time  
							
							
							
						 
						
							2012-08-01 16:33:46 +08:00  
				
					
						
							
							
								 
						
							
								acebec8904 
								
							 
						 
						
							
							
								
								don't dislay web links if no eng. lists in widget is now sorted.  
							
							
							
						 
						
							2012-08-01 15:24:55 +08:00  
				
					
						
							
							
								 
						
							
								625801c0e9 
								
							 
						 
						
							
							
								
								Fix auth_users bug without category in news  
							
							
							
						 
						
							2012-08-01 03:07:23 +08:00  
				
					
						
							
							
								 
						
							
								c951cc6b6f 
								
							 
						 
						
							
							
								
								Fix for data_migration  
							
							
							
						 
						
							2012-08-01 00:58:59 +08:00  
				
					
						
							
							
								 
						
							
								b2f28eabaf 
								
							 
						 
						
							
							
								
								Merge branch 'master' of github.com:Rulingcom/NCCU  
							
							
							
						 
						
							2012-07-31 18:23:01 +08:00  
				
					
						
							
							
								 
						
							
								b989f458d3 
								
							 
						 
						
							
							
								
								Do not show news/anc if no context.  
							
							
							
						 
						
							2012-07-31 18:22:40 +08:00  
				
					
						
							
							
								 
						
							
								0078c97b19 
								
							 
						 
						
							
							
								
								Merge branch 'master' of github.com:Rulingcom/NCCU  
							
							
							
						 
						
							2012-07-31 14:27:44 +08:00  
				
					
						
							
							
								 
						
							
								9f859b903d 
								
							 
						 
						
							
							
								
								Add custom validator and fix .html_safe with rescue  
							
							
							
						 
						
							2012-07-31 14:25:46 +08:00  
				
					
						
							
							
								 
						
							
								7e3b59c09a 
								
							 
						 
						
							
							
								
								finished tag clouds  
							
							
							
						 
						
							2012-07-31 11:57:32 +08:00  
				
					
						
							
							
								 
						
							
								af4865ceb7 
								
							 
						 
						
							
							
								
								Merge branch 'master' of github.com:Rulingcom/NCCU  
							
							
							
						 
						
							2012-07-31 11:01:11 +08:00  
				
					
						
							
							
								 
						
							
								4dea025c8a 
								
							 
						 
						
							
							
								
								fix for  
							
							... 
							
							
							
							1.Announcement 15 per page
2.Search keywords.
3.Redis search index with new code. 
							
						 
						
							2012-07-31 10:59:48 +08:00  
				
					
						
							
							
								 
						
							
								f3ccbce5c8 
								
							 
						 
						
							
							
								
								Put back impressions for new and bulletin.  
							
							... 
							
							
							
							Add view_count field to tag. 
							
						 
						
							2012-07-30 17:57:55 +08:00  
				
					
						
							
							
								 
						
							
								bb154f5be6 
								
							 
						 
						
							
							
								
								fix error when creating bulletin and news  
							
							
							
						 
						
							2012-07-30 16:38:02 +08:00  
				
					
						
							
							
								 
						
							
								4e1a91ed90 
								
							 
						 
						
							
							
								
								Merge branch 'changing_tag'  
							
							... 
							
							
							
							Conflicts:
	vendor/built_in_modules/news/app/models/news_tag.rb 
							
						 
						
							2012-07-30 14:43:53 +08:00  
				
					
						
							
							
								 
						
							
								effad63c92 
								
							 
						 
						
							
							
								
								make sure no pending news or announcement will be searched out  
							
							
							
						 
						
							2012-07-30 14:39:40 +08:00  
				
					
						
							
							
								 
						
							
								946ec9306f 
								
							 
						 
						
							
							
								
								first version of tag cloud.  
							
							
							
						 
						
							2012-07-30 11:59:20 +08:00  
				
					
						
							
							
								 
						
							
								afa4b7dcb3 
								
							 
						 
						
							
							
								
								Remove cache  
							
							
							
						 
						
							2012-07-28 16:06:44 +08:00  
				
					
						
							
							
								 
						
							
								61c1af7316 
								
							 
						 
						
							
							
								
								Remove i18n_variable for news  
							
							
							
						 
						
							2012-07-27 19:12:58 +08:00  
				
					
						
							
							
								 
						
							
								d589a1b522 
								
							 
						 
						
							
							
								
								fix for 標題後台為「校園新聞」,前台顯示為「新聞」 該頁面為列表,最上方卻出現「搜尋結果」? from Mr.張  
							
							
							
						 
						
							2012-07-27 07:42:00 +08:00  
				
					
						
							
							
								 
						
							
								fb1f08327d 
								
							 
						 
						
							
							
								
								fix redis search limit for 10 items  
							
							
							
						 
						
							2012-07-26 12:12:43 +08:00  
				
					
						
							
							
								 
						
							
								25f4e292e6 
								
							 
						 
						
							
							
								
								add not found for no result  
							
							
							
						 
						
							2012-07-25 13:58:09 +08:00  
				
					
						
							
							
								 
						
							
								98fd9223a8 
								
							 
						 
						
							
							
								
								open search for news  
							
							
							
						 
						
							2012-07-25 10:42:55 +08:00  
				
					
						
							
							
								 
						
							
								f9bdb4a327 
								
							 
						 
						
							
							
								
								New and Announcement search. Disabled impression.  
							
							
							
						 
						
							2012-07-20 15:47:40 +08:00  
				
					
						
							
							
								 
						
							
								033667f99b 
								
							 
						 
						
							
							
								
								fix for missing disable category at frontend and widget  
							
							
							
						 
						
							2012-07-17 11:26:50 +08:00  
				
					
						
							
							
								 
						
							
								a4b1681d39 
								
							 
						 
						
							
							
								
								fix  rejection for announcement and news.  
							
							
							
						 
						
							2012-07-17 10:21:46 +08:00  
				
					
						
							
							
								 
						
							
								4daf36908c 
								
							 
						 
						
							
							
								
								working cache  
							
							
							
						 
						
							2012-07-13 15:36:10 +08:00  
				
					
						
							
							
								 
						
							
								85d6bbe1c9 
								
							 
						 
						
							
							
								
								add i18n variable. fix web_links for disable category  
							
							
							
						 
						
							2012-07-11 17:56:31 +08:00  
				
					
						
							
							
								 
						
							
								ca2c056a07 
								
							 
						 
						
							
							
								
								fix for not displaying bulletin at fronted when it's parent category is disable  
							
							
							
						 
						
							2012-07-11 17:17:44 +08:00  
				
					
						
							
							
								 
						
							
								773371e885 
								
							 
						 
						
							
							
								
								fix from messy search  
							
							
							
						 
						
							2012-07-09 16:48:23 +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  
				
					
						
							
							
								 
						
							
								49862e70f9 
								
							 
						 
						
							
							
								
								hide category at front end  
							
							
							
						 
						
							2012-07-09 12:05:21 +08:00  
				
					
						
							
							
								 
						
							
								56caf4b34e 
								
							 
						 
						
							
							
								
								category disable for backend  
							
							
							
						 
						
							2012-07-06 18:11:55 +08:00  
				
					
						
							
							
								 
						
							
								c5fdff764e 
								
							 
						 
						
							
							
								
								orbit disable object for categories  
							
							
							
						 
						
							2012-07-05 16:00:45 +08:00  
				
					
						
							
							
								 
						
							
								58a11ff569 
								
							 
						 
						
							
							
								
								fix javascript for new and anc link removing  
							
							
							
						 
						
							2012-06-28 13:50:11 +08:00  
				
					
						
							
							
								 
						
							
								243c9e2946 
								
							 
						 
						
							
							
								
								fix relation between bulletin and category	 (news also)  
							
							
							
						 
						
							2012-06-27 15:16:16 +08:00  
				
					
						
							
							
								 
						
							
								4c4929c20a 
								
							 
						 
						
							
							
								
								Fix js for news quick_edit and edit for files  
							
							
							
						 
						
							2012-06-27 11:36:18 +08:00  
				
					
						
							
							
								 
						
							
								6a4abc6c43 
								
							 
						 
						
							
							
								
								fix news error  
							
							
							
						 
						
							2012-06-27 09:59:32 +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  
				
					
						
							
							
								 
						
							
								3f95fe4f13 
								
							 
						 
						
							
							
								
								tmp commit for search.  start nccu0621 first  
							
							
							
						 
						
							2012-06-22 11:34:10 +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  
				
					
						
							
							
								 
						
							
								8dd1ab32c1 
								
							 
						 
						
							
							
								
								Add this toolbar, and nccu calendar fix  
							
							
							
						 
						
							2012-06-04 16:51:29 +08:00