edf9d8a159 
								
							 
						 
						
							
							
								
								Fix can_display  
							
							
							
						 
						
							2012-08-16 18:55:34 +08:00  
				
					
						
							
							
								 
						
							
								d9f6bb3b4e 
								
							 
						 
						
							
							
								
								can display scope  
							
							
							
						 
						
							2012-08-15 11:34:19 +08:00  
				
					
						
							
							
								 
						
							
								fb53ad524a 
								
							 
						 
						
							
							
								
								Add time to announcement quick edit  
							
							... 
							
							
							
							Fix picture for news quick edit
Fix tags not saving when empty
Hide role in quick edit 
							
						 
						
							2012-08-14 14:38:21 +08:00  
				
					
						
							
							
								 
						
							
								77224bcc8f 
								
							 
						 
						
							
							
								
								check deadline for news  
							
							
							
						 
						
							2012-08-14 13:49:24 +08:00  
				
					
						
							
							
								 
						
							
								62ba8c9f18 
								
							 
						 
						
							
							
								
								Fix bugs on 172:180  
							
							
							
						 
						
							2012-08-08 17:56:00 +08:00  
				
					
						
							
							
								 
						
							
								959def6c1f 
								
							 
						 
						
							
							
								
								Merge branch 'nccu_fix_matt' of github.com:Rulingcom/NCCU into nccu_fix_matt  
							
							... 
							
							
							
							Conflicts:
	app/models/item.rb
	config/locales/en.yml
	vendor/built_in_modules/announcement/app/models/bulletin.rb
	vendor/built_in_modules/news/app/models/news_bulletin.rb 
							
						 
						
							2012-08-08 14:48:29 +08:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								06919e76ed 
								
							 
						 
						
							
							
								
								fix approval at news and announcement for abnormal flags that causing search result fault.  
							
							
							
						 
						
							2012-08-08 11:01:50 +08:00  
				
					
						
							
							
								 
						
							
								1cdc0e24bd 
								
							 
						 
						
							
							
								
								First version of Solr search.  
							
							
							
						 
						
							2012-08-08 10:59:55 +08:00  
				
					
						
							
							
								 
						
							
								cbf7ccc13b 
								
							 
						 
						
							
							
								
								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-07 19:21:54 +08:00  
				
					
						
							
							
								 
						
							
								5f88408dcb 
								
							 
						 
						
							
							
								
								Check for 'http' or 'https' before saving a link  
							
							
							
						 
						
							2012-08-04 16:29:31 +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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								61c1af7316 
								
							 
						 
						
							
							
								
								Remove i18n_variable for news  
							
							
							
						 
						
							2012-07-27 19:12:58 +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  
				
					
						
							
							
								 
						
							
								a7b92ed3e8 
								
							 
						 
						
							
							
								
								fix  rejection for announcement and news.  
							
							
							
						 
						
							2012-07-17 10:22:42 +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  
				
					
						
							
							
								 
						
							
								c5fdff764e 
								
							 
						 
						
							
							
								
								orbit disable object for categories  
							
							
							
						 
						
							2012-07-05 16:00:45 +08:00  
				
					
						
							
							
								 
						
							
								243c9e2946 
								
							 
						 
						
							
							
								
								fix relation between bulletin and category	 (news also)  
							
							
							
						 
						
							2012-06-27 15:16: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  
				
					
						
							
							
								 
						
							
								4d33c7a56d 
								
							 
						 
						
							
							
								
								Changes for dat and time format  
							
							... 
							
							
							
							Impression bug when some i18n missing in impressionable object
JS bug in ad_banner edit title 
							
						 
						
							2012-05-18 19:42:36 +08:00  
				
					
						
							
							
								 
						
							
								4467bc5e48 
								
							 
						 
						
							
							
								
								Change Date to DateTime  
							
							... 
							
							
							
							Fix filename error 
							
						 
						
							2012-05-17 09:59:49 +08:00  
				
					
						
							
							
								 
						
							
								e54f4409fb 
								
							 
						 
						
							
							
								
								Add impressionist  
							
							
							
						 
						
							2012-05-15 21:26:09 +08:00  
				
					
						
							
							
								 
						
							
								9ba4c2cf2f 
								
							 
						 
						
							
							
								
								Change to apply page to had object_auth  
							
							
							
						 
						
							2012-05-14 12:40:50 +08:00  
				
					
						
							
							
								 
						
							
								0119ab1a74 
								
							 
						 
						
							
							
								
								New Interface for App Auth and Object Auth  
							
							
							
						 
						
							2012-05-14 00:50:12 +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